mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-30 09:16:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18181 from l-bat:onnx_pow

Browse Source
This commit is contained in:
Alexander Alekhin 2020-08-24 14:18:08 +00:00
commit f5ba3f51ce
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,6 +712,19 @@ void ONNXImporter::populateNet(Net dstNet)
layerParams.set("bias_term", true); layerParams.set("bias_term", true);
} }
} }
else if (layer_type == "Pow")
{
if (layer_id.find(node_proto.input(1)) != layer_id.end())
CV_Error(Error::StsNotImplemented, "Unsupported Pow op with variable power");
Mat blob = getBlob(node_proto, constBlobs, 1);
if (blob.total() != 1)
CV_Error(Error::StsNotImplemented, "Pow op supports only scalar power");
blob.convertTo(blob, CV_32F);
layerParams.type = "Power";
layerParams.set("power", blob.at<float>(0));
}
else if (layer_type == "Max") else if (layer_type == "Max")
{ {
layerParams.type = "Eltwise"; layerParams.type = "Eltwise";

5
modules/dnn/test/test_onnx_importer.cpp
View File

@ -283,6 +283,11 @@ TEST_P(Test_ONNX_layers, Cast)
testONNXModels("cast"); testONNXModels("cast");
} }
TEST_P(Test_ONNX_layers, Power)
{
testONNXModels("pow2", npy, 0, 0, false, false);
}
TEST_P(Test_ONNX_layers, Concatenation) TEST_P(Test_ONNX_layers, Concatenation)
{ {
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019) if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)