Follow up for PR openvinotoolkit#5645 (openvinotoolkit#5702)

yekruglov · Jun 7, 2021 · bba8899 · bba8899
1 parent 4ee0714
commit bba8899
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/docs/template_plugin/src/template_infer_request.cpp b/docs/template_plugin/src/template_infer_request.cpp
@@ -8,6 +8,7 @@
 #include <string>
 #include <map>
 
+#include <ngraph/runtime/reference/convert.hpp>
 #include "template_infer_request.hpp"
 #include "template_executable_network.hpp"
 #include "template_plugin.hpp"
@@ -114,9 +115,10 @@ void TemplateInferRequest::InferImpl() {
 
 template<typename SrcT, typename DstT>
 static void blobCopy(const Blob::Ptr& src, const Blob::Ptr& dst) {
-    std::copy_n(InferenceEngine::as<InferenceEngine::MemoryBlob>(src)->rmap().as<const SrcT*>(),
-                src->size(),
-                InferenceEngine::as<InferenceEngine::MemoryBlob>(dst)->wmap().as<DstT*>());
+    ngraph::runtime::reference::convert<SrcT, DstT>(
+            InferenceEngine::as<InferenceEngine::MemoryBlob>(src)->rmap().as<const SrcT*>(),
+            InferenceEngine::as<InferenceEngine::MemoryBlob>(dst)->wmap().as<DstT*>(),
+            src->size());
 }
 
 static void blobCopy(const Blob::Ptr& src, const Blob::Ptr& dst) {

diff --git a/inference-engine/src/hetero_plugin/hetero_async_infer_request.cpp b/inference-engine/src/hetero_plugin/hetero_async_infer_request.cpp
@@ -54,7 +54,7 @@ StatusCode HeteroAsyncInferRequest::Wait(int64_t millis_timeout) {
         waitStatus = AsyncInferRequestThreadSafeDefault::Wait(millis_timeout);
     } catch(...) {
         for (auto&& requestDesc : _heteroInferRequest->_inferRequests) {
-            requestDesc._request->Wait(-1);
+            requestDesc._request->Wait(InferRequest::RESULT_READY);
         }
         throw;
     }

diff --git a/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_executable_network_internal.hpp b/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_executable_network_internal.hpp
@@ -86,7 +86,7 @@ class ExecutableNetworkInternal : public IExecutableNetworkInternal {
      * @param[in]  plugin  The plugin
      * @note Needed to correctly handle ownership between objects.
      */
-    virtual void SetPointerToPlugin(IInferencePlugin::Ptr plugin) {
+    void SetPointerToPlugin(const IInferencePlugin::Ptr& plugin) {
         _plugin = plugin;
     }
 

diff --git a/inference-engine/tests/functional/plugin/cpu/CMakeLists.txt b/inference-engine/tests/functional/plugin/cpu/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(cpuSpecificRtInfo STATIC ${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin/uti
 target_link_libraries(cpuSpecificRtInfo PRIVATE ${NGRAPH_LIBRARIES})
 
 set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin)
-set(DEPENDENCIES MKLDNNPlugin)
+set(DEPENDENCIES MKLDNNPlugin AutoPlugin)
 set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo)
 if (NGRAPH_ONNX_IMPORT_ENABLE AND NOT NGRAPH_USE_PROTOBUF_LITE)
     list(APPEND INCLUDES "${OpenVINO_MAIN_SOURCE_DIR}/docs/onnx_custom_op")

diff --git a/inference-engine/tests/functional/plugin/gpu/CMakeLists.txt b/inference-engine/tests/functional/plugin/gpu/CMakeLists.txt
@@ -14,6 +14,7 @@ addIeTargetTest(
             ${CMAKE_CURRENT_SOURCE_DIR}
         DEPENDENCIES
             clDNNPlugin
+            AutoPlugin
         LINK_LIBRARIES
             funcSharedTests
             ${CLDNN__OCL_ICD_LIBPATH}