Merge remote-tracking branch 'upstream/master' into suggest-override

inference-engine/src/vpu/common/CMakeLists.txt

@@ -53,7 +53,7 @@ function(add_common_target TARGET_NAME STATIC_IE)
     openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
 
     target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
-                                         PRIVATE mvnc openvino::itt)
+                                         PRIVATE openvino::itt)
 
     if(NOT STATIC_IE)
         target_link_libraries(${TARGET_NAME} PUBLIC inference_engine_legacy)

inference-engine/thirdparty/clDNN/api/cldnn/graph/program.hpp

@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
 #pragma once
 
 #include "cldnn/runtime/engine.hpp"
+#include "cldnn/primitives/implementation_desc.hpp"
 
 #include "topology.hpp"
 
@@ -99,14 +98,6 @@ struct learning_params {
     learning_params() : momentum(0.9f), weights_decay(0.0005f) {}
 };
 
-/// @brief Description of primitives implementation.
-struct implementation_desc {
-    format::type output_format;  ///< Output format.
-    std::string kernel_name;  ///< GPU kernel name.
-};
-
-using implementation_forcing_map = std::map<primitive_id, implementation_desc>;
-
 /// @brief Represents user-provided program build option.
 struct build_option {
     /// @brief Allow primitives fusing during program build (default: false).

inference-engine/thirdparty/clDNN/api/cldnn/primitives/implementation_desc.hpp

@@ -0,0 +1,70 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "cldnn/runtime/tensor.hpp"
+
+#include <map>
+#include <ostream>
+
+namespace cldnn {
+
+/// @brief Primitives implementation type.
+enum class impl_types : uint8_t {
+    cpu = 1 << 0,
+    common = 1 << 1,
+    ocl = 1 << 2,
+    any = 0xFF,
+};
+
+inline impl_types operator&(impl_types a, impl_types b) {
+    typedef std::underlying_type<impl_types>::type underlying_type;
+    return static_cast<impl_types>(static_cast<underlying_type>(a) & static_cast<underlying_type>(b));
+}
+
+inline impl_types operator|(impl_types a, impl_types b) {
+    typedef std::underlying_type<impl_types>::type underlying_type;
+    return static_cast<impl_types>(static_cast<underlying_type>(a) | static_cast<underlying_type>(b));
+}
+
+inline impl_types operator~(impl_types a) {
+    typedef std::underlying_type<impl_types>::type underlying_type;
+    return static_cast<impl_types>(~static_cast<underlying_type>(a));
+}
+
+inline std::ostream& operator<<(std::ostream& out, const impl_types& impl_type) {
+    switch (impl_type) {
+        case impl_types::cpu: out << "cpu"; break;
+        case impl_types::common: out << "common"; break;
+        case impl_types::ocl: out << "ocl"; break;
+        case impl_types::any: out << "any"; break;
+        default: out << "unknown"; break;
+    }
+
+    return out;
+}
+
+/// @brief Description of primitives implementation.
+struct implementation_desc {
+    format::type output_format;  ///< Output format.
+    std::string kernel_name;     ///< GPU kernel name.
+    impl_types impl_type;        ///< GPU implementation type.
+
+    implementation_desc() :
+        output_format(format::any),
+        kernel_name(""),
+        impl_type(impl_types::any) {}
+
+    implementation_desc(format::type output_format,
+                        std::string kernel_name,
+                        impl_types impl_type = impl_types::any) :
+        output_format(output_format),
+        kernel_name(kernel_name),
+        impl_type(impl_type) {}
+};
+
+using implementation_forcing_map = std::map<primitive_id, implementation_desc>;
+
+}  // namespace cldnn

inference-engine/thirdparty/clDNN/src/CMakeLists.txt

@@ -37,12 +37,15 @@ file(GLOB __CLDNN_Headers__include
     "${__CLDNN_Directory__include}/*.hpp"
   )
 
-set(__CLDNN_Directory__gpu             "${CMAKE_CURRENT_SOURCE_DIR}/gpu")
-set(__CLDNN_Label__gpu                 "gpu")
+set(__CLDNN_Directory__impls             "${CMAKE_CURRENT_SOURCE_DIR}/impls")
+set(__CLDNN_Label__gpu                 "impls")
 file(GLOB __CLDNN_Sources__gpu
-    "${__CLDNN_Directory__gpu}/*.h"
-    "${__CLDNN_Directory__gpu}/*.hpp"
-    "${__CLDNN_Directory__gpu}/*.cpp"
+    "${__CLDNN_Directory__impls}/common/*.hpp"
+    "${__CLDNN_Directory__impls}/common/*.cpp"
+    "${__CLDNN_Directory__impls}/cpu/*.hpp"
+    "${__CLDNN_Directory__impls}/cpu/*.cpp"
+    "${__CLDNN_Directory__impls}/ocl/*.hpp"
+    "${__CLDNN_Directory__impls}/ocl/*.cpp"
   )
 
 set(__CLDNN_Directory__cg_cache        "${CLDNN__CODEGEN_INCDIR}")
@@ -128,5 +131,5 @@ endif()
 # ======================================================================================================
 
 ie_sse42_optimization_flags(sse4_2_flags)
-set_source_files_properties(gpu/detection_output_cpu.cpp half.cpp
+set_source_files_properties(impls/cpu/detection_output.cpp half.cpp
   PROPERTIES COMPILE_FLAGS "${sse4_2_flags}")