mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21152 from rogday:fix_defaults

Browse Source
This commit is contained in:
Alexander Alekhin 2021-11-29 22:39:27 +00:00
commit 0d2857a242
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/src/layers/lrn_layer.cpp
View File

@ -80,7 +80,7 @@ public:
if (size % 2 != 1 || size <= 0) if (size % 2 != 1 || size <= 0)
CV_Error(Error::StsBadArg, "LRN layer supports only positive odd values for local_size"); CV_Error(Error::StsBadArg, "LRN layer supports only positive odd values for local_size");
alpha = params.get<double>("alpha", 1); alpha = params.get<double>("alpha", 0.0001);
beta = params.get<double>("beta", 0.75); beta = params.get<double>("beta", 0.75);
bias = params.get<double>("bias", 1); bias = params.get<double>("bias", 1);
normBySize = params.get<bool>("norm_by_size", true); normBySize = params.get<bool>("norm_by_size", true);

7
modules/dnn/src/onnx/onnx_importer.cpp
View File

@ -920,6 +920,7 @@ void ONNXImporter::parseSplit(LayerParams& layerParams, const opencv_onnx::NodeP
layerParams.set("num_split", node_proto.output_size()); layerParams.set("num_split", node_proto.output_size());
} }
layerParams.type = "Slice"; layerParams.type = "Slice";
layerParams.set("axis", layerParams.get<float>("axis", 0));
addLayer(layerParams, node_proto); addLayer(layerParams, node_proto);
} }
@ -1184,15 +1185,15 @@ void ONNXImporter::parseImageScaler(LayerParams& layerParams, const opencv_onnx:
void ONNXImporter::parseClip(LayerParams& layerParams, const opencv_onnx::NodeProto& node_proto) void ONNXImporter::parseClip(LayerParams& layerParams, const opencv_onnx::NodeProto& node_proto)
{ {
layerParams.type = "ReLU6"; layerParams.type = "ReLU6";
replaceLayerParam(layerParams, "min", "min_value"); layerParams.set("min_value", layerParams.get<float>("min", -FLT_MAX));
replaceLayerParam(layerParams, "max", "max_value"); layerParams.set("max_value", layerParams.get<float>("max", FLT_MAX));
addLayer(layerParams, node_proto); addLayer(layerParams, node_proto);
} }
void ONNXImporter::parseLeakyRelu(LayerParams& layerParams, const opencv_onnx::NodeProto& node_proto) void ONNXImporter::parseLeakyRelu(LayerParams& layerParams, const opencv_onnx::NodeProto& node_proto)
{ {
layerParams.type = "ReLU"; layerParams.type = "ReLU";
replaceLayerParam(layerParams, "alpha", "negative_slope"); layerParams.set("negative_slope", layerParams.get<float>("alpha", 0.01));
addLayer(layerParams, node_proto); addLayer(layerParams, node_proto);
} }