Merge pull request opencv#18431 from zhuqiang00099:fix-darknet_relu

alalek · alalek · commit 2ea7269450a5 · 2020-10-02T14:58:48.000Z
diff --git a/modules/dnn/src/darknet/darknet_io.cpp b/modules/dnn/src/darknet/darknet_io.cpp
@@ -984,8 +984,8 @@ namespace cv {
                     }
 
                     std::string activation = getParam<std::string>(layer_params, "activation", "linear");
-                    if(activation == "leaky" || activation == "swish" || activation == "mish" || activation == "logistic")
-                        ++cv_layers_counter;  // For ReLU, Swish, Mish, Sigmoid
+                    if (activation != "linear")
+                        ++cv_layers_counter;  // For ReLU, Swish, Mish, Sigmoid, etc
 
                     if(!darknet_layers_counter)
                         tensor_shape.resize(1);

Original file line number	Diff line number	Diff line change
`@@ -984,8 +984,8 @@ namespace cv {`
`984`	`984`	`}`
`985`	`985`
`986`	`986`	`std::string activation = getParam<std::string>(layer_params, "activation", "linear");`
`987`		`- if(activation == "leaky" \|\| activation == "swish" \|\| activation == "mish" \|\| activation == "logistic")`
`988`		`- ++cv_layers_counter; // For ReLU, Swish, Mish, Sigmoid`
	`987`	`+ if (activation != "linear")`
	`988`	`+ ++cv_layers_counter; // For ReLU, Swish, Mish, Sigmoid, etc`
`989`	`989`
`990`	`990`	`if(!darknet_layers_counter)`
`991`	`991`	`tensor_shape.resize(1);`