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

Merge pull request #13263 from dkurt:dnn_refactor_tests

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-23 17:12:01 +00:00
commit 342366e314
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,8 @@ void ONNXImporter::populateNet(Net dstNet)
layerParams.set("shift", blob.at<float>(0));
}
else {
layerParams.type = "Shift";
layerParams.type = "Scale";
layerParams.set("bias_term", true);
layerParams.blobs.push_back(blob);
}
}
@ -375,10 +376,28 @@ void ONNXImporter::populateNet(Net dstNet)
layerParams.set("shift", blob.at<float>(0));
}
else {
layerParams.type = "Shift";
layerParams.type = "Scale";
layerParams.set("has_bias", true);
layerParams.blobs.push_back(blob);
}
}
else if (layer_type == "Div")
{
Mat blob = getBlob(node_proto, constBlobs, 1);
CV_Assert_N(blob.type() == CV_32F, blob.total());
divide(1.0, blob, blob);
if (blob.total() == 1)
{
layerParams.set("scale", blob.at<float>(0));
layerParams.type = "Power";
}
else
{
layerParams.type = "Scale";
layerParams.blobs.push_back(blob);
layerParams.set("bias_term", false);
}
}
else if (layer_type == "Constant")
{
CV_Assert(node_proto.input_size() == 0);

6
modules/dnn/test/test_backends.cpp
View File

@ -197,7 +197,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_coco)
(backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_MYRIAD))
throw SkipTestException("");
processNet("dnn/openpose_pose_coco.caffemodel", "dnn/openpose_pose_coco.prototxt",
Size(368, 368));
Size(46, 46));
}
TEST_P(DNNTestNetwork, OpenPose_pose_mpi)
@ -206,7 +206,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi)
(backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_MYRIAD))
throw SkipTestException("");
processNet("dnn/openpose_pose_mpi.caffemodel", "dnn/openpose_pose_mpi.prototxt",
Size(368, 368));
Size(46, 46));
}
TEST_P(DNNTestNetwork, OpenPose_pose_mpi_faster_4_stages)
@ -217,7 +217,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi_faster_4_stages)
// The same .caffemodel but modified .prototxt
// See https://github.com/CMU-Perceptual-Computing-Lab/openpose/blob/master/src/openpose/pose/poseParameters.cpp
processNet("dnn/openpose_pose_mpi.caffemodel", "dnn/openpose_pose_mpi_faster_4_stages.prototxt",
Size(368, 368));
Size(46, 46));
}
TEST_P(DNNTestNetwork, OpenFace)