diff --git a/.ci/azure/linux_lohika.yml b/.ci/azure/linux_lohika.yml index 198e24433c9..6c65d958b8b 100644 --- a/.ci/azure/linux_lohika.yml +++ b/.ci/azure/linux_lohika.yml @@ -70,7 +70,7 @@ jobs: env -C ~/work ./buildreleasenolto.sh libinference_engine_preproc.so - MKLDNNPlugin + ov_intel_cpu_plugin ov_intel_gpu_plugin clDNN_unit_tests64 gpuFuncTests diff --git a/.ci/azure/linux_onnxruntime.yml b/.ci/azure/linux_onnxruntime.yml index 6a3a81cfe27..7257b4f37d1 100644 --- a/.ci/azure/linux_onnxruntime.yml +++ b/.ci/azure/linux_onnxruntime.yml @@ -98,7 +98,7 @@ jobs: -DENABLE_OPENCV=OFF -DENABLE_CPPLINT=OFF -DENABLE_TESTS=OFF - -DENABLE_MKL_DNN=ON + -DENABLE_INTEL_CPU=ON -DENABLE_INTEL_GPU=OFF -DENABLE_PROFILING_ITT=OFF -DENABLE_SAMPLES=OFF diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile index dc35c16a643..a2fd0dcbcf4 100644 --- a/.ci/openvino-onnx/Dockerfile +++ b/.ci/openvino-onnx/Dockerfile @@ -60,7 +60,7 @@ RUN cmake .. \ -DENABLE_OPENCV=OFF \ -DENABLE_CPPLINT=OFF \ -DENABLE_TESTS=OFF \ - -DENABLE_MKL_DNN=ON \ + -DENABLE_INTEL_CPU=ON \ -DENABLE_INTEL_GPU=OFF \ -DENABLE_PROFILING_ITT=OFF \ -DENABLE_SAMPLES=OFF \ diff --git a/.gitmodules b/.gitmodules index f13e3c9db7e..4c0f0a395b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ -[submodule "inference-engine/thirdparty/mkl-dnn"] - path = inference-engine/thirdparty/mkl-dnn +[submodule "src/plugins/intel_cpu/thirdparty/mkl-dnn"] + path = src/plugins/intel_cpu/thirdparty/mkl-dnn url = https://github.com/openvinotoolkit/oneDNN.git ignore = dirty [submodule "thirdparty/xbyak"] diff --git a/CODEOWNERS b/CODEOWNERS index 76c0ccf5c8a..da0b7e9b25f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -38,9 +38,9 @@ Jenkinsfile @openvinotoolkit/openvino-admins /src/tests_deprecated/readers/ @openvinotoolkit/openvino-ngraph-maintainers # IE CPU: -/inference-engine/src/mkldnn_plugin/ @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers +/src/plugins/intel_cpu/ @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers /src/common/low_precision_transformations/ @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers -/inference-engine/thirdparty/mkl-dnn/ @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers +/src/plugins/intel_cpu/thirdparty/mkl-dnn/ @openvinotoolkit/openvino-ie-cpu-maintainers @openvinotoolkit/openvino-ie-cpu-developers # IE GPU: /src/inference/include/ie/gpu/ @openvinotoolkit/openvino-ie-gpu-maintainers @openvinotoolkit/openvino-ie-gpu-developers diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index c374d022a20..fea3d596d13 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -58,10 +58,10 @@ ie_coverage_extract(INPUT "openvino" OUTPUT "template_plugin" ie_coverage_genhtml(INFO_FILE "template_plugin" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") -if(ENABLE_MKL_DNN) - ie_coverage_extract(INPUT "openvino" OUTPUT "mkldnn_plugin" - PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/inference-engine/src/mkldnn_plugin/*") - ie_coverage_genhtml(INFO_FILE "mkldnn_plugin" +if(ENABLE_INTEL_CPU) + ie_coverage_extract(INPUT "openvino" OUTPUT "intel_cpu_plugin" + PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/intel_cpu/*") + ie_coverage_genhtml(INFO_FILE "intel_cpu_plugin" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") endif() diff --git a/cmake/features.cmake b/cmake/features.cmake index 8ceefe75d85..cca9a235183 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -6,7 +6,7 @@ # Common cmake options # -ie_dependent_option (ENABLE_MKL_DNN "MKL-DNN plugin for inference engine" ON "X86_64" OFF) +ie_dependent_option (ENABLE_INTEL_CPU "CPU plugin for inference engine" ON "X86_64" OFF) ie_option (ENABLE_TESTS "unit, behavior and functional tests" OFF) @@ -207,8 +207,8 @@ if (ENABLE_INTEL_GPU) add_definitions(-DENABLE_INTEL_GPU=1) endif() -if (ENABLE_MKL_DNN) - add_definitions(-DENABLE_MKL_DNN=1) +if (ENABLE_INTEL_CPU) + add_definitions(-DENABLE_INTEL_CPU=1) endif() if (ENABLE_INTEL_GNA) diff --git a/docs/IE_DG/Cross_Check_Tool.md b/docs/IE_DG/Cross_Check_Tool.md index d53d3dddfe4..0d3cd62d42b 100644 --- a/docs/IE_DG/Cross_Check_Tool.md +++ b/docs/IE_DG/Cross_Check_Tool.md @@ -72,7 +72,7 @@ InferenceEngine: API version ............ 1.0 Build .................. lnx_20180510 - Description ....... MKLDNNPlugin + Description ....... ov_intel_cpu_plugin API version ............ 0.1 Build .................. ci-main-03659 @@ -135,7 +135,7 @@ InferenceEngine: API version ............ 1.0 Build .................. ### - Description ....... MKLDNNPlugin + Description ....... ov_intel_cpu_plugin [ INFO ] Inputs detected: [ INFO ] Statistics will be dumped for 1 layers: diff --git a/docs/IE_DG/inference_engine_intro.md b/docs/IE_DG/inference_engine_intro.md index 9692fabe72d..53b17b3ee13 100644 --- a/docs/IE_DG/inference_engine_intro.md +++ b/docs/IE_DG/inference_engine_intro.md @@ -70,7 +70,7 @@ The table below shows the plugin libraries and additional dependencies for Linux | Plugin | Library name for Linux | Dependency libraries for Linux | Library name for Windows | Dependency libraries for Windows | Library name for macOS | Dependency libraries for macOS | |--------|-----------------------------|-------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------------------------------|------------------------------|---------------------------------------------| -| CPU | `libMKLDNNPlugin.so` | | `MKLDNNPlugin.dll` | | `libMKLDNNPlugin.so` | | +| CPU | `libov_intel_cpu_plugin.so` | | `ov_intel_cpu_plugin.dll` | | `libov_intel_cpu_plugin.so` | | | GPU | `libov_intel_gpu_plugin.so` | `libOpenCL.so` | `ov_intel_gpu_plugin.dll` | `OpenCL.dll` | Is not supported | - | | MYRIAD | `libmyriadPlugin.so` | `libusb.so`, | `myriadPlugin.dll` | `usb.dll` | `libmyriadPlugin.so` | `libusb.dylib` | | HDDL | `libHDDLPlugin.so` | `libbsl.so`, `libhddlapi.so`, `libmvnc-hddl.so` | `HDDLPlugin.dll` | `bsl.dll`, `hddlapi.dll`, `json-c.dll`, `libcrypto-1_1-x64.dll`, `libssl-1_1-x64.dll`, `mvnc-hddl.dll` | Is not supported | - | diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp index c36cd07ca93..817c6162310 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp @@ -50,7 +50,7 @@ INSTANTIATE_TEST_SUITE_P( // Hetero Executable Network GetMetric // -#ifdef ENABLE_MKL_DNN +#ifdef ENABLE_INTEL_CPU INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, @@ -68,5 +68,5 @@ INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK, ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)); -#endif // ENABLE_MKL_DNN +#endif // ENABLE_INTEL_CPU } // namespace diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api.pyx b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api.pyx index a945f2caaf8..9be0999d34f 100644 --- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api.pyx +++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api.pyx @@ -550,7 +550,7 @@ cdef class IECore: .. code-block:: python ie = IECore() - ie.register_plugin(plugin="MKLDNNPlugin", device_name="MY_NEW_PLUGIN") + ie.register_plugin(plugin="ov_intel_cpu_plugin", device_name="MY_NEW_PLUGIN") """ self.impl.registerPlugin(plugin_name.encode(), device_name.encode()) diff --git a/inference-engine/ie_bridges/python/tests/test_IECore.py b/inference-engine/ie_bridges/python/tests/test_IECore.py index f7b67e20feb..89a047d2e24 100644 --- a/inference-engine/ie_bridges/python/tests/test_IECore.py +++ b/inference-engine/ie_bridges/python/tests/test_IECore.py @@ -80,8 +80,8 @@ def test_query_network(device): def test_register_plugin(): ie = IECore() if ie.get_metric("CPU", "FULL_DEVICE_NAME") == "arm_compute::NEON": - pytest.skip("Can't run on ARM plugin due-to MKLDNNPlugin specific test") - ie.register_plugin("MKLDNNPlugin", "BLA") + pytest.skip("Can't run on ARM plugin due-to ov_intel_cpu_plugin specific test") + ie.register_plugin("ov_intel_cpu_plugin", "BLA") net = ie.read_network(model=test_net_xml, weights=test_net_bin) exec_net = ie.load_network(net, "BLA") assert isinstance(exec_net, ExecutableNetwork), "Cannot load the network to the registered plugin with name 'BLA'" @@ -92,7 +92,7 @@ def test_register_plugin(): def test_register_plugins(): ie = IECore() if ie.get_metric("CPU", "FULL_DEVICE_NAME") == "arm_compute::NEON": - pytest.skip("Can't run on ARM plugin due-to MKLDNNPlugin specific test") + pytest.skip("Can't run on ARM plugin due-to ov_intel_cpu_plugin specific test") if platform == "linux" or platform == "linux2": ie.register_plugins(plugins_xml) elif platform == "darwin": diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt index ed4833563b7..0cdedf18f88 100644 --- a/inference-engine/src/CMakeLists.txt +++ b/inference-engine/src/CMakeLists.txt @@ -7,10 +7,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) ie_add_compiler_flags(-Wmissing-declarations) endif() -if(ENABLE_MKL_DNN) - add_subdirectory(mkldnn_plugin) -endif() - if(ENABLE_VPU) add_subdirectory(vpu) endif() diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt index 4bf4d28b472..3a5e3e41a81 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt @@ -20,43 +20,3 @@ endif() if (ENABLE_INTEL_GPU) add_subdirectory(clDNN) endif() - -function(ie_add_mkldnn) - set(DNNL_ENABLE_JIT_PROFILING ${BUILD_SHARED_LIBS} CACHE BOOL "" FORCE) - if(BUILD_SHARED_LIBS AND ENABLE_PROFILING_ITT) - set(DNNL_ENABLE_ITT_TASKS ON CACHE BOOL "" FORCE) - else() - set(DNNL_ENABLE_ITT_TASKS OFF CACHE BOOL "" FORCE) - endif() - set(DNNL_ENABLE_CONCURRENT_EXEC ON CACHE BOOL "" FORCE) - set(DNNL_ENABLE_PRIMITIVE_CACHE OFF CACHE BOOL "" FORCE) ## TODO: try it later - set(DNNL_ENABLE_MAX_CPU_ISA ON CACHE BOOL "" FORCE) - set(DNNL_LIBRARY_TYPE STATIC CACHE BOOL "" FORCE) - set(DNNL_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) - set(DNNL_BUILD_TESTS OFF CACHE BOOL "" FORCE) - set(DNNL_CPU_RUNTIME "${THREADING}" CACHE STRING "" FORCE) - set(DNNL_GPU_RUNTIME "NONE" CACHE STRING "" FORCE) - set(DNNL_BLAS_VENDOR "NONE" CACHE STRING "" FORCE) - set(SDL_cmake_included ON) ## to skip internal SDL flags. SDL flags are already set on IE level - if (ANDROID OR ((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND NOT (THREADING STREQUAL "OMP"))) - set(OpenMP_cmake_included ON) ## to skip "omp simd" inside a code. Lead to some crashes inside NDK LLVM.. - endif() - - if(SUGGEST_OVERRIDE_SUPPORTED) - # xbyak compilation fails - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override") - endif() - if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wno-undef) - elseif(UNIX AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -diag-disable=10121") - endif() - - add_subdirectory(mkl-dnn EXCLUDE_FROM_ALL) - add_library(mkldnn ALIAS dnnl) - ov_install_static_lib(dnnl cpu) -endfunction() - -if(ENABLE_MKL_DNN) - ie_add_mkldnn() -endif() diff --git a/samples/cpp/ngraph_function_creation_sample/README.md b/samples/cpp/ngraph_function_creation_sample/README.md index 4f33bf87457..c5e8ef64851 100644 --- a/samples/cpp/ngraph_function_creation_sample/README.md +++ b/samples/cpp/ngraph_function_creation_sample/README.md @@ -95,7 +95,7 @@ ngraph_function_creation_sample.exe -m lenet.bin -i 7-ubyte [ INFO ] Loading Inference Engine [ INFO ] Device info: CPU - MKLDNNPlugin version ......... + ov_intel_cpu_plugin version ......... Build ........... [ INFO ] Preparing input blobs diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 1afd8a06c20..ddb5d4950e7 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -10,6 +10,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" SKIP "${OpenVINO_SOURCE_DIR}/bin" "${OpenVINO_SOURCE_DIR}/build" "${OpenVINO_SOURCE_DIR}/thirdparty" + "${OpenVINO_SOURCE_DIR}/src/plugins/intel_cpu/thirdparty" "${OpenVINO_SOURCE_DIR}/src/bindings/python/thirdparty/pybind11" "${IE_MAIN_SOURCE_DIR}/thirdparty" "${OpenVINO_SOURCE_DIR}/tools/pot/thirdparty" diff --git a/src/bindings/c/tests/CMakeLists.txt b/src/bindings/c/tests/CMakeLists.txt index 60f0c139ac6..9135c944b7a 100644 --- a/src/bindings/c/tests/CMakeLists.txt +++ b/src/bindings/c/tests/CMakeLists.txt @@ -26,8 +26,8 @@ if(ENABLE_AUTO OR ENABLE_MULTI) add_dependencies(${TARGET_NAME} ov_auto_plugin) endif() -if(ENABLE_MKL_DNN) - add_dependencies(${TARGET_NAME} MKLDNNPlugin) +if(ENABLE_INTEL_CPU) + add_dependencies(${TARGET_NAME} ov_intel_cpu_plugin) endif() if(ENABLE_INTEL_GPU) diff --git a/src/bindings/c/tests/ie_c_api_test.cpp b/src/bindings/c/tests/ie_c_api_test.cpp index 0e0e463ef95..0559cab7998 100644 --- a/src/bindings/c/tests/ie_c_api_test.cpp +++ b/src/bindings/c/tests/ie_c_api_test.cpp @@ -157,7 +157,7 @@ TEST(ie_core_register_plugin, registerPlugin) { IE_EXPECT_OK(ie_core_read_network(core, xml, bin, &network)); EXPECT_NE(nullptr, network); - const char *plugin_name = "MKLDNNPlugin"; + const char *plugin_name = "ov_intel_cpu_plugin"; const char *device_name = "BLA"; IE_EXPECT_OK(ie_core_register_plugin(core, plugin_name, device_name)); diff --git a/src/bindings/python/tests/test_inference_engine/test_core.py b/src/bindings/python/tests/test_inference_engine/test_core.py index 3806cd2348b..12436b06738 100644 --- a/src/bindings/python/tests/test_inference_engine/test_core.py +++ b/src/bindings/python/tests/test_inference_engine/test_core.py @@ -208,7 +208,7 @@ def test_query_model(device): @pytest.mark.skipif(os.environ.get("TEST_DEVICE", "CPU") != "CPU", reason="Device independent test") def test_register_plugin(): ie = Core() - ie.register_plugin("MKLDNNPlugin", "BLA") + ie.register_plugin("ov_intel_cpu_plugin", "BLA") func = ie.read_model(model=test_net_xml, weights=test_net_bin) exec_net = ie.compile_model(func, "BLA") assert isinstance(exec_net, CompiledModel), \ diff --git a/src/cmake/ov_runtime.cmake b/src/cmake/ov_runtime.cmake index 3ff4a28d36d..d9194b520de 100644 --- a/src/cmake/ov_runtime.cmake +++ b/src/cmake/ov_runtime.cmake @@ -48,7 +48,7 @@ ie_mark_target_as_cc(${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) ie_register_plugins(MAIN_TARGET ${TARGET_NAME} - POSSIBLE_PLUGINS ov_auto_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin MKLDNNPlugin myriadPlugin) + POSSIBLE_PLUGINS ov_auto_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin ov_intel_cpu_plugin myriadPlugin) # Export for build tree diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt index 1e3dbf4a88b..ad6dd6bdc22 100644 --- a/src/core/tests/CMakeLists.txt +++ b/src/core/tests/CMakeLists.txt @@ -422,13 +422,13 @@ endif() list(APPEND UNIT_TESTS_DEPENDENCIES template_ov_extension) -if (ENABLE_MKL_DNN AND ENABLE_OV_CORE_BACKEND_UNIT_TESTS) +if (ENABLE_INTEL_CPU AND ENABLE_OV_CORE_BACKEND_UNIT_TESTS) message(STATUS "OV_CORE_TESTS: IE:CPU enabled") set(ACTIVE_BACKEND_LIST ${ACTIVE_BACKEND_LIST} "IE:CPU") if (ENABLE_STRICT_DEPENDENCIES) # For convinience add a runtime dependency to build along with this target. # Warning: Parallel build with -GNinja may not be efficient. - list(APPEND UNIT_TESTS_DEPENDENCIES MKLDNNPlugin) + list(APPEND UNIT_TESTS_DEPENDENCIES ov_intel_cpu_plugin) endif() endif() diff --git a/src/core/tests/frontend/paddle/CMakeLists.txt b/src/core/tests/frontend/paddle/CMakeLists.txt index 998be1684ef..1110935523e 100644 --- a/src/core/tests/frontend/paddle/CMakeLists.txt +++ b/src/core/tests/frontend/paddle/CMakeLists.txt @@ -58,6 +58,6 @@ add_dependencies(${TARGET_NAME} paddle_test_models) add_dependencies(${TARGET_NAME} ov_paddle_frontend) # Fuzzy tests for PaddlePaddle use IE_CPU engine -if (ENABLE_MKL_DNN) - add_dependencies(${TARGET_NAME} MKLDNNPlugin) +if (ENABLE_INTEL_CPU) + add_dependencies(${TARGET_NAME} ov_intel_cpu_plugin) endif() diff --git a/src/core/tests/runtime/ie/unit_test.manifest b/src/core/tests/runtime/ie/unit_test.manifest index 6042755ad67..070b0cff870 100644 --- a/src/core/tests/runtime/ie/unit_test.manifest +++ b/src/core/tests/runtime/ie/unit_test.manifest @@ -226,7 +226,7 @@ onnx_size_op_single onnx_size_op_graph_end onnx_size_op_graph_middle -# /openvino/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp:747 +# /openvino/src/plugins/intel_cpu/mkldnn_graph.cpp:747 # Output blob byte size is not equal network output byte size (64!=216)." thrown in the test body. onnx_model_quant_conv_linear_3d diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index ff57fd290ac..54f90dca336 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -6,6 +6,10 @@ if(ENABLE_HETERO) add_subdirectory(hetero) endif() +if(ENABLE_INTEL_CPU) + add_subdirectory(intel_cpu) +endif() + if(ENABLE_INTEL_GPU) add_subdirectory(intel_gpu) endif() diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt similarity index 86% rename from inference-engine/src/mkldnn_plugin/CMakeLists.txt rename to src/plugins/intel_cpu/CMakeLists.txt index f2a9f6c5339..7b501f22b02 100644 --- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt +++ b/src/plugins/intel_cpu/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "MKLDNNPlugin") +set(TARGET_NAME "ov_intel_cpu_plugin") if(CMAKE_COMPILER_IS_GNUCC) ie_add_compiler_flags(-Wno-all) @@ -16,11 +16,13 @@ if (ENABLE_CPU_DEBUG_CAPS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCPU_DEBUG_CAPS") endif() -file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) -file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h - ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) +file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) +file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp) -addVersionDefines(mkldnn_plugin.cpp CI_BUILD_NUMBER) +addVersionDefines(${CMAKE_CURRENT_SOURCE_DIR}/src/mkldnn_plugin.cpp CI_BUILD_NUMBER) + +add_subdirectory(thirdparty) # create plugin @@ -45,7 +47,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE mkldnn inference_engine_snippets) target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_EXTENSION_API) -target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $) @@ -54,8 +56,8 @@ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE # TODO: The same for proposal, proposalONNX, topk cross_compiled_file(${TARGET_NAME} ARCH AVX2 ANY - nodes/proposal_imp.cpp - API nodes/proposal_imp.hpp + src/nodes/proposal_imp.cpp + API src/nodes/proposal_imp.hpp NAME proposal_exec NAMESPACE InferenceEngine::Extensions::Cpu::XARCH ) @@ -72,7 +74,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE $ $ $ - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src $) target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $) diff --git a/inference-engine/src/mkldnn_plugin/config.cpp b/src/plugins/intel_cpu/src/config.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/config.cpp rename to src/plugins/intel_cpu/src/config.cpp diff --git a/inference-engine/src/mkldnn_plugin/config.h b/src/plugins/intel_cpu/src/config.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/config.h rename to src/plugins/intel_cpu/src/config.h diff --git a/inference-engine/src/mkldnn_plugin/cpu_shape.cpp b/src/plugins/intel_cpu/src/cpu_shape.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/cpu_shape.cpp rename to src/plugins/intel_cpu/src/cpu_shape.cpp diff --git a/inference-engine/src/mkldnn_plugin/cpu_shape.h b/src/plugins/intel_cpu/src/cpu_shape.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/cpu_shape.h rename to src/plugins/intel_cpu/src/cpu_shape.h diff --git a/inference-engine/src/mkldnn_plugin/cpu_types.cpp b/src/plugins/intel_cpu/src/cpu_types.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/cpu_types.cpp rename to src/plugins/intel_cpu/src/cpu_types.cpp diff --git a/inference-engine/src/mkldnn_plugin/cpu_types.h b/src/plugins/intel_cpu/src/cpu_types.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/cpu_types.h rename to src/plugins/intel_cpu/src/cpu_types.h diff --git a/inference-engine/src/mkldnn_plugin/docs/README.md b/src/plugins/intel_cpu/src/docs/README.md similarity index 100% rename from inference-engine/src/mkldnn_plugin/docs/README.md rename to src/plugins/intel_cpu/src/docs/README.md diff --git a/inference-engine/src/mkldnn_plugin/docs/blob_dumping.md b/src/plugins/intel_cpu/src/docs/blob_dumping.md similarity index 100% rename from inference-engine/src/mkldnn_plugin/docs/blob_dumping.md rename to src/plugins/intel_cpu/src/docs/blob_dumping.md diff --git a/inference-engine/src/mkldnn_plugin/docs/graph_serialization.md b/src/plugins/intel_cpu/src/docs/graph_serialization.md similarity index 100% rename from inference-engine/src/mkldnn_plugin/docs/graph_serialization.md rename to src/plugins/intel_cpu/src/docs/graph_serialization.md diff --git a/inference-engine/src/mkldnn_plugin/docs/verbose.md b/src/plugins/intel_cpu/src/docs/verbose.md similarity index 100% rename from inference-engine/src/mkldnn_plugin/docs/verbose.md rename to src/plugins/intel_cpu/src/docs/verbose.md diff --git a/inference-engine/src/mkldnn_plugin/emitters/cpu_generator.cpp b/src/plugins/intel_cpu/src/emitters/cpu_generator.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/cpu_generator.cpp rename to src/plugins/intel_cpu/src/emitters/cpu_generator.cpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/cpu_generator.hpp b/src/plugins/intel_cpu/src/emitters/cpu_generator.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/cpu_generator.hpp rename to src/plugins/intel_cpu/src/emitters/cpu_generator.hpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_bf16_emitters.hpp b/src/plugins/intel_cpu/src/emitters/jit_bf16_emitters.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_bf16_emitters.hpp rename to src/plugins/intel_cpu/src/emitters/jit_bf16_emitters.hpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_eltwise_emitters.cpp b/src/plugins/intel_cpu/src/emitters/jit_eltwise_emitters.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_eltwise_emitters.cpp rename to src/plugins/intel_cpu/src/emitters/jit_eltwise_emitters.cpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_eltwise_emitters.hpp b/src/plugins/intel_cpu/src/emitters/jit_eltwise_emitters.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_eltwise_emitters.hpp rename to src/plugins/intel_cpu/src/emitters/jit_eltwise_emitters.hpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_emitter.cpp b/src/plugins/intel_cpu/src/emitters/jit_emitter.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_emitter.cpp rename to src/plugins/intel_cpu/src/emitters/jit_emitter.cpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_emitter.hpp b/src/plugins/intel_cpu/src/emitters/jit_emitter.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_emitter.hpp rename to src/plugins/intel_cpu/src/emitters/jit_emitter.hpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_load_store_emitters.cpp b/src/plugins/intel_cpu/src/emitters/jit_load_store_emitters.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_load_store_emitters.cpp rename to src/plugins/intel_cpu/src/emitters/jit_load_store_emitters.cpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_load_store_emitters.hpp b/src/plugins/intel_cpu/src/emitters/jit_load_store_emitters.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_load_store_emitters.hpp rename to src/plugins/intel_cpu/src/emitters/jit_load_store_emitters.hpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_mkldnn_emitters.cpp b/src/plugins/intel_cpu/src/emitters/jit_mkldnn_emitters.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_mkldnn_emitters.cpp rename to src/plugins/intel_cpu/src/emitters/jit_mkldnn_emitters.cpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_mkldnn_emitters.hpp b/src/plugins/intel_cpu/src/emitters/jit_mkldnn_emitters.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_mkldnn_emitters.hpp rename to src/plugins/intel_cpu/src/emitters/jit_mkldnn_emitters.hpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_mkldnn_ext_emitters.hpp b/src/plugins/intel_cpu/src/emitters/jit_mkldnn_ext_emitters.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_mkldnn_ext_emitters.hpp rename to src/plugins/intel_cpu/src/emitters/jit_mkldnn_ext_emitters.hpp diff --git a/inference-engine/src/mkldnn_plugin/emitters/jit_snippets_emitters.hpp b/src/plugins/intel_cpu/src/emitters/jit_snippets_emitters.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/emitters/jit_snippets_emitters.hpp rename to src/plugins/intel_cpu/src/emitters/jit_snippets_emitters.hpp diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/blocked_memory_desc.cpp b/src/plugins/intel_cpu/src/memory_desc/blocked_memory_desc.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/blocked_memory_desc.cpp rename to src/plugins/intel_cpu/src/memory_desc/blocked_memory_desc.cpp diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/blocked_memory_desc.h b/src/plugins/intel_cpu/src/memory_desc/blocked_memory_desc.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/blocked_memory_desc.h rename to src/plugins/intel_cpu/src/memory_desc/blocked_memory_desc.h diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/cpu_blocked_memory_desc.cpp b/src/plugins/intel_cpu/src/memory_desc/cpu_blocked_memory_desc.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/cpu_blocked_memory_desc.cpp rename to src/plugins/intel_cpu/src/memory_desc/cpu_blocked_memory_desc.cpp diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/cpu_blocked_memory_desc.h b/src/plugins/intel_cpu/src/memory_desc/cpu_blocked_memory_desc.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/cpu_blocked_memory_desc.h rename to src/plugins/intel_cpu/src/memory_desc/cpu_blocked_memory_desc.h diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/cpu_memory_desc.h b/src/plugins/intel_cpu/src/memory_desc/cpu_memory_desc.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/cpu_memory_desc.h rename to src/plugins/intel_cpu/src/memory_desc/cpu_memory_desc.h diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/cpu_memory_desc_utils.cpp b/src/plugins/intel_cpu/src/memory_desc/cpu_memory_desc_utils.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/cpu_memory_desc_utils.cpp rename to src/plugins/intel_cpu/src/memory_desc/cpu_memory_desc_utils.cpp diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/cpu_memory_desc_utils.h b/src/plugins/intel_cpu/src/memory_desc/cpu_memory_desc_utils.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/cpu_memory_desc_utils.h rename to src/plugins/intel_cpu/src/memory_desc/cpu_memory_desc_utils.h diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/dnnl_blocked_memory_desc.cpp b/src/plugins/intel_cpu/src/memory_desc/dnnl_blocked_memory_desc.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/dnnl_blocked_memory_desc.cpp rename to src/plugins/intel_cpu/src/memory_desc/dnnl_blocked_memory_desc.cpp diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/dnnl_blocked_memory_desc.h b/src/plugins/intel_cpu/src/memory_desc/dnnl_blocked_memory_desc.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/dnnl_blocked_memory_desc.h rename to src/plugins/intel_cpu/src/memory_desc/dnnl_blocked_memory_desc.h diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/dnnl_memory_desc.cpp b/src/plugins/intel_cpu/src/memory_desc/dnnl_memory_desc.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/dnnl_memory_desc.cpp rename to src/plugins/intel_cpu/src/memory_desc/dnnl_memory_desc.cpp diff --git a/inference-engine/src/mkldnn_plugin/memory_desc/dnnl_memory_desc.h b/src/plugins/intel_cpu/src/memory_desc/dnnl_memory_desc.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/memory_desc/dnnl_memory_desc.h rename to src/plugins/intel_cpu/src/memory_desc/dnnl_memory_desc.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn/ie_mkldnn.cpp b/src/plugins/intel_cpu/src/mkldnn/ie_mkldnn.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn/ie_mkldnn.cpp rename to src/plugins/intel_cpu/src/mkldnn/ie_mkldnn.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn/ie_mkldnn.h b/src/plugins/intel_cpu/src/mkldnn/ie_mkldnn.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn/ie_mkldnn.h rename to src/plugins/intel_cpu/src/mkldnn/ie_mkldnn.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn/iml_type_mapper.cpp b/src/plugins/intel_cpu/src/mkldnn/iml_type_mapper.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn/iml_type_mapper.cpp rename to src/plugins/intel_cpu/src/mkldnn/iml_type_mapper.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn/iml_type_mapper.h b/src/plugins/intel_cpu/src/mkldnn/iml_type_mapper.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn/iml_type_mapper.h rename to src/plugins/intel_cpu/src/mkldnn/iml_type_mapper.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_async_infer_request.cpp b/src/plugins/intel_cpu/src/mkldnn_async_infer_request.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_async_infer_request.cpp rename to src/plugins/intel_cpu/src/mkldnn_async_infer_request.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_async_infer_request.h b/src/plugins/intel_cpu/src/mkldnn_async_infer_request.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_async_infer_request.h rename to src/plugins/intel_cpu/src/mkldnn_async_infer_request.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_descriptor.cpp b/src/plugins/intel_cpu/src/mkldnn_descriptor.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_descriptor.cpp rename to src/plugins/intel_cpu/src/mkldnn_descriptor.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_descriptor.h b/src/plugins/intel_cpu/src/mkldnn_descriptor.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_descriptor.h rename to src/plugins/intel_cpu/src/mkldnn_descriptor.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_edge.cpp b/src/plugins/intel_cpu/src/mkldnn_edge.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_edge.cpp rename to src/plugins/intel_cpu/src/mkldnn_edge.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_edge.h b/src/plugins/intel_cpu/src/mkldnn_edge.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_edge.h rename to src/plugins/intel_cpu/src/mkldnn_edge.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.cpp b/src/plugins/intel_cpu/src/mkldnn_exec_network.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_exec_network.cpp rename to src/plugins/intel_cpu/src/mkldnn_exec_network.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.h b/src/plugins/intel_cpu/src/mkldnn_exec_network.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_exec_network.h rename to src/plugins/intel_cpu/src/mkldnn_exec_network.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_extension.cpp b/src/plugins/intel_cpu/src/mkldnn_extension.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_extension.cpp rename to src/plugins/intel_cpu/src/mkldnn_extension.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_extension.h b/src/plugins/intel_cpu/src/mkldnn_extension.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_extension.h rename to src/plugins/intel_cpu/src/mkldnn_extension.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.cpp b/src/plugins/intel_cpu/src/mkldnn_extension_mngr.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.cpp rename to src/plugins/intel_cpu/src/mkldnn_extension_mngr.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.h b/src/plugins/intel_cpu/src/mkldnn_extension_mngr.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.h rename to src/plugins/intel_cpu/src/mkldnn_extension_mngr.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_extension_utils.cpp b/src/plugins/intel_cpu/src/mkldnn_extension_utils.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_extension_utils.cpp rename to src/plugins/intel_cpu/src/mkldnn_extension_utils.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_extension_utils.h b/src/plugins/intel_cpu/src/mkldnn_extension_utils.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_extension_utils.h rename to src/plugins/intel_cpu/src/mkldnn_extension_utils.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp b/src/plugins/intel_cpu/src/mkldnn_graph.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp rename to src/plugins/intel_cpu/src/mkldnn_graph.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph.h b/src/plugins/intel_cpu/src/mkldnn_graph.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_graph.h rename to src/plugins/intel_cpu/src/mkldnn_graph.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.cpp b/src/plugins/intel_cpu/src/mkldnn_graph_dumper.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.cpp rename to src/plugins/intel_cpu/src/mkldnn_graph_dumper.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.h b/src/plugins/intel_cpu/src/mkldnn_graph_dumper.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.h rename to src/plugins/intel_cpu/src/mkldnn_graph_dumper.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.cpp b/src/plugins/intel_cpu/src/mkldnn_graph_optimizer.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.cpp rename to src/plugins/intel_cpu/src/mkldnn_graph_optimizer.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.h b/src/plugins/intel_cpu/src/mkldnn_graph_optimizer.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.h rename to src/plugins/intel_cpu/src/mkldnn_graph_optimizer.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_infer_request.cpp b/src/plugins/intel_cpu/src/mkldnn_infer_request.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_infer_request.cpp rename to src/plugins/intel_cpu/src/mkldnn_infer_request.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_infer_request.h b/src/plugins/intel_cpu/src/mkldnn_infer_request.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_infer_request.h rename to src/plugins/intel_cpu/src/mkldnn_infer_request.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_itt.h b/src/plugins/intel_cpu/src/mkldnn_itt.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_itt.h rename to src/plugins/intel_cpu/src/mkldnn_itt.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_memory.cpp b/src/plugins/intel_cpu/src/mkldnn_memory.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_memory.cpp rename to src/plugins/intel_cpu/src/mkldnn_memory.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_memory.h b/src/plugins/intel_cpu/src/mkldnn_memory.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_memory.h rename to src/plugins/intel_cpu/src/mkldnn_memory.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_memory_state.cpp b/src/plugins/intel_cpu/src/mkldnn_memory_state.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_memory_state.cpp rename to src/plugins/intel_cpu/src/mkldnn_memory_state.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_memory_state.h b/src/plugins/intel_cpu/src/mkldnn_memory_state.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_memory_state.h rename to src/plugins/intel_cpu/src/mkldnn_memory_state.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp b/src/plugins/intel_cpu/src/mkldnn_node.cpp similarity index 99% rename from inference-engine/src/mkldnn_plugin/mkldnn_node.cpp rename to src/plugins/intel_cpu/src/mkldnn_node.cpp index 14fd8b886be..f9c2f5a6867 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp +++ b/src/plugins/intel_cpu/src/mkldnn_node.cpp @@ -1154,7 +1154,7 @@ MKLDNNNode* MKLDNNNode::NodesFactory::create(const std::shared_ptr // getExceptionDescWithoutStatus removes redundant information from the exception message. For instance, the NotImplemented // exception is generated in the form: full_path_to_src_file:line_number [ NOT_IMPLEMENTED ] reason. // An example for gather node: - // /path-to-openVino-root/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_node.cpp:42 [ NOT_IMPLEMENTED ] Only opset7 Gather operation is supported + // /path-to-openVino-root/src/plugins/intel_cpu/nodes/mkldnn_gather_node.cpp:42 [ NOT_IMPLEMENTED ] Only opset7 Gather operation is supported // The most important part of the message is the reason, so the lambda trims everything up to "]" // Note that the op type and its friendly name will also be provided if we fail to create the node. auto getExceptionDescWithoutStatus = [](const InferenceEngine::Exception& ex) { diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.h b/src/plugins/intel_cpu/src/mkldnn_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_node.h rename to src/plugins/intel_cpu/src/mkldnn_node.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_nodes_factory.cpp b/src/plugins/intel_cpu/src/mkldnn_nodes_factory.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_nodes_factory.cpp rename to src/plugins/intel_cpu/src/mkldnn_nodes_factory.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp b/src/plugins/intel_cpu/src/mkldnn_plugin.cpp similarity index 99% rename from inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp rename to src/plugins/intel_cpu/src/mkldnn_plugin.cpp index 193df08ec59..8a4cc5c6d89 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp +++ b/src/plugins/intel_cpu/src/mkldnn_plugin.cpp @@ -876,5 +876,5 @@ InferenceEngine::IExecutableNetworkInternal::Ptr Engine::ImportNetwork(std::istr return execNetwork; } -static const Version version = {{2, 1}, CI_BUILD_NUMBER, "MKLDNNPlugin"}; +static const Version version = {{2, 1}, CI_BUILD_NUMBER, "ov_intel_cpu_plugin"}; IE_DEFINE_PLUGIN_CREATE_FUNCTION(Engine, version) diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.h b/src/plugins/intel_cpu/src/mkldnn_plugin.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_plugin.h rename to src/plugins/intel_cpu/src/mkldnn_plugin.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_primitive.cpp b/src/plugins/intel_cpu/src/mkldnn_primitive.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_primitive.cpp rename to src/plugins/intel_cpu/src/mkldnn_primitive.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_primitive.h b/src/plugins/intel_cpu/src/mkldnn_primitive.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_primitive.h rename to src/plugins/intel_cpu/src/mkldnn_primitive.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_selective_build.h b/src/plugins/intel_cpu/src/mkldnn_selective_build.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_selective_build.h rename to src/plugins/intel_cpu/src/mkldnn_selective_build.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_serialize.cpp b/src/plugins/intel_cpu/src/mkldnn_serialize.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_serialize.cpp rename to src/plugins/intel_cpu/src/mkldnn_serialize.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_serialize.h b/src/plugins/intel_cpu/src/mkldnn_serialize.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_serialize.h rename to src/plugins/intel_cpu/src/mkldnn_serialize.h diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_weights_cache.cpp b/src/plugins/intel_cpu/src/mkldnn_weights_cache.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_weights_cache.cpp rename to src/plugins/intel_cpu/src/mkldnn_weights_cache.cpp diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_weights_cache.hpp b/src/plugins/intel_cpu/src/mkldnn_weights_cache.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/mkldnn_weights_cache.hpp rename to src/plugins/intel_cpu/src/mkldnn_weights_cache.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/align_matmul_input_ranks.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/align_matmul_input_ranks.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/align_matmul_input_ranks.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/align_matmul_input_ranks.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/align_matmul_input_ranks.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/align_matmul_input_ranks.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/align_matmul_input_ranks.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/align_matmul_input_ranks.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_broadcast_to_tiles.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_broadcast_to_tiles.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_broadcast_to_tiles.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_broadcast_to_tiles.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_broadcast_to_tiles.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_broadcast_to_tiles.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_broadcast_to_tiles.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_broadcast_to_tiles.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_matmul_to_fc.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_matmul_to_fc.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_matmul_to_fc.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_matmul_to_fc.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_tile_to_seq_tiles.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_tile_to_seq_tiles.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_tile_to_seq_tiles.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_tile_to_seq_tiles.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_tile_to_seq_tiles.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_tile_to_seq_tiles.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_tile_to_seq_tiles.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_tile_to_seq_tiles.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_cpu_specific_opset.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_cpu_specific_opset.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_cpu_specific_opset.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_to_cpu_specific_opset.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_leaky_relu.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_leaky_relu.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_leaky_relu.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_to_leaky_relu.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_leaky_relu.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_leaky_relu.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_leaky_relu.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_to_leaky_relu.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_power_static.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_power_static.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_power_static.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_to_power_static.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_power_static.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_power_static.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_power_static.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_to_power_static.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_swish_cpu.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_swish_cpu.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_swish_cpu.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_to_swish_cpu.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_swish_cpu.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_swish_cpu.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/convert_to_swish_cpu.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/convert_to_swish_cpu.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/fc_bias_fusion.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/fc_bias_fusion.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/fc_bias_fusion.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/fc_bias_fusion.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/move_eltwise_up_data_movement.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/move_eltwise_up_data_movement.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/move_eltwise_up_data_movement.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/move_eltwise_up_data_movement.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/move_eltwise_up_data_movement.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/move_eltwise_up_data_movement.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/move_eltwise_up_data_movement.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/move_eltwise_up_data_movement.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/fully_connected.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/fully_connected.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/fully_connected.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/fully_connected.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/fully_connected.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/fully_connected.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/fully_connected.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/fully_connected.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/leaky_relu.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/leaky_relu.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/leaky_relu.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/leaky_relu.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/leaky_relu.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/leaky_relu.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/leaky_relu.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/leaky_relu.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/power_static.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/power_static.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/power_static.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/power_static.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/power_static.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/power_static.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/power_static.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/power_static.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/swish_cpu.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/swish_cpu.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/swish_cpu.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/swish_cpu.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/op/swish_cpu.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/op/swish_cpu.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/op/swish_cpu.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/op/swish_cpu.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_fc_fusion.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/reshape_fc_fusion.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_fc_fusion.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/reshape_fc_fusion.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_fc_fusion.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/reshape_fc_fusion.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_fc_fusion.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/reshape_fc_fusion.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_prelu.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/reshape_prelu.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_prelu.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/reshape_prelu.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_prelu.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/reshape_prelu.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/reshape_prelu.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/reshape_prelu.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/rnn_sequences_optimization.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/rnn_sequences_optimization.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/rnn_sequences_optimization.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/rnn_sequences_optimization.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.hpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/snippets_mark_skipped.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/snippets_mark_skipped.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/snippets_mark_skipped.cpp rename to src/plugins/intel_cpu/src/ngraph_transformations/snippets_mark_skipped.cpp diff --git a/inference-engine/src/mkldnn_plugin/ngraph_transformations/snippets_mark_skipped.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/snippets_mark_skipped.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/ngraph_transformations/snippets_mark_skipped.hpp rename to src/plugins/intel_cpu/src/ngraph_transformations/snippets_mark_skipped.hpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/blocked_desc_creator.cpp b/src/plugins/intel_cpu/src/nodes/common/blocked_desc_creator.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/blocked_desc_creator.cpp rename to src/plugins/intel_cpu/src/nodes/common/blocked_desc_creator.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/blocked_desc_creator.h b/src/plugins/intel_cpu/src/nodes/common/blocked_desc_creator.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/blocked_desc_creator.h rename to src/plugins/intel_cpu/src/nodes/common/blocked_desc_creator.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/cpu_convert.cpp b/src/plugins/intel_cpu/src/nodes/common/cpu_convert.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/cpu_convert.cpp rename to src/plugins/intel_cpu/src/nodes/common/cpu_convert.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/cpu_convert.h b/src/plugins/intel_cpu/src/nodes/common/cpu_convert.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/cpu_convert.h rename to src/plugins/intel_cpu/src/nodes/common/cpu_convert.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/cpu_memcpy.h b/src/plugins/intel_cpu/src/nodes/common/cpu_memcpy.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/cpu_memcpy.h rename to src/plugins/intel_cpu/src/nodes/common/cpu_memcpy.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/defs.h b/src/plugins/intel_cpu/src/nodes/common/defs.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/defs.h rename to src/plugins/intel_cpu/src/nodes/common/defs.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/dnnl_executor.cpp b/src/plugins/intel_cpu/src/nodes/common/dnnl_executor.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/dnnl_executor.cpp rename to src/plugins/intel_cpu/src/nodes/common/dnnl_executor.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/dnnl_executor.h b/src/plugins/intel_cpu/src/nodes/common/dnnl_executor.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/dnnl_executor.h rename to src/plugins/intel_cpu/src/nodes/common/dnnl_executor.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/fp16_utils.h b/src/plugins/intel_cpu/src/nodes/common/fp16_utils.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/fp16_utils.h rename to src/plugins/intel_cpu/src/nodes/common/fp16_utils.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/permute_kernel.cpp b/src/plugins/intel_cpu/src/nodes/common/permute_kernel.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/permute_kernel.cpp rename to src/plugins/intel_cpu/src/nodes/common/permute_kernel.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/permute_kernel.h b/src/plugins/intel_cpu/src/nodes/common/permute_kernel.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/permute_kernel.h rename to src/plugins/intel_cpu/src/nodes/common/permute_kernel.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/softmax.cpp b/src/plugins/intel_cpu/src/nodes/common/softmax.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/softmax.cpp rename to src/plugins/intel_cpu/src/nodes/common/softmax.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/softmax.h b/src/plugins/intel_cpu/src/nodes/common/softmax.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/softmax.h rename to src/plugins/intel_cpu/src/nodes/common/softmax.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/tile_broadcast_utils.cpp b/src/plugins/intel_cpu/src/nodes/common/tile_broadcast_utils.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/tile_broadcast_utils.cpp rename to src/plugins/intel_cpu/src/nodes/common/tile_broadcast_utils.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/tile_broadcast_utils.h b/src/plugins/intel_cpu/src/nodes/common/tile_broadcast_utils.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/tile_broadcast_utils.h rename to src/plugins/intel_cpu/src/nodes/common/tile_broadcast_utils.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/common/uni_simd.h b/src/plugins/intel_cpu/src/nodes/common/uni_simd.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/common/uni_simd.h rename to src/plugins/intel_cpu/src/nodes/common/uni_simd.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/list.hpp b/src/plugins/intel_cpu/src/nodes/list.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/list.hpp rename to src/plugins/intel_cpu/src/nodes/list.hpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_adaptive_pooling.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_adaptive_pooling.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_adaptive_pooling.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_adaptive_pooling.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_adaptive_pooling.h b/src/plugins/intel_cpu/src/nodes/mkldnn_adaptive_pooling.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_adaptive_pooling.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_adaptive_pooling.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_batch_to_space_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_batch_to_space_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_batch_to_space_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_batch_to_space_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_batch_to_space_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_batch_to_space_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_batch_to_space_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_batch_to_space_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_bin_conv_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_bin_conv_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_bin_conv_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_bin_conv_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_broadcast_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_broadcast_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_broadcast_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_broadcast_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_broadcast_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_broadcast_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_broadcast_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_broadcast_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bucketize_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_bucketize_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_bucketize_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_bucketize_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bucketize_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_bucketize_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_bucketize_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_bucketize_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_concat_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_concat_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_concat_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_concat_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_conv_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_conv_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_conv_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_conv_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_convert_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_convert_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_convert_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_convert_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_convert_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_ctc_greedy_decoder_seq_len_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_loss_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_ctc_loss_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_loss_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_ctc_loss_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_loss_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_ctc_loss_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_ctc_loss_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_ctc_loss_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_cum_sum_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_cum_sum_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_cum_sum_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_cum_sum_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_cum_sum_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_cum_sum_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_cum_sum_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_cum_sum_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_deconv_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_deconv_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_deconv_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_deconv_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_def_conv_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_def_conv_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_def_conv_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_def_conv_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depth_to_space_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_depth_to_space_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_depth_to_space_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_depth_to_space_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depth_to_space_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_depth_to_space_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_depth_to_space_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_depth_to_space_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_detection_output_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_detection_output_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_detection_output_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_detection_output_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_detection_output_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_detection_output_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_detection_output_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_detection_output_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_dft_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_dft_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_dft_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_dft_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_dft_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_dft_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_dft_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_dft_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_eltwise_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_eltwise_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_eltwise_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_eltwise_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_offset_sum_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_offset_sum_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_offset_sum_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_offset_sum_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_offset_sum_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_offset_sum_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_offset_sum_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_offset_sum_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_packed_sum_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_packed_sum_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_packed_sum_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_packed_sum_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_packed_sum_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_packed_sum_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_packed_sum_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_packed_sum_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_sum_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_sum_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_sum_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_sum_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_sum_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_sum_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_bag_sum_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_bag_sum_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_segments_sum_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_segments_sum_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_segments_sum_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_segments_sum_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_segments_sum_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_embedding_segments_sum_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_embedding_segments_sum_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_embedding_segments_sum_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_detection_output_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_detection_output_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_detection_output_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_detection_output_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_detection_output_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_detection_output_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_detection_output_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_detection_output_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_generate_proposals_single_image_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_priorgridgenerator_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_roifeatureextractor_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_topkrois_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_topkrois_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_topkrois_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_topkrois_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_topkrois_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_topkrois_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_experimental_detectron_topkrois_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_experimental_detectron_topkrois_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_extract_image_patches_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_extract_image_patches_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_extract_image_patches_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_extract_image_patches_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_extract_image_patches_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_extract_image_patches_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_extract_image_patches_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_extract_image_patches_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fake_quantize_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_fake_quantize_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_fake_quantize_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_fake_quantize_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fake_quantize_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_fake_quantize_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_fake_quantize_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_fake_quantize_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_fullyconnected_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_fullyconnected_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_fullyconnected_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_fullyconnected_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_elements_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_elements_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_elements_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_elements_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_elements_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_elements_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_elements_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_elements_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_nd_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_nd_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_nd_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_nd_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_nd_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_nd_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_nd_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_nd_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_tree_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_tree_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_tree_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_tree_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_tree_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_gather_tree_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_gather_tree_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_gather_tree_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_generic_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_generic_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_generic_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_generic_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_grn_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_grn_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_grn_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_grn_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_grn_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_grn_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_grn_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_grn_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_if_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_if_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_if_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_if_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_if_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_if_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_if_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_if_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_input_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_input_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_input_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_input_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_interpolate_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_interpolate_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_interpolate_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_interpolate_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_interpolate_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_interpolate_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_interpolate_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_interpolate_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_log_softmax_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_log_softmax_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_log_softmax_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_log_softmax_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_log_softmax_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_log_softmax_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_log_softmax_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_log_softmax_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_lrn_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_lrn_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_lrn_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_lrn_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_math_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_math_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_math_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_math_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_math_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_math_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_math_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_math_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_matmul_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_matmul_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_matmul_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_matmul_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_matmul_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_matmul_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_matmul_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_matmul_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_matrix_nms_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_matrix_nms_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_matrix_nms_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_matrix_nms_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_matrix_nms_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_matrix_nms_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_matrix_nms_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_matrix_nms_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_memory_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_memory_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_memory_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_memory_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_memory_node.hpp b/src/plugins/intel_cpu/src/nodes/mkldnn_memory_node.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_memory_node.hpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_memory_node.hpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_multiclass_nms.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_multiclass_nms.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_multiclass_nms.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_multiclass_nms.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_multiclass_nms.hpp b/src/plugins/intel_cpu/src/nodes/mkldnn_multiclass_nms.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_multiclass_nms.hpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_multiclass_nms.hpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_mvn_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_mvn_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_mvn_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_mvn_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_max_suppression_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_non_max_suppression_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_max_suppression_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_non_max_suppression_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_max_suppression_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_non_max_suppression_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_max_suppression_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_non_max_suppression_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_zero.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_non_zero.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_zero.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_non_zero.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_zero.h b/src/plugins/intel_cpu/src/nodes/mkldnn_non_zero.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_non_zero.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_non_zero.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_normalize_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_normalize_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_normalize_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_normalize_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_one_hot_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_one_hot_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_one_hot_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_one_hot_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_one_hot_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_one_hot_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_one_hot_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_one_hot_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pad_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_pad_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_pad_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_pad_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pad_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_pad_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_pad_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_pad_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_pooling_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_pooling_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_pooling_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_pooling_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_proposal_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_proposal_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_proposal_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_proposal_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_proposal_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_proposal_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_proposal_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_proposal_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_psroi_pooling_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_psroi_pooling_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_psroi_pooling_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_psroi_pooling_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_psroi_pooling_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_psroi_pooling_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_psroi_pooling_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_psroi_pooling_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_range_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_range_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_range_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_range_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_range_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_range_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_range_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_range_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reduce_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_reduce_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reduce_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_reduce_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reduce_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_reduce_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reduce_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_reduce_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reference_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_reference_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reference_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_reference_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reference_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_reference_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reference_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_reference_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_region_yolo_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_region_yolo_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_region_yolo_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_region_yolo_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_region_yolo_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_region_yolo_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_region_yolo_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_region_yolo_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorder_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_reorder_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorder_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_reorder_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorder_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_reorder_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorder_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_reorder_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorg_yolo_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_reorg_yolo_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorg_yolo_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_reorg_yolo_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorg_yolo_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_reorg_yolo_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reorg_yolo_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_reorg_yolo_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_reshape_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_reshape_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_reshape_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_reshape_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reverse_sequence_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_reverse_sequence_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reverse_sequence_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_reverse_sequence_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reverse_sequence_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_reverse_sequence_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_reverse_sequence_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_reverse_sequence_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_rnn.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_rnn.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_rnn.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_rnn.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_rnn.h b/src/plugins/intel_cpu/src/nodes/mkldnn_rnn.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_rnn.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_rnn.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_align_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_roi_align_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_align_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_roi_align_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_align_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_roi_align_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_align_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_roi_align_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_roi_pooling_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_roi_pooling_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_roi_pooling_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_roi_pooling_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roll_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_roll_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_roll_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_roll_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roll_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_roll_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_roll_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_roll_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_scatter_update_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_scatter_update_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_scatter_update_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_scatter_update_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_select_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_select_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_select_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_select_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_select_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_select_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_select_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_select_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_shapeof.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_shapeof.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_shapeof.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_shapeof.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_shapeof.h b/src/plugins/intel_cpu/src/nodes/mkldnn_shapeof.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_shapeof.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_shapeof.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_shuffle_channels_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_shuffle_channels_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_shuffle_channels_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_shuffle_channels_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_shuffle_channels_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_shuffle_channels_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_shuffle_channels_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_shuffle_channels_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_softmax_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_softmax_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_softmax_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_softmax_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_batch_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_space_to_batch_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_batch_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_space_to_batch_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_batch_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_space_to_batch_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_batch_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_space_to_batch_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_depth_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_space_to_depth_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_depth_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_space_to_depth_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_depth_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_space_to_depth_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_space_to_depth_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_space_to_depth_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_split_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_split_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_split_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_split_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_strided_slice_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_strided_slice_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_strided_slice_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_strided_slice_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_strided_slice_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_strided_slice_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_strided_slice_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_strided_slice_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_tensoriterator_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_tensoriterator_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_tensoriterator_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_tensoriterator_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_tile_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_tile_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_tile_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_tile_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_topk_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_topk_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_topk_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_topk_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_topk_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_topk_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_topk_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_topk_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_transpose_node.cpp b/src/plugins/intel_cpu/src/nodes/mkldnn_transpose_node.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_transpose_node.cpp rename to src/plugins/intel_cpu/src/nodes/mkldnn_transpose_node.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_transpose_node.h b/src/plugins/intel_cpu/src/nodes/mkldnn_transpose_node.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/mkldnn_transpose_node.h rename to src/plugins/intel_cpu/src/nodes/mkldnn_transpose_node.h diff --git a/inference-engine/src/mkldnn_plugin/nodes/proposal_imp.cpp b/src/plugins/intel_cpu/src/nodes/proposal_imp.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/proposal_imp.cpp rename to src/plugins/intel_cpu/src/nodes/proposal_imp.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/proposal_imp.hpp b/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/proposal_imp.hpp rename to src/plugins/intel_cpu/src/nodes/proposal_imp.hpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/subgraph.cpp b/src/plugins/intel_cpu/src/nodes/subgraph.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/subgraph.cpp rename to src/plugins/intel_cpu/src/nodes/subgraph.cpp diff --git a/inference-engine/src/mkldnn_plugin/nodes/subgraph.h b/src/plugins/intel_cpu/src/nodes/subgraph.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/nodes/subgraph.h rename to src/plugins/intel_cpu/src/nodes/subgraph.h diff --git a/inference-engine/src/mkldnn_plugin/normalize_preprocess.cpp b/src/plugins/intel_cpu/src/normalize_preprocess.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/normalize_preprocess.cpp rename to src/plugins/intel_cpu/src/normalize_preprocess.cpp diff --git a/inference-engine/src/mkldnn_plugin/normalize_preprocess.h b/src/plugins/intel_cpu/src/normalize_preprocess.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/normalize_preprocess.h rename to src/plugins/intel_cpu/src/normalize_preprocess.h diff --git a/inference-engine/src/mkldnn_plugin/perf_count.h b/src/plugins/intel_cpu/src/perf_count.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/perf_count.h rename to src/plugins/intel_cpu/src/perf_count.h diff --git a/inference-engine/src/mkldnn_plugin/utils/bfloat16.hpp b/src/plugins/intel_cpu/src/utils/bfloat16.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/bfloat16.hpp rename to src/plugins/intel_cpu/src/utils/bfloat16.hpp diff --git a/inference-engine/src/mkldnn_plugin/utils/blob_dump.cpp b/src/plugins/intel_cpu/src/utils/blob_dump.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/blob_dump.cpp rename to src/plugins/intel_cpu/src/utils/blob_dump.cpp diff --git a/inference-engine/src/mkldnn_plugin/utils/blob_dump.h b/src/plugins/intel_cpu/src/utils/blob_dump.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/blob_dump.h rename to src/plugins/intel_cpu/src/utils/blob_dump.h diff --git a/inference-engine/src/mkldnn_plugin/utils/cpu_utils.hpp b/src/plugins/intel_cpu/src/utils/cpu_utils.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/cpu_utils.hpp rename to src/plugins/intel_cpu/src/utils/cpu_utils.hpp diff --git a/inference-engine/src/mkldnn_plugin/utils/debug_capabilities.h b/src/plugins/intel_cpu/src/utils/debug_capabilities.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/debug_capabilities.h rename to src/plugins/intel_cpu/src/utils/debug_capabilities.h diff --git a/inference-engine/src/mkldnn_plugin/utils/general_utils.h b/src/plugins/intel_cpu/src/utils/general_utils.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/general_utils.h rename to src/plugins/intel_cpu/src/utils/general_utils.h diff --git a/inference-engine/src/mkldnn_plugin/utils/ngraph_utils.hpp b/src/plugins/intel_cpu/src/utils/ngraph_utils.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/ngraph_utils.hpp rename to src/plugins/intel_cpu/src/utils/ngraph_utils.hpp diff --git a/inference-engine/src/mkldnn_plugin/utils/node_dumper.cpp b/src/plugins/intel_cpu/src/utils/node_dumper.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/node_dumper.cpp rename to src/plugins/intel_cpu/src/utils/node_dumper.cpp diff --git a/inference-engine/src/mkldnn_plugin/utils/node_dumper.h b/src/plugins/intel_cpu/src/utils/node_dumper.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/node_dumper.h rename to src/plugins/intel_cpu/src/utils/node_dumper.h diff --git a/inference-engine/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.cpp b/src/plugins/intel_cpu/src/utils/rt_info/memory_formats_attribute.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.cpp rename to src/plugins/intel_cpu/src/utils/rt_info/memory_formats_attribute.cpp diff --git a/inference-engine/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.hpp b/src/plugins/intel_cpu/src/utils/rt_info/memory_formats_attribute.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.hpp rename to src/plugins/intel_cpu/src/utils/rt_info/memory_formats_attribute.hpp diff --git a/inference-engine/src/mkldnn_plugin/utils/shape_inference/shape_inference.cpp b/src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/shape_inference/shape_inference.cpp rename to src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.cpp diff --git a/inference-engine/src/mkldnn_plugin/utils/shape_inference/shape_inference.hpp b/src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/shape_inference/shape_inference.hpp rename to src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.hpp diff --git a/inference-engine/src/mkldnn_plugin/utils/shape_inference/static_dimension.cpp b/src/plugins/intel_cpu/src/utils/shape_inference/static_dimension.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/shape_inference/static_dimension.cpp rename to src/plugins/intel_cpu/src/utils/shape_inference/static_dimension.cpp diff --git a/inference-engine/src/mkldnn_plugin/utils/shape_inference/static_dimension.hpp b/src/plugins/intel_cpu/src/utils/shape_inference/static_dimension.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/shape_inference/static_dimension.hpp rename to src/plugins/intel_cpu/src/utils/shape_inference/static_dimension.hpp diff --git a/inference-engine/src/mkldnn_plugin/utils/shape_inference/static_shape.cpp b/src/plugins/intel_cpu/src/utils/shape_inference/static_shape.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/shape_inference/static_shape.cpp rename to src/plugins/intel_cpu/src/utils/shape_inference/static_shape.cpp diff --git a/inference-engine/src/mkldnn_plugin/utils/shape_inference/static_shape.hpp b/src/plugins/intel_cpu/src/utils/shape_inference/static_shape.hpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/shape_inference/static_shape.hpp rename to src/plugins/intel_cpu/src/utils/shape_inference/static_shape.hpp diff --git a/inference-engine/src/mkldnn_plugin/utils/verbose.cpp b/src/plugins/intel_cpu/src/utils/verbose.cpp similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/verbose.cpp rename to src/plugins/intel_cpu/src/utils/verbose.cpp diff --git a/inference-engine/src/mkldnn_plugin/utils/verbose.h b/src/plugins/intel_cpu/src/utils/verbose.h similarity index 100% rename from inference-engine/src/mkldnn_plugin/utils/verbose.h rename to src/plugins/intel_cpu/src/utils/verbose.h diff --git a/src/plugins/intel_cpu/thirdparty/CMakeLists.txt b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt new file mode 100644 index 00000000000..33d3383ec8f --- /dev/null +++ b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt @@ -0,0 +1,55 @@ +# Copyright (C) 2018-2021 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + +if((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND (MSVC_VERSION VERSION_GREATER_EQUAL "1910")) + # 1910 version of Visual Studio 2017 + # This flagis needed for enabling SIMD vectorization with command '#pragma omp simd'. + # Compilation with '/openmp:experimental' key allow us to enable vectorizatikon capability in MSVC. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp:experimental") +endif() + +if(ENABLE_LTO) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) +endif() + +function(ie_add_mkldnn) + set(DNNL_ENABLE_JIT_PROFILING ${BUILD_SHARED_LIBS} CACHE BOOL "" FORCE) + if(BUILD_SHARED_LIBS AND ENABLE_PROFILING_ITT) + set(DNNL_ENABLE_ITT_TASKS ON CACHE BOOL "" FORCE) + else() + set(DNNL_ENABLE_ITT_TASKS OFF CACHE BOOL "" FORCE) + endif() + set(DNNL_ENABLE_CONCURRENT_EXEC ON CACHE BOOL "" FORCE) + set(DNNL_ENABLE_PRIMITIVE_CACHE OFF CACHE BOOL "" FORCE) ## TODO: try it later + set(DNNL_ENABLE_MAX_CPU_ISA ON CACHE BOOL "" FORCE) + set(DNNL_LIBRARY_TYPE STATIC CACHE BOOL "" FORCE) + set(DNNL_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) + set(DNNL_BUILD_TESTS OFF CACHE BOOL "" FORCE) + set(DNNL_CPU_RUNTIME "${THREADING}" CACHE STRING "" FORCE) + set(DNNL_GPU_RUNTIME "NONE" CACHE STRING "" FORCE) + set(DNNL_BLAS_VENDOR "NONE" CACHE STRING "" FORCE) + set(SDL_cmake_included ON) ## to skip internal SDL flags. SDL flags are already set on IE level + if (ANDROID OR ((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND NOT (THREADING STREQUAL "OMP"))) + set(OpenMP_cmake_included ON) ## to skip "omp simd" inside a code. Lead to some crashes inside NDK LLVM.. + endif() + + if(SUGGEST_OVERRIDE_SUPPORTED) + # xbyak compilation fails + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override") + endif() + if(CMAKE_COMPILER_IS_GNUCXX) + ie_add_compiler_flags(-Wno-undef) + ie_add_compiler_flags(-Wno-missing-declarations) + elseif(UNIX AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -diag-disable=10121") + endif() + + add_subdirectory(mkl-dnn EXCLUDE_FROM_ALL) + add_library(mkldnn ALIAS dnnl) + ov_install_static_lib(dnnl cpu) +endfunction() + +if(ENABLE_INTEL_CPU) + ie_add_mkldnn() +endif() diff --git a/inference-engine/thirdparty/mkl-dnn b/src/plugins/intel_cpu/thirdparty/mkl-dnn similarity index 100% rename from inference-engine/thirdparty/mkl-dnn rename to src/plugins/intel_cpu/thirdparty/mkl-dnn diff --git a/src/tests/functional/plugin/CMakeLists.txt b/src/tests/functional/plugin/CMakeLists.txt index 174dc9816be..5e60c1a9ace 100644 --- a/src/tests/functional/plugin/CMakeLists.txt +++ b/src/tests/functional/plugin/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory(shared) -if (ENABLE_MKL_DNN) +if (ENABLE_INTEL_CPU) add_subdirectory(cpu) endif() diff --git a/src/tests/functional/plugin/conformance/test_runner/README.md b/src/tests/functional/plugin/conformance/test_runner/README.md index 350419118c4..0d6ba495df6 100644 --- a/src/tests/functional/plugin/conformance/test_runner/README.md +++ b/src/tests/functional/plugin/conformance/test_runner/README.md @@ -20,7 +20,7 @@ The target is able to take the following command-line arguments: * `-h` prints target command-line options with description. * `--device` specifies target device. * `--input_folders` specifies folders with IRs to run. The separator is `,`. -* `--plugin_lib_name` is name of plugin library. The example is MKLDNNPlugin. Use only with unregistered in IE Core devices. +* `--plugin_lib_name` is name of plugin library. The example is ov_intel_cpu_plugin. Use only with unregistered in IE Core devices. * `--disable_test_config` allows to ignore all skipped tests with the exception of `DISABLED_` prefix using. * `--skip_config_path` allows to specify paths to files contain regular expressions list to skip tests. * `--extend_report` allows not to re-write device results to the report (add results of this run to the existing). Mutually exclusive with --report_unique_name. diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp index 6a6499e460e..e3ec583bb0b 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp @@ -20,7 +20,7 @@ inline const std::string getPluginLibNameByDevice(const std::string& deviceName) { "HDDL", "HDDLPlugin" }, { "VPUX", "VPUXPlugin" }, { "AUTO", "ov_auto_plugin" }, - { "CPU", "MKLDNNPlugin" }, + { "CPU", "ov_intel_cpu_plugin" }, { "GNA", "ov_intel_gna_plugin" }, { "GPU", "ov_intel_gpu_plugin" }, { "HETERO", "ov_hetero_plugin" }, diff --git a/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/gflag_config.hpp b/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/gflag_config.hpp index 73f20c17627..98a47ba8f46 100644 --- a/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/gflag_config.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/gflag_config.hpp @@ -17,7 +17,8 @@ static const char target_device_message[] = "Required. Specify the target device "Use \"-d HETERO:\" format to specify HETERO plugin. " "The application looks for a suitable plugin for the specified device."; static const char input_folders_message[] = "Required. Paths to the input folders with IRs. Delimiter is `,` symbol."; -static const char target_plugin_message[] = "Optional. Name of plugin library. The example is MKLDNNPlugin. Use only with unregistered in IE Core devices"; +static const char target_plugin_message[] = + "Optional. Name of plugin library. The example is ov_intel_cpu_plugin. Use only with unregistered in IE Core devices"; static const char output_folder_message[] = "Optional. Paths to the output folder to save report. Default value is \".\""; static const char report_unique_name_message[] = "Optional. Allow to save report with unique name (report_pid_timestamp.xml). " "Mutually exclusive with --extend_report. Default value is false"; diff --git a/src/tests/functional/plugin/cpu/CMakeLists.txt b/src/tests/functional/plugin/cpu/CMakeLists.txt index 64fb4357db2..1faac645fa0 100644 --- a/src/tests/functional/plugin/cpu/CMakeLists.txt +++ b/src/tests/functional/plugin/cpu/CMakeLists.txt @@ -4,12 +4,12 @@ set(TARGET_NAME cpuFuncTests) -add_library(cpuSpecificRtInfo STATIC ${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.hpp - ${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin/utils/rt_info/memory_formats_attribute.cpp) +add_library(cpuSpecificRtInfo STATIC $/src/utils/rt_info/memory_formats_attribute.hpp + $/src/utils/rt_info/memory_formats_attribute.cpp) target_link_libraries(cpuSpecificRtInfo PRIVATE openvino::runtime) -set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} $) -set(DEPENDENCIES MKLDNNPlugin) +set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} $/src) +set(DEPENDENCIES ov_intel_cpu_plugin) set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo) if (ENABLE_OV_ONNX_FRONTEND) list(APPEND INCLUDES "${OpenVINO_SOURCE_DIR}/docs/onnx_custom_op") diff --git a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 60eee73f6fa..6738a1e833b 100644 --- a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -15,7 +15,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( smoke_OVClassCommon, OVClassBasicTestP, - ::testing::Values(std::make_pair("MKLDNNPlugin", "CPU"))); + ::testing::Values(std::make_pair("ov_intel_cpu_plugin", "CPU"))); INSTANTIATE_TEST_SUITE_P( smoke_OVClassNetworkTestP, OVClassNetworkTestP, diff --git a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/core_integration.cpp b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/core_integration.cpp index 88dd3e01a23..57983543e12 100644 --- a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/core_integration.cpp +++ b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/core_integration.cpp @@ -15,7 +15,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( smoke_IEClassCommon, IEClassBasicTestP, - ::testing::Values(std::make_pair("MKLDNNPlugin", "CPU"))); + ::testing::Values(std::make_pair("ov_intel_cpu_plugin", "CPU"))); INSTANTIATE_TEST_SUITE_P( smoke_IEClassNetworkTestP, IEClassNetworkTestP, diff --git a/src/tests/functional/plugin/cpu/shared_tests_instances/hetero/synthetic.cpp b/src/tests/functional/plugin/cpu/shared_tests_instances/hetero/synthetic.cpp index 7fdb7497141..56dd75c6808 100644 --- a/src/tests/functional/plugin/cpu/shared_tests_instances/hetero/synthetic.cpp +++ b/src/tests/functional/plugin/cpu/shared_tests_instances/hetero/synthetic.cpp @@ -16,13 +16,13 @@ using namespace HeteroTests; INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"CPU0", "MKLDNNPlugin"}, {"CPU1", "MKLDNNPlugin"}}), + ::testing::Values(std::vector{{"CPU0", "ov_intel_cpu_plugin"}, {"CPU1", "ov_intel_cpu_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_singleMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"CPU0", "MKLDNNPlugin"}, {"CPU1", "MKLDNNPlugin"}}), + ::testing::Values(std::vector{{"CPU0", "ov_intel_cpu_plugin"}, {"CPU1", "ov_intel_cpu_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp index f33a3844410..0628e9bd0f2 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp @@ -11,7 +11,7 @@ const std::vector device_names_and_support_for_remote_blobs { {{GPU}, true}, // GPU via MULTI, {{"GPU.0"}, true}, // GPU.0 via MULTI, -#ifdef ENABLE_MKL_DNN +#ifdef ENABLE_INTEL_CPU {{GPU, CPU}, true}, // GPU+CPU {{CPU, GPU}, true}, // CPU+GPU #endif @@ -48,7 +48,7 @@ TEST_P(MultiDevice_Test, cannotInferRemoteBlobIfNotInitializedForDevice) { } const std::vector device_names_and_support_for_remote_blobs2 { -#ifdef ENABLE_MKL_DNN +#ifdef ENABLE_INTEL_CPU {CPU}, // stand-alone CPU via MULTI (no GPU), no OCL context #endif {"GPU.1"}, // another GPU (the test will test its presence), different OCL contexts diff --git a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/executable_network/core_integration.cpp b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/executable_network/core_integration.cpp index 29cecf57b32..524117e2342 100644 --- a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/executable_network/core_integration.cpp +++ b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/executable_network/core_integration.cpp @@ -23,7 +23,7 @@ INSTANTIATE_TEST_SUITE_P( smoke_IEClassImportExportTestP, IEClassImportExportTestP, ::testing::Values(std::string(CommonTestUtils::DEVICE_MYRIAD), "HETERO:" + std::string(CommonTestUtils::DEVICE_MYRIAD))); -#if defined(ENABLE_MKL_DNN) && ENABLE_MKL_DNN +#if defined(ENABLE_INTEL_CPU) && ENABLE_INTEL_CPU INSTANTIATE_TEST_SUITE_P( smoke_IEClassImportExportTestP_HETERO_CPU, IEClassImportExportTestP, diff --git a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_executable_network/get_metric.cpp b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_executable_network/get_metric.cpp index de31f68120d..436a1e1bf2e 100644 --- a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_executable_network/get_metric.cpp +++ b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_executable_network/get_metric.cpp @@ -24,7 +24,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassImportExportTestP, ::testing::Values(std::string(CommonTestUtils::DEVICE_MYRIAD), "HETERO:" + std::string(CommonTestUtils::DEVICE_MYRIAD))); -#if defined(ENABLE_MKL_DNN) && ENABLE_MKL_DNN +#if defined(ENABLE_INTEL_CPU) && ENABLE_INTEL_CPU INSTANTIATE_TEST_SUITE_P(smoke_OVClassImportExportTestP_HETERO_CPU, OVClassImportExportTestP, diff --git a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 8f6d3bab139..f6ed8f5c10a 100644 --- a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -53,7 +53,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassImportExportTestP, ::testing::Values(std::string(CommonTestUtils::DEVICE_MYRIAD), "HETERO:" + std::string(CommonTestUtils::DEVICE_MYRIAD))); -#if defined(ENABLE_MKL_DNN) && ENABLE_MKL_DNN +#if defined(ENABLE_INTEL_CPU) && ENABLE_INTEL_CPU INSTANTIATE_TEST_SUITE_P(smoke_OVClassImportExportTestP_HETERO_CPU, OVClassImportExportTestP, diff --git a/src/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp b/src/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp index 15324128621..a5148dadcad 100644 --- a/src/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp +++ b/src/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp @@ -9,7 +9,7 @@ const std::vector device_names_and_support_for_remote_blobs { {{MYRIAD}, false}, // MYX via MULTI -#ifdef ENABLE_MKL_DNN +#ifdef ENABLE_INTEL_CPU {{CPU, MYRIAD}, false}, // CPU+MYX #endif }; diff --git a/src/tests/unit/CMakeLists.txt b/src/tests/unit/CMakeLists.txt index e2204b7371d..088a0a7d945 100644 --- a/src/tests/unit/CMakeLists.txt +++ b/src/tests/unit/CMakeLists.txt @@ -12,7 +12,7 @@ endif() add_subdirectory(inference_engine) -if (ENABLE_MKL_DNN) +if (ENABLE_INTEL_CPU) add_subdirectory(cpu) endif () diff --git a/src/tests/unit/cpu/CMakeLists.txt b/src/tests/unit/cpu/CMakeLists.txt index 7f66c147d95..be1a036431a 100644 --- a/src/tests/unit/cpu/CMakeLists.txt +++ b/src/tests/unit/cpu/CMakeLists.txt @@ -8,11 +8,11 @@ addIeTargetTest( NAME ${TARGET_NAME} ROOT ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES - $ - $/nodes + $/src + $/src/nodes $ OBJECT_FILES - $ + $ LINK_LIBRARIES gtest gtest_main @@ -35,6 +35,6 @@ ie_faster_build(${TARGET_NAME} ) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE - ${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/common - ${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu - ${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/include) + $/src/common + $/src/cpu + $/include) diff --git a/src/tests_deprecated/functional/gna/CMakeLists.txt b/src/tests_deprecated/functional/gna/CMakeLists.txt index e9987edc70e..6c45c35c2a8 100644 --- a/src/tests_deprecated/functional/gna/CMakeLists.txt +++ b/src/tests_deprecated/functional/gna/CMakeLists.txt @@ -19,8 +19,8 @@ if(ENABLE_HETERO) list(APPEND DEPENDENCIES ov_hetero_plugin) endif() -if(ENABLE_MKL_DNN) - list(APPEND DEPENDENCIES MKLDNNPlugin) +if(ENABLE_INTEL_CPU) + list(APPEND DEPENDENCIES ov_intel_cpu_plugin) endif() add_executable(${TARGET_NAME} ${TEST_SRC} ${TEST_INCLUDE}) diff --git a/src/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp b/src/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp index 5bc6ebd40ab..c0e154bb20f 100644 --- a/src/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp +++ b/src/tests_deprecated/functional/vpu/common/layers/myriad_layers_proposal_test.cpp @@ -304,7 +304,7 @@ TEST_F(myriadLayersTestsProposal_smoke, Caffe) { TEST_F(myriadLayersTestsProposal_smoke, CaffeNoClipBeforeNms) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - // Verify only 20 ranked proposal output with GT values - reference get from MKLDNN plugin + // Verify only 20 ranked proposal output with GT values - reference get from CPU plugin std::vector gt_values = { 0, 72.408f, 58.925f, 197.062f, 177.856f, 0, 6.907f, 75.193f, 50.726f, 144.589f, diff --git a/tests/conditional_compilation/test_cc.py b/tests/conditional_compilation/test_cc.py index 48ebc7c9294..080ea355865 100644 --- a/tests/conditional_compilation/test_cc.py +++ b/tests/conditional_compilation/test_cc.py @@ -125,7 +125,7 @@ def test_verify(test_id, prepared_models, openvino_ref, artifacts, tolerance=1e- @pytest.mark.dependency(depends=["cc_collect", "minimized_pkg"]) def test_libs_size(test_id, models, openvino_ref, artifacts): # pylint: disable=unused-argument """Test if libraries haven't increased in size after conditional compilation.""" - libraries = ["ov_runtime", "MKLDNNPlugin"] + libraries = ["ov_runtime", "ov_intel_cpu_plugin"] minimized_pkg = artifacts / test_id / "install_pkg" ref_libs_size = get_lib_sizes(openvino_ref, libraries) lib_sizes = get_lib_sizes(minimized_pkg, libraries) diff --git a/tests/utils/path_utils.py b/tests/utils/path_utils.py index bd678681de5..97b87c1bf32 100644 --- a/tests/utils/path_utils.py +++ b/tests/utils/path_utils.py @@ -36,9 +36,9 @@ def get_lib_path(lib_name): """Function for getting absolute path in OpenVINO directory to specific lib""" os_name = get_os_name() all_libs = { - 'MKLDNNPlugin': { - 'Windows': Path('runtime/bin/intel64/Release/MKLDNNPlugin.dll'), - 'Linux': Path('runtime/lib/intel64/libMKLDNNPlugin.so')}, + 'ov_intel_cpu_plugin': { + 'Windows': Path('runtime/bin/intel64/Release/ov_intel_cpu_plugin.dll'), + 'Linux': Path('runtime/lib/intel64/libov_intel_cpu_plugin.so')}, 'ov_runtime': { 'Windows': Path('runtime/bin/intel64/Release/ov_runtime.dll'), 'Linux': Path('runtime/lib/intel64/libov_runtime.so')} diff --git a/tools/deployment_manager/configs/darwin.json b/tools/deployment_manager/configs/darwin.json index 575fa4d8bc5..b52ac8b9f10 100644 --- a/tools/deployment_manager/configs/darwin.json +++ b/tools/deployment_manager/configs/darwin.json @@ -33,7 +33,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/lib/intel64/libMKLDNNPlugin.so" + "runtime/lib/intel64/libov_intel_cpu_plugin.so" ] }, "vpu": { diff --git a/tools/deployment_manager/configs/linux.json b/tools/deployment_manager/configs/linux.json index 05e8ee9c983..74801042f81 100644 --- a/tools/deployment_manager/configs/linux.json +++ b/tools/deployment_manager/configs/linux.json @@ -39,7 +39,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/lib/intel64/libMKLDNNPlugin.so" + "runtime/lib/intel64/libov_intel_cpu_plugin.so" ] }, "gpu": { diff --git a/tools/deployment_manager/configs/windows.json b/tools/deployment_manager/configs/windows.json index 729f2496ea8..34af1c23979 100644 --- a/tools/deployment_manager/configs/windows.json +++ b/tools/deployment_manager/configs/windows.json @@ -33,7 +33,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/bin/intel64/Release/MKLDNNPlugin.dll" + "runtime/bin/intel64/Release/ov_intel_cpu_plugin.dll" ] }, "gpu": {