Merge pull request opencv#17658 from ilya-lavrenov:get-layer-by-name

alalek · alalek · commit 085bd5f55f2e · 2020-06-25T09:42:59.000Z
diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp
@@ -3543,6 +3543,9 @@ Net Net::Impl::createNetworkFromModelOptimizer(InferenceEngine::CNNNetwork& ieNe
                 }
                 else
                 {
+#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
+                    CV_Error(Error::StsNotImplemented, "This OpenCV version is built with Inference Engine which has dropped IR v7 support");
+#else
                     CV_TRACE_REGION("legacy_cnn_layer");
                     try
                     {
@@ -3558,6 +3561,8 @@ Net Net::Impl::createNetworkFromModelOptimizer(InferenceEngine::CNNNetwork& ieNe
                         CV_LOG_DEBUG(NULL, "IE layer extraction failure: '" << name << "' - " << e.what());
                         return false;
                     }
+#endif
+
                 }
             };
 
diff --git a/modules/dnn/src/op_inf_engine.hpp b/modules/dnn/src/op_inf_engine.hpp
@@ -26,6 +26,7 @@
 #define INF_ENGINE_RELEASE_2020_1 2020010000
 #define INF_ENGINE_RELEASE_2020_2 2020020000
 #define INF_ENGINE_RELEASE_2020_3 2020030000
+#define INF_ENGINE_RELEASE_2020_4 2020040000
 
 #ifndef INF_ENGINE_RELEASE
 #warning("IE version have not been provided via command-line. Using 2020.3 by default")

Original file line number	Diff line number	Diff line change
`@@ -3543,6 +3543,9 @@ Net Net::Impl::createNetworkFromModelOptimizer(InferenceEngine::CNNNetwork& ieNe`
`3543`	`3543`	`}`
`3544`	`3544`	`else`
`3545`	`3545`	`{`
	`3546`	`+#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)`
	`3547`	`+ CV_Error(Error::StsNotImplemented, "This OpenCV version is built with Inference Engine which has dropped IR v7 support");`
	`3548`	`+#else`
`3546`	`3549`	`CV_TRACE_REGION("legacy_cnn_layer");`
`3547`	`3550`	`try`
`3548`	`3551`	`{`
`@@ -3558,6 +3561,8 @@ Net Net::Impl::createNetworkFromModelOptimizer(InferenceEngine::CNNNetwork& ieNe`
`3558`	`3561`	`CV_LOG_DEBUG(NULL, "IE layer extraction failure: '" << name << "' - " << e.what());`
`3559`	`3562`	`return false;`
`3560`	`3563`	`}`
	`3564`	`+#endif`
	`3565`	`+`
`3561`	`3566`	`}`
`3562`	`3567`	`};`
`3563`	`3568`