Merge pull request #3834 from asmorkalov:as/force_dnn_supperres_classic

asmorkalov · web-flow · commit f7d6288aeb38 · 2024-11-28T13:15:31.000+03:00
Force to use dnn_supperres module to the use classic engine
diff --git a/modules/dnn_superres/src/dnn_superres.cpp b/modules/dnn_superres/src/dnn_superres.cpp
@@ -63,7 +63,7 @@ void DnnSuperResImpl::readModel(const String& path)
 {
     if ( path.size() )
     {
-        this->net = dnn::readNetFromTensorflow(path);
+        this->net = dnn::readNetFromTensorflow(path, std::string(), dnn::ENGINE_CLASSIC);
         CV_LOG_INFO(NULL, "Successfully loaded model: " << path);
     }
     else
@@ -76,7 +76,7 @@ void DnnSuperResImpl::readModel(const String& weights, const String& definition)
 {
     if ( weights.size() && definition.size() )
     {
-        this->net = dnn::readNetFromTensorflow(weights, definition);
+        this->net = dnn::readNetFromTensorflow(weights, definition, dnn::ENGINE_CLASSIC);
         CV_LOG_INFO(NULL, "Successfully loaded model: " << weights << " " << definition);
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void DnnSuperResImpl::readModel(const String& path)`
`63`	`63`	`{`
`64`	`64`	`if ( path.size() )`
`65`	`65`	`{`
`66`		`- this->net = dnn::readNetFromTensorflow(path);`
	`66`	`+ this->net = dnn::readNetFromTensorflow(path, std::string(), dnn::ENGINE_CLASSIC);`
`67`	`67`	`CV_LOG_INFO(NULL, "Successfully loaded model: " << path);`
`68`	`68`	`}`
`69`	`69`	`else`
`@@ -76,7 +76,7 @@ void DnnSuperResImpl::readModel(const String& weights, const String& definition)`
`76`	`76`	`{`
`77`	`77`	`if ( weights.size() && definition.size() )`
`78`	`78`	`{`
`79`		`- this->net = dnn::readNetFromTensorflow(weights, definition);`
	`79`	`+ this->net = dnn::readNetFromTensorflow(weights, definition, dnn::ENGINE_CLASSIC);`
`80`	`80`	`CV_LOG_INFO(NULL, "Successfully loaded model: " << weights << " " << definition);`
`81`	`81`	`}`
`82`	`82`	`else`