Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 1 May 2021 09:44:24 +0000 (09:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 1 May 2021 09:44:24 +0000 (09:44 +0000)
13 files changed:
1  2 
doc/Doxyfile.in
doc/tutorials/calib3d/real_time_pose/real_time_pose.markdown
modules/calib3d/include/opencv2/calib3d.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/src/system.cpp
modules/dnn/CMakeLists.txt
modules/dnn/src/ie_ngraph.cpp
modules/dnn/src/layers/crop_and_resize_layer.cpp
modules/imgproc/src/contours.cpp
modules/imgproc/src/templmatch.cpp
modules/imgproc/test/test_contours.cpp
modules/imgproc/test/test_templmatch.cpp
modules/stitching/src/matchers.cpp

diff --cc doc/Doxyfile.in
Simple merge
Simple merge
Simple merge
@@@ -684,9 -684,26 +687,26 @@@ void InfEngineNgraphNet::initPlugin(Inf
                      InferenceEngine::PluginConfigParams::KEY_CPU_THREADS_NUM, format("%d", getNumThreads()),
                  }}, device_name);
  #endif
+ #if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2021_2)
+             if (device_name.find("GPU") == 0)
+             {
+ #if OPENCV_HAVE_FILESYSTEM_SUPPORT
+                 std::string cache_path = utils::fs::getCacheDirectory((std::string("dnn_ie_cache_") + device_name).c_str(), "OPENCV_DNN_IE_GPU_CACHE_DIR");
+ #else
+                 std::string cache_path = utils::getConfigurationParameterString("OPENCV_DNN_IE_GPU_CACHE_DIR", "");
+ #endif
+                 if (!cache_path.empty() && cache_path != "disabled")
+                 {
+                     CV_LOG_INFO(NULL, "OpenCV/nGraph: using GPU kernels cache: " << cache_path);
+                     ie.SetConfig({{
+                         InferenceEngine::PluginConfigParams::KEY_CACHE_DIR, cache_path,
+                     }}, device_name);
+                 }
+             }
+ #endif
          }
          std::map<std::string, std::string> config;
 -        if (device_name == "MYRIAD") {
 +        if (device_name == "MYRIAD" || device_name == "HDDL") {
  #if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
              config.emplace("MYRIAD_DETECT_NETWORK_BATCH", CONFIG_VALUE(NO));
  #else
Simple merge
Simple merge
Simple merge