[CPU] Renamed CPU plugin to ov_intel_cpu_plugin (#9342)

This commit is contained in:
Vladislav Volkov authored and GitHub committed 2021-12-23 11:49:25 +03:00
1 parent bbceae3bc3
commit 60a11a6348
364 files changed
+143 -124

No files matched your search

+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 \
+2 -2
View File
@@ -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"]
+2 -2
View File
@@ -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
+4 -4
View File
@@ -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()
+3 -3
View File
@@ -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)
+2 -2
View File
@@ -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: <list_of_input_layers>
[ INFO ] Statistics will be dumped for 1 layers: <output_layer_name(s)>
+1 -1
View File
@@ -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 | - |
@@ -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
@@ -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())
@@ -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":
-4
View File
@@ -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()
-40
View File
@@ -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()
@@ -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 ......... <version>
ov_intel_cpu_plugin version ......... <version>
Build ........... <build>
[ INFO ] Preparing input blobs
+1
View File
@@ -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"
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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));
@@ -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), \
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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()
@@ -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()
+1 -1
View File
@@ -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
+4
View File
@@ -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()
@@ -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
$<TARGET_PROPERTY:mkldnn,INCLUDE_DIRECTORIES>)
@@ -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 $<TARGET_PROPERTY:inferenc
$<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ov_shape_inference,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
$<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $<TARGET_PROPERTY:mkldnn,INCLUDE_DIRECTORIES>)
@@ -1154,7 +1154,7 @@ MKLDNNNode* MKLDNNNode::NodesFactory::create(const std::shared_ptr<ngraph::Node>
// 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) {
@@ -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)
Loaded 100 of 364 files, more files were not shown because too many files have changed in this diff. Show more