Merge pull request #21607 from fengyuentau:fix_FaceDetectorYN_dynamic_shape

fengyuentau · web-flow · commit f77c3574af01 · 2022-02-21T13:49:07.000Z
Use YuNet of fixed input shape to fix not-supported-dynamic-zero-shape for FaceDetectorYN

* use yunet with input of fixed shape

* update yunet used in face recognition regression
diff --git a/modules/dnn/src/onnx/onnx_importer.cpp b/modules/dnn/src/onnx/onnx_importer.cpp
@@ -2614,9 +2614,7 @@ void ONNXImporter::parseShape(LayerParams& layerParams, const opencv_onnx::NodeP
     if (isDynamicShape)
     {
         CV_LOG_ERROR(NULL, "DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input " << toString(inpShape, node_proto.input(0)));
-        // FIXIT repair assertion
-        // Disabled to pass face detector tests from #20422
-        // CV_Assert(!isDynamicShape);  // not supported
+        CV_Assert(!isDynamicShape);  // not supported
     }
     addConstant(node_proto.output(0), shapeMat);
 }
diff --git a/modules/objdetect/test/test_face.cpp b/modules/objdetect/test/test_face.cpp
@@ -78,7 +78,7 @@ TEST(Objdetect_face_detection, regression)
     // }
 
     // Initialize detector
-    std::string model = findDataFile("dnn/onnx/models/yunet-202109.onnx", false);
+    std::string model = findDataFile("dnn/onnx/models/yunet-202202.onnx", false);
     Ptr<FaceDetectorYN> faceDetector = FaceDetectorYN::create(model, "", Size(300, 300));
     faceDetector->setScoreThreshold(0.7f);
 
@@ -178,7 +178,7 @@ TEST(Objdetect_face_recognition, regression)
     }
 
     // Initialize detector
-    std::string detect_model = findDataFile("dnn/onnx/models/yunet-202109.onnx", false);
+    std::string detect_model = findDataFile("dnn/onnx/models/yunet-202202.onnx", false);
     Ptr<FaceDetectorYN> faceDetector = FaceDetectorYN::create(detect_model, "", Size(150, 150), score_thresh, nms_thresh);
 
     std::string recog_model = findDataFile("dnn/onnx/models/face_recognizer_fast.onnx", false);

Original file line number	Diff line number	Diff line change
`@@ -2614,9 +2614,7 @@ void ONNXImporter::parseShape(LayerParams& layerParams, const opencv_onnx::NodeP`
`2614`	`2614`	`if (isDynamicShape)`
`2615`	`2615`	`{`
`2616`	`2616`	`CV_LOG_ERROR(NULL, "DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input " << toString(inpShape, node_proto.input(0)));`
`2617`		`- // FIXIT repair assertion`
`2618`		`- // Disabled to pass face detector tests from #20422`
`2619`		`- // CV_Assert(!isDynamicShape); // not supported`
	`2617`	`+ CV_Assert(!isDynamicShape); // not supported`
`2620`	`2618`	`}`
`2621`	`2619`	`addConstant(node_proto.output(0), shapeMat);`
`2622`	`2620`	`}`