From: Alexander Alekhin <alexander.alekhin@intel.com>
Date: Wed, 19 Sep 2018 07:54:15 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/3.4' into merge-3.4
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~546
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=861415133e555df2158423726eed9290bbdfe1b9;p=platform%2Fupstream%2Fopencv.git

Merge remote-tracking branch 'upstream/3.4' into merge-3.4
---

861415133e555df2158423726eed9290bbdfe1b9
diff --cc modules/dnn/include/opencv2/dnn/dnn.hpp
index b2a68b1,680e7d5..cff78ba
--- a/modules/dnn/include/opencv2/dnn/dnn.hpp
+++ b/modules/dnn/include/opencv2/dnn/dnn.hpp
@@@ -937,8 -944,15 +937,15 @@@ CV__DNN_INLINE_NS_BEGI
                               CV_OUT std::vector<int>& indices,
                               const float eta = 1.f, const int top_k = 0);
  
+     /** @brief Release a Myriad device is binded by OpenCV.
+      *
+      * Single Myriad device cannot be shared across multiple processes which uses
+      * Inference Engine's Myriad plugin.
+      */
+     CV_EXPORTS_W void resetMyriadDevice();
+ 
  //! @}
 -CV__DNN_EXPERIMENTAL_NS_END
 +CV__DNN_INLINE_NS_END
  }
  }
  
diff --cc modules/dnn/src/op_inf_engine.cpp
index 04de1ee,23794a1..9c49a06
--- a/modules/dnn/src/op_inf_engine.cpp
+++ b/modules/dnn/src/op_inf_engine.cpp
@@@ -589,4 -590,14 +590,14 @@@ void forwardInfEngine(Ptr<BackendNode>
  #endif  // HAVE_INF_ENGINE
  }
  
 -CV__DNN_EXPERIMENTAL_NS_BEGIN
++CV__DNN_INLINE_NS_BEGIN
+ 
+ void resetMyriadDevice()
+ {
+ #ifdef HAVE_INF_ENGINE
+     sharedPlugins.erase(InferenceEngine::TargetDevice::eMYRIAD);
+ #endif  // HAVE_INF_ENGINE
+ }
+ 
 -CV__DNN_EXPERIMENTAL_NS_END
++CV__DNN_INLINE_NS_END
  }}  // namespace dnn, namespace cv