diff --git a/.ci/azure/linux_lohika.yml b/.ci/azure/linux_lohika.yml index 6c65d958b8b..920a4cb4992 100644 --- a/.ci/azure/linux_lohika.yml +++ b/.ci/azure/linux_lohika.yml @@ -69,7 +69,7 @@ jobs: - script: > env -C ~/work ./buildreleasenolto.sh - libinference_engine_preproc.so + libopenvino_gapi_preproc.so ov_intel_cpu_plugin ov_intel_gpu_plugin clDNN_unit_tests64 diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 205b670694b..9428d16f58c 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -23,14 +23,14 @@ ie_coverage_extract(INPUT "openvino" OUTPUT "legacy" ie_coverage_genhtml(INFO_FILE "legacy" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") -ie_coverage_extract(INPUT "openvino" OUTPUT "ov_hetero_plugin" +ie_coverage_extract(INPUT "openvino" OUTPUT "hetero_plugin" PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/hetero/*") -ie_coverage_genhtml(INFO_FILE "ov_hetero_plugin" +ie_coverage_genhtml(INFO_FILE "hetero_plugin" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") -ie_coverage_extract(INPUT "openvino" OUTPUT "ov_auto_plugin" +ie_coverage_extract(INPUT "openvino" OUTPUT "auto_plugin" PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/auto/*") -ie_coverage_genhtml(INFO_FILE "ov_auto_plugin" +ie_coverage_genhtml(INFO_FILE "auto_plugin" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") ie_coverage_extract(INPUT "openvino" OUTPUT "preprocessing" @@ -73,9 +73,9 @@ if (ENABLE_INTEL_GPU) endif() if(ENABLE_INTEL_GNA) - ie_coverage_extract(INPUT "openvino" OUTPUT "ov_intel_gna_plugin" + ie_coverage_extract(INPUT "openvino" OUTPUT "intel_gna_plugin" PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/intel_gna/*") - ie_coverage_genhtml(INFO_FILE "ov_intel_gna_plugin" + ie_coverage_genhtml(INFO_FILE "intel_gna_plugin" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") endif() diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake index 2fadf19fa3c..39b23fe6557 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake @@ -3,7 +3,7 @@ # set(FRONTEND_INSTALL_INCLUDE "runtime/include/") -set(FRONTEND_NAME_PREFIX "ov_") +set(FRONTEND_NAME_PREFIX "openvino_") set(FRONTEND_NAME_SUFFIX "_frontend") set(FRONTEND_NAMES "" CACHE INTERNAL "") @@ -35,7 +35,7 @@ function(ov_generate_frontends_hpp) endif() # add frontends to libraries including ov_frontends.hpp - ov_target_link_frontends(ov_runtime) + ov_target_link_frontends(openvino) set(ov_frontends_hpp "${CMAKE_BINARY_DIR}/src/frontends/common/src/ov_frontends.hpp") set(frontends_hpp_in "${IEDevScripts_DIR}/frontends/ov_frontends.hpp.in") diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake index 9327ed4b463..90a1b96dbbf 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake @@ -102,32 +102,33 @@ function(ie_add_plugin) endif() add_dependencies(ie_plugins ${IE_PLUGIN_NAME}) - if(TARGET inference_engine_preproc) + if(TARGET openvino_gapi_preproc) if(BUILD_SHARED_LIBS) - add_dependencies(${IE_PLUGIN_NAME} inference_engine_preproc) + add_dependencies(${IE_PLUGIN_NAME} openvino_gapi_preproc) else() - target_link_libraries(${IE_PLUGIN_NAME} PRIVATE inference_engine_preproc) + target_link_libraries(${IE_PLUGIN_NAME} PRIVATE openvino_gapi_preproc) endif() endif() # fake dependencies to build in the following order: # IE -> IE readers -> IE inference plugins -> IE-based apps if(BUILD_SHARED_LIBS) - if(TARGET ov_ir_frontend) - add_dependencies(${IE_PLUGIN_NAME} ov_ir_frontend) + if(TARGET openvino_ir_frontend) + add_dependencies(${IE_PLUGIN_NAME} openvino_ir_frontend) endif() + if(TARGET openvino_onnx_frontend) + add_dependencies(${IE_PLUGIN_NAME} openvino_onnx_frontend) + endif() + if(TARGET openvino_paddle_frontend) + add_dependencies(${IE_PLUGIN_NAME} openvino_paddle_frontend) + endif() + if(TARGET openvino_tensorflow_frontend) + add_dependencies(${IE_PLUGIN_NAME} openvino_tensorflow_frontend) + endif() + # TODO: remove with legacy CNNNLayer API / IR v7 if(TARGET inference_engine_ir_v7_reader) add_dependencies(${IE_PLUGIN_NAME} inference_engine_ir_v7_reader) endif() - if(TARGET ov_onnx_frontend) - add_dependencies(${IE_PLUGIN_NAME} ov_onnx_frontend) - endif() - if(TARGET ov_paddle_frontend) - add_dependencies(${IE_PLUGIN_NAME} ov_paddle_frontend) - endif() - if(TARGET ov_tensorflow_frontend) - add_dependencies(${IE_PLUGIN_NAME} ov_tensorflow_frontend) - endif() endif() # install rules @@ -319,7 +320,7 @@ function(ie_generate_plugins_hpp) endforeach() # add plugins to libraries including ie_plugins.hpp - ie_target_link_plugins(ov_runtime) + ie_target_link_plugins(openvino) if(TARGET inference_engine_s) ie_target_link_plugins(inference_engine_s) endif() diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake index fc8c6611452..e33e4378f1f 100644 --- a/cmake/extra_modules.cmake +++ b/cmake/extra_modules.cmake @@ -82,8 +82,8 @@ function(register_extra_modules) endif() endforeach() if ("${NS}" STREQUAL "openvino") - file(APPEND "${devconfig_file}" "add_library(${NS}::runtime ALIAS ov_runtime)\n") - file(APPEND "${devconfig_file}" "add_library(${NS}::runtime::dev ALIAS ov_runtime_dev)\n") + file(APPEND "${devconfig_file}" "add_library(${NS}::runtime ALIAS openvino)\n") + file(APPEND "${devconfig_file}" "add_library(${NS}::runtime::dev ALIAS openvino_dev)\n") endif() endfunction() diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in index a1f84caddbf..0065ef67973 100644 --- a/cmake/templates/OpenVINOConfig.cmake.in +++ b/cmake/templates/OpenVINOConfig.cmake.in @@ -180,7 +180,7 @@ if(ENABLE_INTEL_GNA AND NOT ENABLE_INTEL_GNA_SHARED AND NOT libGNA_FOUND) NO_DEFAULT_PATH) endif() -if(NOT TARGET ov_runtime) +if(NOT TARGET openvino) set(_ov_as_external_package ON) include("${CMAKE_CURRENT_LIST_DIR}/OpenVINOTargets.cmake") diff --git a/cmake/templates/ngraphConfig.cmake.in b/cmake/templates/ngraphConfig.cmake.in index e37f64f290d..148a9c4ea3a 100644 --- a/cmake/templates/ngraphConfig.cmake.in +++ b/cmake/templates/ngraphConfig.cmake.in @@ -26,11 +26,16 @@ # # Frontends: # -# ngraph_ov_onnx_frontend_FOUND - True if the system has ov_onnx_frontend library -# ngraph::ov_onnx_frontend - ONNX FrontEnd target (optional) +# ngraph_onnx_frontend_FOUND - True if the system has ngraph::onnx_frontend library +# ngraph::onnx_frontend - ONNX FrontEnd target (optional) # -# ngraph_paddle_frontend_FOUND - True if the system has Paddle frontend -# ngraph::ov_paddle_frontend - nGraph Paddle frontend (optional) +# ngraph_paddle_frontend_FOUND - True if the system has Paddle frontend +# ngraph::paddle_frontend - nGraph Paddle frontend (optional) +# +# ngraph_ir_frontend_FOUND - True if the system has OpenVINO IR frontend +# +# ngraph_tensorflow_frontend_FOUND - True if the system has TensorFlow frontend +# ngraph::tensorflow_frontend - nGraph TensorFlow frontend (optional) # @PACKAGE_INIT@ @@ -50,43 +55,46 @@ if(TARGET openvino::runtime AND NOT TARGET ngraph::ngraph) INTERFACE_LINK_LIBRARIES openvino::runtime) endif() -if(TARGET openvino::frontend::onnx AND NOT TARGET ngraph::ov_onnx_frontend) - add_library(ngraph::ov_onnx_frontend INTERFACE IMPORTED) - set_target_properties(ngraph::ov_onnx_frontend PROPERTIES +if(TARGET openvino::frontend::onnx AND NOT TARGET ngraph::onnx_frontend) + add_library(ngraph::onnx_frontend INTERFACE IMPORTED) + set_target_properties(ngraph::onnx_frontend PROPERTIES INTERFACE_LINK_LIBRARIES openvino::frontend::onnx) endif() -if(TARGET openvino::frontend::paddle AND NOT TARGET ngraph::ov_paddle_frontend) - add_library(ngraph::ov_paddle_frontend INTERFACE IMPORTED) - set_target_properties(ngraph::ov_paddle_frontend PROPERTIES +if(TARGET openvino::frontend::paddle AND NOT TARGET ngraph::paddle_frontend) + add_library(ngraph::paddle_frontend INTERFACE IMPORTED) + set_target_properties(ngraph::paddle_frontend PROPERTIES INTERFACE_LINK_LIBRARIES openvino::frontend::paddle) endif() -if(TARGET openvino::frontend::tensorflow AND NOT TARGET ngraph::ov_tensorflow_frontend) - add_library(ngraph::ov_tensorflow_frontend INTERFACE IMPORTED) - set_target_properties(ngraph::ov_tensorflow_frontend PROPERTIES +if(TARGET openvino::frontend::tensorflow AND NOT TARGET ngraph::tensorflow_frontend) + add_library(ngraph::tensorflow_frontend INTERFACE IMPORTED) + set_target_properties(ngraph::tensorflow_frontend PROPERTIES INTERFACE_LINK_LIBRARIES openvino::frontend::tensorflow) endif() set(ngraph_ngraph_FOUND ON) set(NGRAPH_LIBRARIES ngraph::ngraph) -set(ngraph_ov_onnx_frontend_FOUND ${OpenVINO_Frontend_ONNX_FOUND}) +set(ngraph_onnx_frontend_FOUND ${OpenVINO_Frontend_ONNX_FOUND}) +set(ngraph_tensorflow_frontend_FOUND ${OpenVINO_Frontend_TensorFlow_FOUND}) +set(ngraph_paddle_frontend_FOUND ${OpenVINO_Frontend_Paddle_FOUND}) set(ngraph_onnx_importer_FOUND ${OpenVINO_Frontend_ONNX_FOUND}) if(ngraph_onnx_importer_FOUND) - set(ONNX_IMPORTER_LIBRARIES ngraph::ov_onnx_frontend) + set(ONNX_IMPORTER_LIBRARIES ngraph::onnx_frontend) # ngraph::onnx_importer target and variables are deprecated # but need to create a dummy target for BW compatibility if(NOT TARGET ngraph::onnx_importer) add_library(ngraph::onnx_importer INTERFACE IMPORTED) set_target_properties(ngraph::onnx_importer PROPERTIES - INTERFACE_LINK_LIBRARIES ngraph::ov_onnx_frontend) + INTERFACE_LINK_LIBRARIES ngraph::onnx_frontend) endif() endif() set(ngraph_paddle_frontend_FOUND ${OpenVINO_Frontend_Paddle_FOUND}) set(ngraph_tensorflow_frontend_FOUND ${OpenVINO_Frontend_TensorFlow_FOUND}) +set(ngraph_onnx_frontend_FOUND ${OpenVINO_Frontend_ONNX_FOUND}) set(ngraph_ir_frontend_FOUND ${OpenVINO_Frontend_IR_FOUND}) check_required_components(ngraph) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 4669250627f..711e75c68f9 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT ENABLE_DOCKER) set(all_docs_targets ie_docs_snippets ov_template_func_tests - template_extension ov_template_extension ov_template_plugin) + template_extension openvino_template_extension openvino_template_plugin) foreach(target_name IN LISTS all_docs_targets) if(TARGET ${target_name}) set_target_properties(${target_name} PROPERTIES FOLDER docs) @@ -36,7 +36,7 @@ if(NOT ENABLE_DOCKER) # install - foreach(target ov_template_plugin template_extension ov_template_extension) + foreach(target openvino_template_plugin template_extension openvino_template_extension) if(TARGET ${target}) install(TARGETS ${target} LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} diff --git a/docs/IE_DG/Extensibility_DG/Custom_ONNX_Ops.md b/docs/IE_DG/Extensibility_DG/Custom_ONNX_Ops.md index 086f23045fd..772bfb9da90 100644 --- a/docs/IE_DG/Extensibility_DG/Custom_ONNX_Ops.md +++ b/docs/IE_DG/Extensibility_DG/Custom_ONNX_Ops.md @@ -70,7 +70,7 @@ The example below demonstrates how to unregister an operator from the destructor ## Requirements for Building with CMake A program that uses the `register_operator` functionality requires `openvino::core` and `openvino::frontend::onnx` libraries in addition to the OpenVINO Inference Runtime. -The `ov_onnx_frontend` is a component of the `OpenVINO` package , so `find_package(OpenVINO REQUIRED COMPONENTS ONNX)` can find both. +The `openvino::frontend::onnx` is a component of the `OpenVINO` package , so `find_package(OpenVINO REQUIRED COMPONENTS ONNX)` can find both. Those libraries need to be passed to the `target_link_libraries` command in the CMakeLists.txt file. See CMakeLists.txt below for reference: diff --git a/docs/IE_DG/supported_plugins/Supported_Devices.md b/docs/IE_DG/supported_plugins/Supported_Devices.md index d493146f985..ad13af79d3f 100644 --- a/docs/IE_DG/supported_plugins/Supported_Devices.md +++ b/docs/IE_DG/supported_plugins/Supported_Devices.md @@ -23,14 +23,15 @@ 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 | `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 | `libov_intel_vpu_plugin.so` | `libusb.so` | `ov_intel_vpu_plugin.dll`| `usb.dll` | `libov_intel_vpu_plugin.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 | - | -| GNA | `libov_intel_gna_plugin.so` | `libgna.so`, | `ov_intel_gna_plugin.dll` | `gna.dll` | Is not supported | - | -| HETERO | `libov_hetero_plugin.so` | Same as for selected plugins | `ov_hetero_plugin.dll` | Same as for selected plugins | `libov_hetero_plugin.so` | Same as for selected plugins | -| MULTI | `libov_auto_plugin.so` | Same as for selected plugins | `ov_auto_plugin.dll` | Same as for selected plugins | `libov_auto_plugin.so` | Same as for selected plugins | -| AUTO | `libov_auto_plugin.so` | Same as for selected plugins | `ov_auto_plugin.dll` | Same as for selected plugins | `libov_auto_plugin.so` | Same as for selected plugins | +| CPU | `libopenvino_intel_cpu_plugin.so` | | `openvino_intel_cpu_plugin.dll` | | `libopenvino_intel_cpu_plugin.so` | | +| GPU | `libopenvino_intel_gpu_plugin.so` | `libOpenCL.so` | `openvino_intel_gpu_plugin.dll` | `OpenCL.dll` | Is not supported | - | +| MYRIAD | `libopenvino_intel_myriad_plugin.so` | `libusb.so` | `openvino_intel_myriad_plugin.dll`| `usb.dll` | `libopenvino_intel_myriad_plugin.so` | `libusb.dylib` | +| HDDL | `libintel_hddl_plugin.so` | `libbsl.so`, `libhddlapi.so`, `libmvnc-hddl.so` | `intel_hddl_plugin.dll` | `bsl.dll`, `hddlapi.dll`, `json-c.dll`, `libcrypto-1_1-x64.dll`, `libssl-1_1-x64.dll`, `mvnc-hddl.dll` | Is not supported | - | +| GNA | `libopenvino_intel_gna_plugin.so` | `libgna.so`, | `openvino_intel_gna_plugin.dll` | `gna.dll` | Is not supported | - | +| HETERO | `libopenvino_hetero_plugin.so` | Same as for selected plugins | `openvino_hetero_plugin.dll` | Same as for selected plugins | `libopenvino_hetero_plugin.so` | Same as for selected plugins | +| MULTI | `libopenvino_auto_plugin.so` | Same as for selected plugins | `openvino_auto_plugin.dll` | Same as for selected plugins | `libopenvino_auto_plugin.so` | Same as for selected plugins | +| AUTO | `libopenvino_auto_plugin.so` | Same as for selected plugins | `openvino_auto_plugin.dll` | Same as for selected plugins | `libopenvino_auto_plugin.so` | Same as for selected plugins | +| BATCH | `libopenvino_auto_batch_plugin.so` | Same as for selected plugins | `openvino_auto_batch_plugin.dll` | Same as for selected plugins | `libopenvino_auto_batch_plugin.so` | Same as for selected plugins | ## Supported Configurations diff --git a/docs/IE_PLUGIN_DG/Building.md b/docs/IE_PLUGIN_DG/Building.md index e6f54687106..e309fd50790 100644 --- a/docs/IE_PLUGIN_DG/Building.md +++ b/docs/IE_PLUGIN_DG/Building.md @@ -21,7 +21,7 @@ Once the commands above are executed, the Inference Engine Developer Package is * `IE::ngraph` - shared nGraph library * `IE::inference_engine` - shared Inference Engine library * `IE::inference_engine_transformations` - shared library with Inference Engine ngraph-based Transformations - * `IE::inference_engine_preproc` - shared library with Inference Engine preprocessing plugin + * `IE::openvino_gapi_preproc` - shared library with Inference Engine preprocessing plugin * `IE::inference_engine_plugin_api` - interface library with Inference Engine Plugin API headers * `IE::inference_engine_lp_transformations` - shared library with low-precision transformations * `IE::pugixml` - static Pugixml library diff --git a/docs/snippets/CMakeLists.txt b/docs/snippets/CMakeLists.txt index a073b5caa24..2e4ef05c1a7 100644 --- a/docs/snippets/CMakeLists.txt +++ b/docs/snippets/CMakeLists.txt @@ -46,7 +46,7 @@ if(OpenCV_FOUND) endif() if(ENABLE_OV_ONNX_FRONTEND) - target_link_libraries(${TARGET_NAME} PRIVATE ov_onnx_frontend) + target_link_libraries(${TARGET_NAME} PRIVATE openvino_onnx_frontend) endif() if(NOT MSVC) diff --git a/docs/template_extension/new/CMakeLists.txt b/docs/template_extension/new/CMakeLists.txt index 02d276fb08c..32bdeda4ea7 100644 --- a/docs/template_extension/new/CMakeLists.txt +++ b/docs/template_extension/new/CMakeLists.txt @@ -5,7 +5,7 @@ # [cmake:extension] set(CMAKE_CXX_STANDARD 11) -set(TARGET_NAME "ov_template_extension") +set(TARGET_NAME "openvino_template_extension") find_package(OpenVINO) diff --git a/docs/template_plugin/src/CMakeLists.txt b/docs/template_plugin/src/CMakeLists.txt index ff32e93feeb..56bb0335827 100644 --- a/docs/template_plugin/src/CMakeLists.txt +++ b/docs/template_plugin/src/CMakeLists.txt @@ -3,7 +3,7 @@ # # [cmake:plugin] -set(TARGET_NAME "ov_template_plugin") +set(TARGET_NAME "openvino_template_plugin") file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) diff --git a/docs/template_plugin/src/template_plugin.cpp b/docs/template_plugin/src/template_plugin.cpp index 6f8c6fc98dc..2d7c7900d58 100644 --- a/docs/template_plugin/src/template_plugin.cpp +++ b/docs/template_plugin/src/template_plugin.cpp @@ -299,6 +299,6 @@ InferenceEngine::Parameter Plugin::GetMetric(const std::string& name, // ! [plugin:get_metric] // ! [plugin:create_plugin_engine] -static const InferenceEngine::Version version = {{2, 1}, CI_BUILD_NUMBER, "ov_template_plugin"}; +static const InferenceEngine::Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_template_plugin"}; IE_DEFINE_PLUGIN_CREATE_FUNCTION(Plugin, version) // ! [plugin:create_plugin_engine] diff --git a/docs/template_plugin/tests/functional/CMakeLists.txt b/docs/template_plugin/tests/functional/CMakeLists.txt index d67f66cc852..3addfc2370f 100644 --- a/docs/template_plugin/tests/functional/CMakeLists.txt +++ b/docs/template_plugin/tests/functional/CMakeLists.txt @@ -9,7 +9,7 @@ ov_add_test_target( NAME ${TARGET_NAME} ROOT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDENCIES - ov_template_plugin + openvino_template_plugin LINK_LIBRARIES openvino::funcSharedTests INCLUDES @@ -21,7 +21,7 @@ ov_add_test_target( ) if(ENABLE_HETERO) - add_dependencies(${TARGET_NAME} ov_hetero_plugin) + add_dependencies(${TARGET_NAME} openvino_hetero_plugin) endif() find_package(OpenCV QUIET COMPONENTS core imgproc) diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp index 842a3d16f53..19322f492ba 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp @@ -18,7 +18,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( smoke_IEClassBasicTestP, IEClassBasicTestP, - ::testing::Values(std::make_pair("ov_template_plugin", CommonTestUtils::DEVICE_TEMPLATE))); + ::testing::Values(std::make_pair("openvino_template_plugin", CommonTestUtils::DEVICE_TEMPLATE))); INSTANTIATE_TEST_SUITE_P( smoke_IEClassNetworkTestP, IEClassNetworkTestP, diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp index 9ad6ca0b1dc..dfadd8f4a84 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp @@ -16,20 +16,20 @@ using namespace HeteroTests; INSTANTIATE_TEST_SUITE_P(smoke_manyTargetInputs, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::withMajorNodesFunctions( [] {return ngraph::builder::subgraph::makeConvPool2Relu2();}, {"Conv_1"}, true))), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_singleMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); @@ -39,42 +39,42 @@ static std::vector()>> dynamicBu INSTANTIATE_TEST_SUITE_P(smoke_NonZeroMajorNode_dynamic, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::withMajorNodesFunctions( dynamicBuilders.front(), {"nonZero_1"}))), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_NonZeroMajorNode_dynamic_batch, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::withMajorNodesFunctions( dynamicBuilders.front(), {"nonZero_1"}, true))), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode_dynamic, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::singleMajorNodeFunctions( dynamicBuilders))), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes_dynamic, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::randomMajorNodeFunctions( dynamicBuilders))), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode_dynamic_batch, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::singleMajorNodeFunctions( dynamicBuilders, true))), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes_dynamic_batch, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"TEMPLATE0", "ov_template_plugin"}, {"TEMPLATE1", "ov_template_plugin"}}), + ::testing::Values(std::vector{{"TEMPLATE0", "openvino_template_plugin"}, {"TEMPLATE1", "openvino_template_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::randomMajorNodeFunctions( dynamicBuilders, true))), HeteroSyntheticTest::getTestCaseName); diff --git a/samples/cpp/ngraph_function_creation_sample/README.md b/samples/cpp/ngraph_function_creation_sample/README.md index bfa86a00af5..301a5dab1af 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 - ov_intel_cpu_plugin version ......... + openvino_intel_cpu_plugin version ......... Build ........... [ INFO ] Preparing input blobs diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cac29d95332..037a72b150e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,7 +24,7 @@ endif() add_subdirectory(plugins) add_subdirectory(inference) -include(cmake/ov_runtime.cmake) +include(cmake/openvino.cmake) # preprocessing has dependency on ov_runtime for static build add_subdirectory(common/preprocessing) diff --git a/src/bindings/c/include/c_api/ie_c_api.h b/src/bindings/c/include/c_api/ie_c_api.h index b47beedb26b..2ba8e0bf282 100644 --- a/src/bindings/c/include/c_api/ie_c_api.h +++ b/src/bindings/c/include/c_api/ie_c_api.h @@ -37,7 +37,7 @@ #else #if defined(_WIN32) #define INFERENCE_ENGINE_C_API_CALLBACK __cdecl - #ifdef inference_engine_c_api_EXPORTS + #ifdef openvino_c_EXPORTS #define INFERENCE_ENGINE_C_API(...) INFERENCE_ENGINE_C_API_EXTERN __declspec(dllexport) __VA_ARGS__ __cdecl #else #define INFERENCE_ENGINE_C_API(...) INFERENCE_ENGINE_C_API_EXTERN __declspec(dllimport) __VA_ARGS__ __cdecl diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt index 1ee904e665d..9200d0bda16 100644 --- a/src/bindings/c/src/CMakeLists.txt +++ b/src/bindings/c/src/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME inference_engine_c_api) +set(TARGET_NAME openvino_c) file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) file(GLOB HEADERS ${InferenceEngine_C_API_SOURCE_DIR}/include/*.h) @@ -12,7 +12,7 @@ file(GLOB HEADERS ${InferenceEngine_C_API_SOURCE_DIR}/include/*.h) add_library(${TARGET_NAME} ${HEADERS} ${SOURCES}) add_library(openvino::runtime::c ALIAS ${TARGET_NAME}) -target_link_libraries(${TARGET_NAME} PRIVATE ov_runtime) +target_link_libraries(${TARGET_NAME} PRIVATE openvino) target_include_directories(${TARGET_NAME} PUBLIC $) diff --git a/src/bindings/c/tests/CMakeLists.txt b/src/bindings/c/tests/CMakeLists.txt index 26587bf8dbd..94bbe1f53b2 100644 --- a/src/bindings/c/tests/CMakeLists.txt +++ b/src/bindings/c/tests/CMakeLists.txt @@ -13,7 +13,7 @@ endif() add_executable(${TARGET_NAME} ie_c_api_test.cpp test_model_repo.hpp) -target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_c_api ${OpenCV_LIBRARIES} +target_link_libraries(${TARGET_NAME} PRIVATE openvino_c ${OpenCV_LIBRARIES} commonTestUtils gtest_main) target_compile_definitions(${TARGET_NAME} @@ -23,19 +23,19 @@ target_compile_definitions(${TARGET_NAME} MODELS_PATH=\"${MODELS_PATH}\" ) if(ENABLE_AUTO OR ENABLE_MULTI) - add_dependencies(${TARGET_NAME} ov_auto_plugin) + add_dependencies(${TARGET_NAME} openvino_auto_plugin) endif() if(ENABLE_AUTO_BATCH) - add_dependencies(${TARGET_NAME} ov_auto_batch_plugin) + add_dependencies(${TARGET_NAME} openvino_auto_batch_plugin) endif() if(ENABLE_INTEL_CPU) - add_dependencies(${TARGET_NAME} ov_intel_cpu_plugin) + add_dependencies(${TARGET_NAME} openvino_intel_cpu_plugin) endif() if(ENABLE_INTEL_GPU) - add_dependencies(${TARGET_NAME} ov_intel_gpu_plugin) + add_dependencies(${TARGET_NAME} openvino_intel_gpu_plugin) endif() add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) diff --git a/src/bindings/c/tests/ie_c_api_test.cpp b/src/bindings/c/tests/ie_c_api_test.cpp index d6e3665f4c2..b159589158a 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 = "ov_intel_cpu_plugin"; + const char *plugin_name = "openvino_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/CMakeLists.txt b/src/bindings/python/CMakeLists.txt index f634ca49c51..8ee0ccf13ac 100644 --- a/src/bindings/python/CMakeLists.txt +++ b/src/bindings/python/CMakeLists.txt @@ -25,9 +25,9 @@ if(ENABLE_WHEEL) endif() if(ENABLE_OV_CORE_UNIT_TESTS) - add_subdirectory(tests/mock/ov_mock_py_frontend) - add_dependencies(pyopenvino ov_mock_py_frontend) - set_target_properties(ov_mock_py_frontend PROPERTIES + add_subdirectory(tests/mock/mock_py_frontend) + add_dependencies(pyopenvino openvino_mock_py_frontend) + set_target_properties(openvino_mock_py_frontend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} COMPILE_PDB_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} diff --git a/src/bindings/python/src/compatibility/openvino/inference_engine/ie_api.pyx b/src/bindings/python/src/compatibility/openvino/inference_engine/ie_api.pyx index fe8ddc9e737..e90d78bcef5 100644 --- a/src/bindings/python/src/compatibility/openvino/inference_engine/ie_api.pyx +++ b/src/bindings/python/src/compatibility/openvino/inference_engine/ie_api.pyx @@ -559,7 +559,7 @@ cdef class IECore: .. code-block:: python ie = IECore() - ie.register_plugin(plugin="ov_intel_cpu_plugin", device_name="MY_NEW_PLUGIN") + ie.register_plugin(plugin="openvino_intel_cpu_plugin", device_name="MY_NEW_PLUGIN") """ self.impl.registerPlugin(plugin_name.encode(), device_name.encode()) diff --git a/src/bindings/python/tests/mock/ov_mock_py_frontend/CMakeLists.txt b/src/bindings/python/tests/mock/mock_py_frontend/CMakeLists.txt similarity index 96% rename from src/bindings/python/tests/mock/ov_mock_py_frontend/CMakeLists.txt rename to src/bindings/python/tests/mock/mock_py_frontend/CMakeLists.txt index 0788de88018..a260ad20801 100644 --- a/src/bindings/python/tests/mock/ov_mock_py_frontend/CMakeLists.txt +++ b/src/bindings/python/tests/mock/mock_py_frontend/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_FE_NAME "ov_mock_py_frontend") +set(TARGET_FE_NAME "openvino_mock_py_frontend") file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) diff --git a/src/bindings/python/tests/mock/ov_mock_py_frontend/include/ov_mock_py_frontend/frontend_wrappers.hpp b/src/bindings/python/tests/mock/mock_py_frontend/include/mock_py_frontend/frontend_wrappers.hpp similarity index 100% rename from src/bindings/python/tests/mock/ov_mock_py_frontend/include/ov_mock_py_frontend/frontend_wrappers.hpp rename to src/bindings/python/tests/mock/mock_py_frontend/include/mock_py_frontend/frontend_wrappers.hpp diff --git a/src/bindings/python/tests/mock/ov_mock_py_frontend/include/ov_mock_py_frontend/mock_py_frontend.hpp b/src/bindings/python/tests/mock/mock_py_frontend/include/mock_py_frontend/mock_py_frontend.hpp similarity index 100% rename from src/bindings/python/tests/mock/ov_mock_py_frontend/include/ov_mock_py_frontend/mock_py_frontend.hpp rename to src/bindings/python/tests/mock/mock_py_frontend/include/mock_py_frontend/mock_py_frontend.hpp diff --git a/src/bindings/python/tests/mock/ov_mock_py_frontend/include/ov_mock_py_frontend/visibility.hpp b/src/bindings/python/tests/mock/mock_py_frontend/include/mock_py_frontend/visibility.hpp similarity index 100% rename from src/bindings/python/tests/mock/ov_mock_py_frontend/include/ov_mock_py_frontend/visibility.hpp rename to src/bindings/python/tests/mock/mock_py_frontend/include/mock_py_frontend/visibility.hpp diff --git a/src/bindings/python/tests/mock/ov_mock_py_frontend/src/mock_py_frontend.cpp b/src/bindings/python/tests/mock/mock_py_frontend/src/mock_py_frontend.cpp similarity index 92% rename from src/bindings/python/tests/mock/ov_mock_py_frontend/src/mock_py_frontend.cpp rename to src/bindings/python/tests/mock/mock_py_frontend/src/mock_py_frontend.cpp index 1a6fe6b44d9..91723b85898 100644 --- a/src/bindings/python/tests/mock/ov_mock_py_frontend/src/mock_py_frontend.cpp +++ b/src/bindings/python/tests/mock/mock_py_frontend/src/mock_py_frontend.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ov_mock_py_frontend/mock_py_frontend.hpp" +#include "mock_py_frontend/mock_py_frontend.hpp" #include "openvino/frontend/manager.hpp" #include "openvino/frontend/visibility.hpp" diff --git a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt index 7974bb6e44b..451cfccba1d 100644 --- a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt +++ b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt @@ -10,7 +10,7 @@ source_group("src" FILES ${PYBIND_FE_SRC}) pybind11_add_module(${PYBIND_FE_NAME} MODULE ${PYBIND_FE_SRC}) -set(DEPENDENCIES ov_mock_py_frontend openvino::runtime) +set(DEPENDENCIES openvino_mock_py_frontend openvino::runtime) set(DEFINITIONS) if (ENABLE_OV_ONNX_FRONTEND) diff --git a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp index d577cebf98d..396fa3a58e8 100644 --- a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp +++ b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp @@ -5,8 +5,8 @@ #include #include -#include "ov_mock_py_frontend/frontend_wrappers.hpp" -#include "ov_mock_py_frontend/mock_py_frontend.hpp" +#include "mock_py_frontend/frontend_wrappers.hpp" +#include "mock_py_frontend/mock_py_frontend.hpp" namespace py = pybind11; using namespace ngraph; 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 d8c1f14241e..0c23897a06b 100644 --- a/src/bindings/python/tests/test_inference_engine/test_core.py +++ b/src/bindings/python/tests/test_inference_engine/test_core.py @@ -216,7 +216,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("ov_intel_cpu_plugin", "BLA") + ie.register_plugin("openvino_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), \ @@ -304,9 +304,9 @@ def test_add_extension_template_extension(device): core = Core() if platform == "win32": - core.add_extension(library_path="ov_template_extension.dll") + core.add_extension(library_path="openvino_template_extension.dll") else: - core.add_extension(library_path="libov_template_extension.so") + core.add_extension(library_path="libopenvino_template_extension.so") model = core.read_model(model=ir) assert isinstance(model, Model) diff --git a/src/bindings/python/tests/test_ngraph/__init__.py b/src/bindings/python/tests/test_ngraph/__init__.py index 306dbe5bec1..3f36289b024 100644 --- a/src/bindings/python/tests/test_ngraph/__init__.py +++ b/src/bindings/python/tests/test_ngraph/__init__.py @@ -1,6 +1,6 @@ # Copyright (C) 2018-2022 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# ov_runtime.dll directory path visibility is needed to use _pyngraph module +# openvino.dll directory path visibility is needed to use _pyngraph module # import below causes adding this path to os.environ["PATH"] import openvino # noqa: F401 'imported but unused' diff --git a/src/bindings/python/tests_compatibility/test_inference_engine/test_Blob.py b/src/bindings/python/tests_compatibility/test_inference_engine/test_Blob.py index 89f1b464160..5c8e1fd9b4a 100644 --- a/src/bindings/python/tests_compatibility/test_inference_engine/test_Blob.py +++ b/src/bindings/python/tests_compatibility/test_inference_engine/test_Blob.py @@ -151,7 +151,7 @@ def test_blob_set_shape_after_async_infer(): net = ng.function_to_cnn(function) net.reshape({"data": [(1, 5), 4, 20, 20]}) ie_core = IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") request = exec_net.requests[0] request.async_infer({"data": np.ones([4, 4, 20, 20])}) diff --git a/src/bindings/python/tests_compatibility/test_inference_engine/test_CDataPtr.py b/src/bindings/python/tests_compatibility/test_inference_engine/test_CDataPtr.py index 290d6d8e251..14995953601 100644 --- a/src/bindings/python/tests_compatibility/test_inference_engine/test_CDataPtr.py +++ b/src/bindings/python/tests_compatibility/test_inference_engine/test_CDataPtr.py @@ -64,7 +64,7 @@ def test_is_dynamic(): function = create_relu([-1, 3, 20, 20]) net = ng.function_to_cnn(function) ie = IECore() - ie.register_plugin("ov_template_plugin", "TEMPLATE") + ie.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie.load_network(net, "TEMPLATE") assert exec_net.outputs["out"].is_dynamic p_shape = ng.partial_shape_from_data(exec_net.outputs["out"]) diff --git a/src/bindings/python/tests_compatibility/test_inference_engine/test_DataPtr.py b/src/bindings/python/tests_compatibility/test_inference_engine/test_DataPtr.py index 8c997e36f76..cc4dc166f28 100644 --- a/src/bindings/python/tests_compatibility/test_inference_engine/test_DataPtr.py +++ b/src/bindings/python/tests_compatibility/test_inference_engine/test_DataPtr.py @@ -60,7 +60,7 @@ def test_is_dynamic(): net.input_info["data"].input_data.shape assert "Cannot return dims for Data with dynamic shapes!" in str(e.value) ie = IECore() - ie.register_plugin("ov_template_plugin", "TEMPLATE") + ie.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie.load_network(net, "TEMPLATE") assert exec_net.input_info["data"].input_data.is_dynamic p_shape = ng.partial_shape_from_data(exec_net.input_info["data"].input_data) diff --git a/src/bindings/python/tests_compatibility/test_inference_engine/test_IECore.py b/src/bindings/python/tests_compatibility/test_inference_engine/test_IECore.py index 05f18f7f5ee..c28cbc1dc7e 100644 --- a/src/bindings/python/tests_compatibility/test_inference_engine/test_IECore.py +++ b/src/bindings/python/tests_compatibility/test_inference_engine/test_IECore.py @@ -89,8 +89,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 ov_intel_cpu_plugin specific test") - ie.register_plugin("ov_intel_cpu_plugin", "BLA") + pytest.skip("Can't run on ARM plugin due-to openvino_intel_cpu_plugin specific test") + ie.register_plugin("openvino_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'" @@ -101,7 +101,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 ov_intel_cpu_plugin specific test") + pytest.skip("Can't run on ARM plugin due-to openvino_intel_cpu_plugin specific test") if platform == "linux" or platform == "linux2": ie.register_plugins(plugins_xml) elif platform == "darwin": diff --git a/src/bindings/python/tests_compatibility/test_inference_engine/test_IENetwork.py b/src/bindings/python/tests_compatibility/test_inference_engine/test_IENetwork.py index 3279eaf5a24..e6ba2b31855 100644 --- a/src/bindings/python/tests_compatibility/test_inference_engine/test_IENetwork.py +++ b/src/bindings/python/tests_compatibility/test_inference_engine/test_IENetwork.py @@ -284,7 +284,7 @@ def test_create_two_exec_net(): function = create_relu([ng.Dimension(0,5), ng.Dimension(4), ng.Dimension(20), ng.Dimension(20)]) net = ng.function_to_cnn(function) ie_core = IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net1 = ie_core.load_network(net, "TEMPLATE", num_requests=2) assert ng.function_from_cnn(net) != None exec_net2 = ie_core.load_network(net, "TEMPLATE", num_requests=2) diff --git a/src/bindings/python/tests_compatibility/test_inference_engine/test_InferRequest.py b/src/bindings/python/tests_compatibility/test_inference_engine/test_InferRequest.py index 3003e27eef8..5744741c76e 100644 --- a/src/bindings/python/tests_compatibility/test_inference_engine/test_InferRequest.py +++ b/src/bindings/python/tests_compatibility/test_inference_engine/test_InferRequest.py @@ -592,7 +592,7 @@ def test_infer_dynamic_network_with_set_shape(shape, p_shape, ref_shape): net = ng.function_to_cnn(function) net.reshape({"data": p_shape}) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") exec_net.requests[0].input_blobs["data"].set_shape(ref_shape) assert exec_net.requests[0].input_blobs["data"].tensor_desc.dims == ref_shape @@ -616,7 +616,7 @@ def test_infer_dynamic_network_without_set_shape(shape, p_shape, ref_shape): net = ng.function_to_cnn(function) net.reshape({"data": p_shape}) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") exec_net.infer({"data": np.ones(ref_shape)}) assert exec_net.requests[0].input_blobs["data"].tensor_desc.dims == ref_shape @@ -639,7 +639,7 @@ def test_infer_dynamic_network_with_set_blob(shape, p_shape, ref_shape): net = ng.function_to_cnn(function) net.reshape({"data": p_shape}) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") tensor_desc = exec_net.requests[0].input_blobs["data"].tensor_desc tensor_desc.dims = ref_shape @@ -662,7 +662,7 @@ def test_infer_dynamic_network_twice(): net = ng.function_to_cnn(function) net.reshape({"data": p_shape}) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") request = exec_net.requests[0] request.infer({"data": np.ones(ref_shape1)}) @@ -681,7 +681,7 @@ def test_infer_dynamic_network_with_set_blob_twice(): net = ng.function_to_cnn(function) net.reshape({"data": p_shape}) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") request = exec_net.requests[0] td = request.input_blobs['data'].tensor_desc @@ -710,7 +710,7 @@ def test_async_infer_dynamic_network_3_requests(shapes): net = ng.function_to_cnn(function) net.reshape({"data": [3, 4, (20, 50), (20, 50)]}) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE", num_requests=3) for i,request in enumerate(exec_net.requests): request.async_infer({"data": np.ones(shapes[i])}) @@ -725,7 +725,7 @@ def test_set_blob_with_incorrect_name(): function = create_encoder([4, 4, 20, 20]) net = ng.function_to_cnn(function) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") tensor_desc = exec_net.requests[0].input_blobs["data"].tensor_desc tensor_desc.dims = [4, 4, 20, 20] @@ -740,7 +740,7 @@ def test_set_blob_with_incorrect_size(): function = create_encoder([4, 4, 20, 20]) net = ng.function_to_cnn(function) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") tensor_desc = exec_net.requests[0].input_blobs["data"].tensor_desc tensor_desc.dims = [tensor_desc.dims[0]*2, 4, 20, 20] @@ -760,7 +760,7 @@ def test_set_blob_after_async_infer(): net = ng.function_to_cnn(function) net.reshape({"data": [(0, 5), 4, 20, 20]}) ie_core = ie.IECore() - ie_core.register_plugin("ov_template_plugin", "TEMPLATE") + ie_core.register_plugin("openvino_template_plugin", "TEMPLATE") exec_net = ie_core.load_network(net, "TEMPLATE") request = exec_net.requests[0] tensor_desc = request.input_blobs['data'].tensor_desc diff --git a/src/bindings/python/tests_compatibility/test_ngraph/__init__.py b/src/bindings/python/tests_compatibility/test_ngraph/__init__.py index 108672bb9fe..b184d9d6f74 100644 --- a/src/bindings/python/tests_compatibility/test_ngraph/__init__.py +++ b/src/bindings/python/tests_compatibility/test_ngraph/__init__.py @@ -1,6 +1,6 @@ # Copyright (C) 2018-2022 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# ov_runtime.dll directory path visibility is needed to use _pyngraph module +# openvino.dll directory path visibility is needed to use _pyngraph module # import below causes adding this path to os.environ["PATH"] import ngraph # noqa: F401 'imported but unused' diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake index 8923897b124..a036b019c84 100644 --- a/src/cmake/ie_parallel.cmake +++ b/src/cmake/ie_parallel.cmake @@ -51,7 +51,7 @@ function(set_ie_threading_interface_for TARGET_NAME) target_type STREQUAL "MODULE_LIBRARY") set(LINK_TYPE "PRIVATE") elseif(target_type STREQUAL "STATIC_LIBRARY") - # Affected libraries: inference_engine_s, inference_engine_preproc_s + # Affected libraries: inference_engine_s, openvino_gapi_preproc_s # they don't have TBB in public headers => PRIVATE set(LINK_TYPE "PRIVATE") elseif(target_type STREQUAL "SHARED_LIBRARY") diff --git a/src/cmake/ov_runtime.cmake b/src/cmake/openvino.cmake similarity index 95% rename from src/cmake/ov_runtime.cmake rename to src/cmake/openvino.cmake index 71975a71bb9..c46548468cb 100644 --- a/src/cmake/ov_runtime.cmake +++ b/src/cmake/openvino.cmake @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME ov_runtime) +set(TARGET_NAME openvino) add_library(${TARGET_NAME} $ $ @@ -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_auto_batch_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin ov_intel_cpu_plugin ov_intel_myriad_plugin) + POSSIBLE_PLUGINS openvino_auto_plugin openvino_auto_batch_plugin openvino_hetero_plugin openvino_intel_gpu_plugin openvino_intel_gna_plugin openvino_intel_cpu_plugin openvino_intel_myriad_plugin) # Export for build tree @@ -68,11 +68,11 @@ target_include_directories(${TARGET_NAME}_dev INTERFACE $ $ $ - $ + $ ) target_compile_definitions(${TARGET_NAME}_dev INTERFACE - $) + $) target_link_libraries(${TARGET_NAME}_dev INTERFACE ${TARGET_NAME} pugixml::static openvino::itt openvino::util) add_library(openvino::runtime::dev ALIAS ${TARGET_NAME}_dev) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index dd2b986d03a..a9378dd88e8 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -12,4 +12,4 @@ add_subdirectory(transformations) add_subdirectory(offline_transformations) add_subdirectory(low_precision_transformations) -add_dependencies(ov_runtime_libraries inference_engine_preproc) +add_dependencies(ov_runtime_libraries openvino_gapi_preproc) diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt index 1515f7e4de4..e41e286c950 100644 --- a/src/common/preprocessing/CMakeLists.txt +++ b/src/common/preprocessing/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set (TARGET_NAME "inference_engine_preproc") +set (TARGET_NAME "openvino_gapi_preproc") file(GLOB LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) file(GLOB LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) @@ -142,7 +142,7 @@ if(ENABLE_GAPI_PREPROCESSING) target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime) else() # for static linkage the dependencies are in opposite order - target_link_libraries(ov_runtime PRIVATE ${TARGET_NAME}) + target_link_libraries(openvino PRIVATE ${TARGET_NAME}) endif() # Workaround to avoid warnings caused with bug in the avx512intrin.h of GCC5 @@ -163,7 +163,7 @@ endif() target_include_directories(${TARGET_NAME} INTERFACE $ - $) + $) # Static library used for unit tests which are always built diff --git a/src/common/preprocessing/ie_preprocess_data.hpp b/src/common/preprocessing/ie_preprocess_data.hpp index b02a5d9adaa..242fae5193b 100644 --- a/src/common/preprocessing/ie_preprocess_data.hpp +++ b/src/common/preprocessing/ie_preprocess_data.hpp @@ -77,7 +77,7 @@ public: "Use 'cmake -DENABLE_GAPI_PREPROCESSING=ON ...'"; # endif // ENABLE_GAPI_PREPROCESSING #else - ov::util::FilePath libraryName = ov::util::to_file_path(std::string("inference_engine_preproc") + std::string(IE_BUILD_POSTFIX)); + ov::util::FilePath libraryName = ov::util::to_file_path(std::string("openvino_gapi_preproc") + std::string(IE_BUILD_POSTFIX)); ov::util::FilePath preprocLibraryPath = FileUtils::makePluginLibraryName(getInferenceEngineLibraryPath(), libraryName); if (!FileUtils::fileExist(preprocLibraryPath)) { diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt index 4009b141429..5fe62453395 100644 --- a/src/core/tests/CMakeLists.txt +++ b/src/core/tests/CMakeLists.txt @@ -421,7 +421,7 @@ if(SUGGEST_OVERRIDE_SUPPORTED) PROPERTIES COMPILE_OPTIONS -Wno-suggest-override) endif() -list(APPEND UNIT_TESTS_DEPENDENCIES ov_template_extension) +list(APPEND UNIT_TESTS_DEPENDENCIES openvino_template_extension) if (ENABLE_INTEL_CPU AND ENABLE_OV_CORE_BACKEND_UNIT_TESTS) message(STATUS "OV_CORE_TESTS: IE:CPU enabled") @@ -429,7 +429,7 @@ if (ENABLE_INTEL_CPU AND ENABLE_OV_CORE_BACKEND_UNIT_TESTS) 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 ov_intel_cpu_plugin) + list(APPEND UNIT_TESTS_DEPENDENCIES openvino_intel_cpu_plugin) endif() endif() @@ -439,7 +439,7 @@ if (ENABLE_INTEL_GPU AND ENABLE_OV_CORE_BACKEND_UNIT_TESTS) 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 ov_intel_gpu_plugin) + list(APPEND UNIT_TESTS_DEPENDENCIES openvino_intel_gpu_plugin) endif() endif() @@ -447,7 +447,7 @@ if (ENABLE_OV_CORE_BACKEND_UNIT_TESTS) message(STATUS "OV_CORE_TESTS: INTERPRETER enabled") set(ACTIVE_BACKEND_LIST ${ACTIVE_BACKEND_LIST} INTERPRETER) if (ENABLE_STRICT_DEPENDENCIES) - list(APPEND UNIT_TESTS_DEPENDENCIES ov_template_plugin) + list(APPEND UNIT_TESTS_DEPENDENCIES openvino_template_plugin) endif() endif() @@ -603,9 +603,9 @@ if (OV_COMPILER_IS_CLANG) endif() if (ENABLE_OV_ONNX_FRONTEND) - get_target_property(ONNX_FRONTEND_SRC_DIR ov_onnx_frontend SOURCE_DIR) + get_target_property(ONNX_FRONTEND_SRC_DIR openvino_onnx_frontend SOURCE_DIR) target_include_directories(ov_core_unit_tests PRIVATE ${ONNX_FRONTEND_SRC_DIR}/src) - target_link_libraries(ov_core_unit_tests PRIVATE ov_onnx_frontend onnx_test_util) + target_link_libraries(ov_core_unit_tests PRIVATE openvino_onnx_frontend onnx_test_util) if (LINUX) target_link_options(ov_core_unit_tests PRIVATE -Wl,--exclude-libs,ALL) elseif(APPLE) @@ -614,7 +614,7 @@ if (ENABLE_OV_ONNX_FRONTEND) endif() if(ENABLE_OV_IR_FRONTEND) - add_dependencies(ov_core_unit_tests ov_ir_frontend) + add_dependencies(ov_core_unit_tests openvino_ir_frontend) endif() install(TARGETS ov_core_unit_tests diff --git a/src/core/tests/engines_util/test_case.hpp b/src/core/tests/engines_util/test_case.hpp index 604b36bbbca..95ade49aa30 100644 --- a/src/core/tests/engines_util/test_case.hpp +++ b/src/core/tests/engines_util/test_case.hpp @@ -34,7 +34,7 @@ public: TestCase(const std::shared_ptr& function, const std::string& dev = "TEMPLATE") : m_function{function} { try { // Register template plugin - m_core.register_plugin(std::string("ov_template_plugin") + IE_BUILD_POSTFIX, "TEMPLATE"); + m_core.register_plugin(std::string("openvino_template_plugin") + IE_BUILD_POSTFIX, "TEMPLATE"); } catch (...) { } m_request = m_core.compile_model(function, dev).create_infer_request(); diff --git a/src/core/tests/extension.cpp b/src/core/tests/extension.cpp index e7cd6bb28f7..e1974c42033 100644 --- a/src/core/tests/extension.cpp +++ b/src/core/tests/extension.cpp @@ -12,7 +12,7 @@ #include "so_extension.hpp" inline std::string get_extension_path() { - return ov::util::make_plugin_library_name({}, std::string("ov_template_extension") + IE_BUILD_POSTFIX); + return ov::util::make_plugin_library_name({}, std::string("openvino_template_extension") + IE_BUILD_POSTFIX); } TEST(extension, load_extension) { diff --git a/src/core/tests/frontend/CMakeLists.txt b/src/core/tests/frontend/CMakeLists.txt index a992821468d..dfca6db476b 100644 --- a/src/core/tests/frontend/CMakeLists.txt +++ b/src/core/tests/frontend/CMakeLists.txt @@ -16,12 +16,12 @@ if (ENABLE_OV_TF_FRONTEND) endif() set(SRC ${CMAKE_CURRENT_SOURCE_DIR}/mock_frontend.cpp) -set(MOCK1_FE_NAME ov_mock1_frontend) +set(MOCK1_FE_NAME openvino_mock1_frontend) add_library(${MOCK1_FE_NAME} SHARED EXCLUDE_FROM_ALL ${SRC}) target_compile_definitions(${MOCK1_FE_NAME} PRIVATE "-DMOCK_VARIANT=\"1\"") -target_include_directories(${MOCK1_FE_NAME} PRIVATE ".") +target_include_directories(${MOCK1_FE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(${MOCK1_FE_NAME} PRIVATE frontend_common) add_dependencies(ov_core_unit_tests ${MOCK1_FE_NAME}) diff --git a/src/core/tests/frontend/frontend_manager.cpp b/src/core/tests/frontend/frontend_manager.cpp index 2a2b976c84f..893d7974328 100644 --- a/src/core/tests/frontend/frontend_manager.cpp +++ b/src/core/tests/frontend/frontend_manager.cpp @@ -35,7 +35,7 @@ using namespace ov::frontend; static std::string find_my_pathname() { #ifdef _WIN32 - HMODULE hModule = GetModuleHandleW(SHARED_LIB_PREFIX L"ov_runtime" SHARED_LIB_SUFFIX); + HMODULE hModule = GetModuleHandleW(SHARED_LIB_PREFIX L"openvino" SHARED_LIB_SUFFIX); WCHAR wpath[MAX_PATH]; GetModuleFileNameW(hModule, wpath, MAX_PATH); std::wstring ws(wpath); diff --git a/src/core/tests/frontend/mock_frontend.cpp b/src/core/tests/frontend/mock_frontend.cpp index 78215aa8810..4248a30da0d 100644 --- a/src/core/tests/frontend/mock_frontend.cpp +++ b/src/core/tests/frontend/mock_frontend.cpp @@ -8,11 +8,11 @@ #include "openvino/opsets/opset8.hpp" // Defined if we are building the plugin DLL (instead of using it) -#ifdef ov_mock1_frontend_EXPORTS +#ifdef openvino_mock1_frontend_EXPORTS # define MOCK_API OPENVINO_CORE_EXPORTS #else # define MOCK_API OPENVINO_CORE_IMPORTS -#endif // ov_mock1_frontend_EXPORTS +#endif // openvino_mock1_frontend_EXPORTS using namespace ngraph; using namespace ov::frontend; diff --git a/src/core/tests/frontend/onnx/CMakeLists.txt b/src/core/tests/frontend/onnx/CMakeLists.txt index 70a6f53e487..edd9124b9d7 100644 --- a/src/core/tests/frontend/onnx/CMakeLists.txt +++ b/src/core/tests/frontend/onnx/CMakeLists.txt @@ -9,7 +9,7 @@ list(FILTER SRC EXCLUDE REGEX standalone_build) add_executable(${TARGET_NAME} ${SRC}) -target_link_libraries(${TARGET_NAME} PRIVATE frontend_shared_test_classes ov_onnx_frontend frontend_common) +target_link_libraries(${TARGET_NAME} PRIVATE frontend_shared_test_classes openvino_onnx_frontend frontend_common) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) @@ -23,7 +23,7 @@ target_compile_definitions(${TARGET_NAME} PRIVATE -D TEST_ONNX_MODELS_DIRNAME=\" set(MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/unit_test.manifest) target_compile_definitions(${TARGET_NAME} PRIVATE -D MANIFEST=\"${MANIFEST}\") -add_dependencies(${TARGET_NAME} ov_onnx_frontend) +add_dependencies(${TARGET_NAME} openvino_onnx_frontend) add_dependencies(${TARGET_NAME} test_model_zoo) add_subdirectory(standalone_build) diff --git a/src/core/tests/frontend/paddle/CMakeLists.txt b/src/core/tests/frontend/paddle/CMakeLists.txt index 387b9c90752..3303f6e245d 100644 --- a/src/core/tests/frontend/paddle/CMakeLists.txt +++ b/src/core/tests/frontend/paddle/CMakeLists.txt @@ -9,7 +9,7 @@ list(FILTER SRC EXCLUDE REGEX standalone_build) add_executable(${TARGET_NAME} ${SRC}) -target_link_libraries(${TARGET_NAME} PRIVATE frontend_shared_test_classes ov_paddle_frontend openvino::runtime) +target_link_libraries(${TARGET_NAME} PRIVATE frontend_shared_test_classes openvino_paddle_frontend openvino::runtime) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) @@ -56,11 +56,11 @@ else() endif() add_dependencies(${TARGET_NAME} paddle_test_models) -add_dependencies(${TARGET_NAME} ov_paddle_frontend) +add_dependencies(${TARGET_NAME} openvino_paddle_frontend) # Fuzzy tests for PaddlePaddle use IE_CPU engine if (ENABLE_INTEL_CPU) - add_dependencies(${TARGET_NAME} ov_intel_cpu_plugin) + add_dependencies(${TARGET_NAME} openvino_intel_cpu_plugin) endif() add_subdirectory(standalone_build) diff --git a/src/core/tests/frontend/tensorflow/CMakeLists.txt b/src/core/tests/frontend/tensorflow/CMakeLists.txt index 9d64d17a197..332888f2138 100644 --- a/src/core/tests/frontend/tensorflow/CMakeLists.txt +++ b/src/core/tests/frontend/tensorflow/CMakeLists.txt @@ -9,7 +9,7 @@ list(FILTER SRC EXCLUDE REGEX standalone_build) add_executable(${TARGET_NAME} ${SRC}) -target_link_libraries(${TARGET_NAME} PRIVATE frontend_shared_test_classes ov_tensorflow_frontend openvino::runtime) +target_link_libraries(${TARGET_NAME} PRIVATE frontend_shared_test_classes openvino_tensorflow_frontend openvino::runtime) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) @@ -64,9 +64,9 @@ else() endif() add_dependencies(${TARGET_NAME} tensorflow_test_models) -add_dependencies(${TARGET_NAME} ov_tensorflow_frontend) +add_dependencies(${TARGET_NAME} openvino_tensorflow_frontend) -get_target_property(TENSORFLOW_FRONTEND_SRC_DIR ov_tensorflow_frontend SOURCE_DIR) +get_target_property(TENSORFLOW_FRONTEND_SRC_DIR openvino_tensorflow_frontend SOURCE_DIR) target_include_directories(${TARGET_NAME} PRIVATE ${TENSORFLOW_FRONTEND_SRC_DIR}/src/pass/) add_subdirectory(standalone_build) diff --git a/src/core/tests/frontend/tensorflow/standalone_build/CMakeLists.txt b/src/core/tests/frontend/tensorflow/standalone_build/CMakeLists.txt index 449d02ec176..83d3fe2c14e 100644 --- a/src/core/tests/frontend/tensorflow/standalone_build/CMakeLists.txt +++ b/src/core/tests/frontend/tensorflow/standalone_build/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(${TARGET_NAME} STATIC standalone_build_test.cpp) # This test verifies that application can link to TensorFlow frontend only # Other dependencies on core header files will be resolved automatically -target_link_libraries(${TARGET_NAME} PUBLIC ov_tensorflow_frontend) +target_link_libraries(${TARGET_NAME} PUBLIC openvino_tensorflow_frontend) # Enable code style check add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) diff --git a/src/frontends/common/src/manager.cpp b/src/frontends/common/src/manager.cpp index 79bb22e983e..e1cf28ac1f2 100644 --- a/src/frontends/common/src/manager.cpp +++ b/src/frontends/common/src/manager.cpp @@ -109,7 +109,7 @@ public: private: // Helper structure for searching plugin either by name or by file name - // File name here doesn't contain prefix/suffix (like "ov_*_frontend.so") + // File name here doesn't contain prefix/suffix (like "openvino_*_frontend.so") struct FrontEndNames { FrontEndNames(std::string n, std::string f) : name(std::move(n)), file_name(std::move(f)) {} bool operator==(const FrontEndNames& other) const { diff --git a/src/frontends/common/src/plugin_loader.hpp b/src/frontends/common/src/plugin_loader.hpp index 916acb1fba3..0e48b8f9ade 100644 --- a/src/frontends/common/src/plugin_loader.hpp +++ b/src/frontends/common/src/plugin_loader.hpp @@ -24,7 +24,7 @@ class PluginInfo { bool load_internal(); public: - std::string m_file_name; // Plugin file name, e.g. "libov_ir_frontend.so" + std::string m_file_name; // Plugin file name, e.g. "libopenvino_ir_frontend.so" std::string m_file_path; // Plugin file full path PluginInfo() = default; diff --git a/src/frontends/ir/include/openvino/frontend/ir/visibility.hpp b/src/frontends/ir/include/openvino/frontend/ir/visibility.hpp index 42c2b888b9d..89a6d70cbc9 100644 --- a/src/frontends/ir/include/openvino/frontend/ir/visibility.hpp +++ b/src/frontends/ir/include/openvino/frontend/ir/visibility.hpp @@ -10,11 +10,11 @@ # define IR_API # define IR_C_API #else -# ifdef ov_ir_frontend_EXPORTS +# ifdef openvino_ir_frontend_EXPORTS # define IR_API OPENVINO_CORE_EXPORTS # define IR_C_API OPENVINO_EXTERN_C OPENVINO_CORE_EXPORTS # else # define IR_API OPENVINO_CORE_IMPORTS # define IR_C_API OPENVINO_EXTERN_C OPENVINO_CORE_IMPORTS -# endif // ov_ir_frontend_EXPORTS +# endif // openvino_ir_frontend_EXPORTS #endif // OPENVINO_STATIC_LIBRARY diff --git a/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp b/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp index 8a018315475..e2e2d5415d2 100644 --- a/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp +++ b/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp @@ -7,9 +7,9 @@ #ifdef OPENVINO_STATIC_LIBRARY # define ONNX_IMPORTER_API #else -# ifdef ov_onnx_frontend_EXPORTS +# ifdef openvino_onnx_frontend_EXPORTS # define ONNX_IMPORTER_API OPENVINO_CORE_EXPORTS # else # define ONNX_IMPORTER_API OPENVINO_CORE_IMPORTS -# endif // ov_onnx_frontend_EXPORTS +# endif // openvino_onnx_frontend_EXPORTS #endif // OPENVINO_STATIC_LIBRARY diff --git a/src/frontends/onnx/frontend/include/openvino/frontend/onnx/visibility.hpp b/src/frontends/onnx/frontend/include/openvino/frontend/onnx/visibility.hpp index 8224cff3359..3879f5459a9 100644 --- a/src/frontends/onnx/frontend/include/openvino/frontend/onnx/visibility.hpp +++ b/src/frontends/onnx/frontend/include/openvino/frontend/onnx/visibility.hpp @@ -10,11 +10,11 @@ # define ONNX_FRONTEND_API # define ONNX_FRONTEND_C_API #else -# ifdef ov_onnx_frontend_EXPORTS +# ifdef openvino_onnx_frontend_EXPORTS # define ONNX_FRONTEND_API OPENVINO_CORE_EXPORTS # define ONNX_FRONTEND_C_API OPENVINO_EXTERN_C OPENVINO_CORE_EXPORTS # else # define ONNX_FRONTEND_API OPENVINO_CORE_IMPORTS # define ONNX_FRONTEND_C_API OPENVINO_EXTERN_C OPENVINO_CORE_IMPORTS -# endif // ov_onnx_frontend_EXPORTS +# endif // openvino_onnx_frontend_EXPORTS #endif // OPENVINO_STATIC_LIBRARY diff --git a/src/frontends/paddle/include/openvino/frontend/paddle/visibility.hpp b/src/frontends/paddle/include/openvino/frontend/paddle/visibility.hpp index e046ca718e1..d1af2f5b6e7 100644 --- a/src/frontends/paddle/include/openvino/frontend/paddle/visibility.hpp +++ b/src/frontends/paddle/include/openvino/frontend/paddle/visibility.hpp @@ -10,11 +10,11 @@ # define PADDLE_API # define PADDLE_C_API #else -# ifdef ov_paddle_frontend_EXPORTS +# ifdef openvino_paddle_frontend_EXPORTS # define PADDLE_API OPENVINO_CORE_EXPORTS # define PADDLE_C_API OPENVINO_EXTERN_C OPENVINO_CORE_EXPORTS # else # define PADDLE_API OPENVINO_CORE_IMPORTS # define PADDLE_C_API OPENVINO_EXTERN_C OPENVINO_CORE_IMPORTS -# endif // ov_paddle_frontend_EXPORTS +# endif // openvino_paddle_frontend_EXPORTS #endif // OPENVINO_STATIC_LIBRARY diff --git a/src/frontends/tensorflow/include/openvino/frontend/tensorflow/visibility.hpp b/src/frontends/tensorflow/include/openvino/frontend/tensorflow/visibility.hpp index ae223bd99f3..844c2a772c4 100644 --- a/src/frontends/tensorflow/include/openvino/frontend/tensorflow/visibility.hpp +++ b/src/frontends/tensorflow/include/openvino/frontend/tensorflow/visibility.hpp @@ -10,11 +10,11 @@ # define TENSORFLOW_API # define TENSORFLOW_C_API #else -# ifdef ov_tensorflow_frontend_EXPORTS +# ifdef openvino_tensorflow_frontend_EXPORTS # define TENSORFLOW_API OPENVINO_CORE_EXPORTS # define TENSORFLOW_C_API OPENVINO_EXTERN_C OPENVINO_CORE_EXPORTS # else # define TENSORFLOW_API OPENVINO_CORE_IMPORTS # define TENSORFLOW_C_API OPENVINO_EXTERN_C OPENVINO_CORE_IMPORTS -# endif // ov_tensorflow_frontend_EXPORTS +# endif // openvino_tensorflow_frontend_EXPORTS #endif // OPENVINO_STATIC_LIBRARY diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 848e62eefb4..ddd2fdcbc86 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -93,13 +93,13 @@ source_group("include" FILES ${LIBRARY_HEADERS} ${PUBLIC_HEADERS}) add_library(${TARGET_NAME}_plugin_api INTERFACE) target_include_directories(${TARGET_NAME}_plugin_api INTERFACE - $ + $ $ $ $) target_compile_definitions(${TARGET_NAME}_plugin_api INTERFACE - $) + $) target_link_libraries(${TARGET_NAME}_plugin_api INTERFACE pugixml::static openvino::itt openvino::util) @@ -126,7 +126,7 @@ ie_faster_build(${TARGET_NAME}_obj target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API $ $ - $) + $) target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $ $ @@ -187,7 +187,7 @@ if(WIN32) endif() target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt ${CMAKE_DL_LIBS} ngraph - frontend_common::static inference_engine_preproc_s inference_engine_transformations pugixml::static) + frontend_common::static openvino_gapi_preproc_s inference_engine_transformations pugixml::static) target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE) diff --git a/src/inference/include/ie/vpu/hddl_config.hpp b/src/inference/include/ie/vpu/hddl_config.hpp index f7cff9e53ad..2e48c0c726b 100644 --- a/src/inference/include/ie/vpu/hddl_config.hpp +++ b/src/inference/include/ie/vpu/hddl_config.hpp @@ -85,7 +85,7 @@ DECLARE_METRIC_KEY(HDDL_DEVICE_TOTAL_NUM, int); } // namespace Metrics /** - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: Arbitrary non-empty string. If empty (""), equals no set, default: ""; * This option allows to specify the number of MYX devices used for inference a specific Executable network. * Note: Only one network would be allocated to one device. @@ -103,7 +103,7 @@ DECLARE_METRIC_KEY(HDDL_DEVICE_TOTAL_NUM, int); DECLARE_VPU_CONFIG(HDDL_GRAPH_TAG); /** - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: Arbitrary non-empty string. If empty (""), equals no set, default: ""; * This config makes the executable networks to be allocated on one certain device (instead of multiple devices). * And all inference through this executable network, will be done on this device. @@ -119,7 +119,7 @@ DECLARE_VPU_CONFIG(HDDL_GRAPH_TAG); DECLARE_VPU_CONFIG(HDDL_STREAM_ID); /** - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: Arbitrary non-empty string. If empty (""), equals no set, default: ""; * This config allows user to control device flexibly. This config gives a "tag" for a certain device while * allocating a network to it. Afterward, user can allocating/deallocating networks to this device with this "tag". @@ -135,7 +135,7 @@ DECLARE_VPU_CONFIG(HDDL_STREAM_ID); DECLARE_VPU_CONFIG(HDDL_DEVICE_TAG); /** - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: "YES/NO", default is "NO". * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set. After a user load a * network, the user got a handle for the network. @@ -148,7 +148,7 @@ DECLARE_VPU_CONFIG(HDDL_DEVICE_TAG); DECLARE_VPU_CONFIG(HDDL_BIND_DEVICE); /** - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: A signed int wrapped in a string, default is "0". * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set and "BIND_DEVICE" is "False". * When there are multiple devices running a certain network (a same network running on multiple devices in Bypass @@ -158,7 +158,7 @@ DECLARE_VPU_CONFIG(HDDL_BIND_DEVICE); DECLARE_VPU_CONFIG(HDDL_RUNTIME_PRIORITY); /** - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: "YES/NO", default is "NO". * SGAD is short for "Single Graph All Device". With this scheduler, once application allocates 1 network, all devices * (managed by SGAD scheduler) will be loaded with this graph. The number of network that can be loaded to one device @@ -167,7 +167,7 @@ DECLARE_VPU_CONFIG(HDDL_RUNTIME_PRIORITY); DECLARE_VPU_CONFIG(HDDL_USE_SGAD); /** - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: A signed int wrapped in a string, default is "0". * This config gives a "group id" for a certain device when this device has been reserved for certain client, client * can use this device grouped by calling this group id while other client can't use this device diff --git a/src/inference/include/ie/vpu/hddl_plugin_config.hpp b/src/inference/include/ie/vpu/hddl_plugin_config.hpp index 87b0a61a226..280ab8b580e 100644 --- a/src/inference/include/ie/vpu/hddl_plugin_config.hpp +++ b/src/inference/include/ie/vpu/hddl_plugin_config.hpp @@ -146,7 +146,7 @@ namespace VPUConfigParams { /** * @deprecated Use InferenceEngine::HDDL_GRAPH_TAG instead - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: Arbitrary non-empty string. If empty (""), equals no set, default: ""; * This option allows to specify the number of MYX devices used for inference a specific Executable network. * Note: Only one network would be allocated to one device. @@ -166,7 +166,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(GRAPH_TAG); /** * @deprecated Use InferenceEngine::HDDL_STREAM_ID instead - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: Arbitrary non-empty string. If empty (""), equals no set, default: ""; * This config makes the executable networks to be allocated on one certain device (instead of multiple devices). * And all inference through this executable network, will be done on this device. @@ -184,7 +184,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(STREAM_ID); /** * @deprecated Use InferenceEngine::HDDL_DEVICE_TAG instead - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: Arbitrary non-empty string. If empty (""), equals no set, default: ""; * This config allows user to control device flexibly. This config gives a "tag" for a certain device while * allocating a network to it. Afterward, user can allocating/deallocating networks to this device with this "tag". @@ -202,7 +202,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(DEVICE_TAG); /** * @deprecated Use InferenceEngine::HDDL_BIND_DEVICE instead - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: "YES/NO", default is "NO". * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set. After a user load a * network, the user got a handle for the network. @@ -217,7 +217,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(BIND_DEVICE); /** * @deprecated Use InferenceEngine::HDDL_RUNTIME_PRIORITY instead - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: A signed int wrapped in a string, default is "0". * This config is a sub-config of DEVICE_TAG, and only available when "DEVICE_TAG" is set and "BIND_DEVICE" is "False". * When there are multiple devices running a certain network (a same network running on multiple devices in Bypass @@ -229,7 +229,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(RUNTIME_PRIORITY); /** * @deprecated Use InferenceEngine::HDDL_USE_SGAD instead - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: "YES/NO", default is "NO". * SGAD is short for "Single Graph All Device". With this scheduler, once application allocates 1 network, all devices * (managed by SGAD scheduler) will be loaded with this graph. The number of network that can be loaded to one device @@ -240,7 +240,7 @@ DECLARE_VPU_HDDL_CONFIG_KEY(USE_SGAD); /** * @deprecated Use InferenceEngine::HDDL_GROUP_DEVICE instead - * @brief [Only for ov_intel_hddl_plugin] + * @brief [Only for OpenVINO Intel HDDL device] * Type: A signed int wrapped in a string, default is "0". * This config gives a "group id" for a certain device when this device has been reserved for certain client, client * can use this device grouped by calling this group id while other client can't use this device diff --git a/src/plugins/auto/CMakeLists.txt b/src/plugins/auto/CMakeLists.txt index e88b3ae3649..bcf72ee951f 100644 --- a/src/plugins/auto/CMakeLists.txt +++ b/src/plugins/auto/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set (TARGET_NAME "ov_auto_plugin") +set (TARGET_NAME "openvino_auto_plugin") file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cpp) diff --git a/src/plugins/auto_batch/CMakeLists.txt b/src/plugins/auto_batch/CMakeLists.txt index 75c8d442b55..98424a4583b 100644 --- a/src/plugins/auto_batch/CMakeLists.txt +++ b/src/plugins/auto_batch/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "ov_auto_batch_plugin") +set(TARGET_NAME "openvino_auto_batch_plugin") file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) diff --git a/src/plugins/hetero/CMakeLists.txt b/src/plugins/hetero/CMakeLists.txt index fb5b19943ac..8674bd89bcc 100644 --- a/src/plugins/hetero/CMakeLists.txt +++ b/src/plugins/hetero/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set (TARGET_NAME "ov_hetero_plugin") +set (TARGET_NAME "openvino_hetero_plugin") file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt index 7f38fc89d30..f69dbeefaac 100644 --- a/src/plugins/intel_cpu/CMakeLists.txt +++ b/src/plugins/intel_cpu/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "ov_intel_cpu_plugin") +set(TARGET_NAME "openvino_intel_cpu_plugin") if(CMAKE_COMPILER_IS_GNUCC) ie_add_compiler_flags(-Wno-all) @@ -70,7 +70,7 @@ if(BUILD_SHARED_LIBS) add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS}) link_system_libraries(${TARGET_NAME}_obj PUBLIC mkldnn) - target_include_directories(${TARGET_NAME}_obj PRIVATE $ + target_include_directories(${TARGET_NAME}_obj PRIVATE $ $ $ $ diff --git a/src/plugins/intel_cpu/src/mkldnn_plugin.cpp b/src/plugins/intel_cpu/src/mkldnn_plugin.cpp index 9645c02e6ce..ee1d7d4c317 100644 --- a/src/plugins/intel_cpu/src/mkldnn_plugin.cpp +++ b/src/plugins/intel_cpu/src/mkldnn_plugin.cpp @@ -878,5 +878,5 @@ InferenceEngine::IExecutableNetworkInternal::Ptr Engine::ImportNetwork(std::istr return execNetwork; } -static const Version version = {{2, 1}, CI_BUILD_NUMBER, "ov_intel_cpu_plugin"}; +static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_intel_cpu_plugin"}; IE_DEFINE_PLUGIN_CREATE_FUNCTION(Engine, version) diff --git a/src/plugins/intel_gna/CMakeLists.txt b/src/plugins/intel_gna/CMakeLists.txt index 80390f9f6ee..a9be3a5ad6b 100644 --- a/src/plugins/intel_gna/CMakeLists.txt +++ b/src/plugins/intel_gna/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "ov_intel_gna_plugin") +set(TARGET_NAME "openvino_intel_gna_plugin") if(CMAKE_COMPILER_IS_GNUCC) ie_add_compiler_flags(-Wno-all) @@ -57,7 +57,7 @@ target_compile_definitions(${TARGET_NAME}_test_static INTEGER_LOW_P USE_STATIC_IE) -target_link_libraries(${TARGET_NAME}_test_static PUBLIC inference_engine_s inference_engine_preproc_s inference_engine_transformations libGNA::API) +target_link_libraries(${TARGET_NAME}_test_static PUBLIC inference_engine_s openvino_gapi_preproc_s inference_engine_transformations libGNA::API) target_include_directories(${TARGET_NAME}_test_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/plugins/intel_gna/gna_plugin_entry_points.cpp b/src/plugins/intel_gna/gna_plugin_entry_points.cpp index 8f4da4d8045..ab9648930f9 100644 --- a/src/plugins/intel_gna/gna_plugin_entry_points.cpp +++ b/src/plugins/intel_gna/gna_plugin_entry_points.cpp @@ -14,7 +14,7 @@ static const Version gnaPluginDescription = { CI_BUILD_NUMBER "_with_GNA_LIB_VER==2" , - "ov_intel_gna_plugin" + "openvino_intel_gna_plugin" }; IE_DEFINE_PLUGIN_CREATE_FUNCTION(GNAPluginInternal, gnaPluginDescription) diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt index b035cab5847..06bf07bb4c8 100644 --- a/src/plugins/intel_gpu/CMakeLists.txt +++ b/src/plugins/intel_gpu/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set (TARGET_NAME "ov_intel_gpu_plugin") +set (TARGET_NAME "openvino_intel_gpu_plugin") if(CMAKE_COMPILER_IS_GNUCXX) ie_add_compiler_flags(-Wno-all -Wno-missing-declarations) @@ -36,7 +36,7 @@ ie_add_plugin(NAME ${TARGET_NAME} target_compile_options(${TARGET_NAME} PRIVATE $<$:$,/Os,-Os>>) -target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_graph +target_link_libraries(${TARGET_NAME} PRIVATE openvino_intel_gpu_graph pugixml::static) target_include_directories(${TARGET_NAME} PRIVATE diff --git a/src/plugins/intel_gpu/src/graph/CMakeLists.txt b/src/plugins/intel_gpu/src/graph/CMakeLists.txt index 32c9cfb8a92..90468ec6534 100644 --- a/src/plugins/intel_gpu/src/graph/CMakeLists.txt +++ b/src/plugins/intel_gpu/src/graph/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "ov_intel_gpu_graph") +set(TARGET_NAME "openvino_intel_gpu_graph") file(GLOB_RECURSE LIBRARY_SRC "${INCLUDE_DIR}/*.h" @@ -34,8 +34,8 @@ target_compile_options(${TARGET_NAME} PRIVATE $<$:$,/Os,-Os>>) target_link_libraries(${TARGET_NAME} PUBLIC OpenCL) -target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_kernels - ov_intel_gpu_runtime +target_link_libraries(${TARGET_NAME} PRIVATE openvino_intel_gpu_kernels + openvino_intel_gpu_runtime openvino::itt openvino::runtime::dev openvino::runtime) diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt index fc5c0599e07..3993bd97318 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt +++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "ov_intel_gpu_kernels") +set(TARGET_NAME "openvino_intel_gpu_kernels") find_package(PythonInterp 3 QUIET) if(NOT PYTHONINTERP_FOUND) diff --git a/src/plugins/intel_gpu/src/runtime/CMakeLists.txt b/src/plugins/intel_gpu/src/runtime/CMakeLists.txt index fe368294df0..d87b901185d 100644 --- a/src/plugins/intel_gpu/src/runtime/CMakeLists.txt +++ b/src/plugins/intel_gpu/src/runtime/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "ov_intel_gpu_runtime") +set(TARGET_NAME "openvino_intel_gpu_runtime") file(GLOB LIBRARY_SOURCES_MAIN "${CMAKE_CURRENT_SOURCE_DIR}/*.h" diff --git a/src/plugins/intel_gpu/tests/CMakeLists.txt b/src/plugins/intel_gpu/tests/CMakeLists.txt index 427088453cd..b15c123e06a 100644 --- a/src/plugins/intel_gpu/tests/CMakeLists.txt +++ b/src/plugins/intel_gpu/tests/CMakeLists.txt @@ -37,7 +37,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized") endif() -target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_graph +target_link_libraries(${TARGET_NAME} PRIVATE openvino_intel_gpu_graph inference_engine OpenCL gtest @@ -46,8 +46,8 @@ target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_graph target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_utils/ - $ - $) + $ + $) if(WIN32) target_link_libraries(${TARGET_NAME} PRIVATE setupapi) elseif((NOT ANDROID) AND (UNIX)) diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt index ac52bdeca16..12a2f15e4a7 100644 --- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt +++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "ov_intel_myriad_plugin") +set(TARGET_NAME "openvino_intel_myriad_plugin") file(GLOB_RECURSE SOURCES *.cpp *.hpp *.h) diff --git a/src/plugins/intel_myriad/myriad_plugin/api/myriad_api.cpp b/src/plugins/intel_myriad/myriad_plugin/api/myriad_api.cpp index bcbf08d282d..92c10575226 100644 --- a/src/plugins/intel_myriad/myriad_plugin/api/myriad_api.cpp +++ b/src/plugins/intel_myriad/myriad_plugin/api/myriad_api.cpp @@ -9,5 +9,5 @@ using namespace InferenceEngine; using namespace vpu::MyriadPlugin; -static const Version version = {{2, 1}, CI_BUILD_NUMBER, "ov_intel_myriad_plugin"}; +static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_intel_myriad_plugin"}; IE_DEFINE_PLUGIN_CREATE_FUNCTION(Engine, version, std::make_shared()) diff --git a/src/tests/functional/inference_engine/CMakeLists.txt b/src/tests/functional/inference_engine/CMakeLists.txt index f370053df6d..1216f588edb 100644 --- a/src/tests/functional/inference_engine/CMakeLists.txt +++ b/src/tests/functional/inference_engine/CMakeLists.txt @@ -24,14 +24,14 @@ set(LINK_LIBRARIES set(DEPENDENCIES mock_engine template_extension - ov_template_extension + openvino_template_extension lptNgraphFunctions sharedTestClasses test_model_zoo ) if(ENABLE_OV_IR_FRONTEND) - list(APPEND DEPENDENCIES ov_ir_frontend) + list(APPEND DEPENDENCIES openvino_ir_frontend) endif() if(ENABLE_IR_V7_READER) @@ -39,15 +39,15 @@ if(ENABLE_IR_V7_READER) endif() if(ENABLE_HETERO) - list(APPEND DEPENDENCIES ov_hetero_plugin) + list(APPEND DEPENDENCIES openvino_hetero_plugin) endif() if(ENABLE_AUTO OR ENABLE_MULTI) - list(APPEND DEPENDENCIES ov_auto_plugin) + list(APPEND DEPENDENCIES openvino_auto_plugin) endif() if(ENABLE_AUTO_BATCH) - list(APPEND DEPENDENCIES ov_auto_batch_plugin) + list(APPEND DEPENDENCIES openvino_auto_batch_plugin) endif() if (NOT ENABLE_OV_ONNX_FRONTEND) @@ -76,13 +76,13 @@ if(ENABLE_OV_ONNX_FRONTEND) target_compile_definitions(${TARGET_NAME} PRIVATE ENABLE_OV_ONNX_FRONTEND ONNX_TEST_MODELS="${TEST_MODEL_ZOO}/onnx_reader/models/") - add_dependencies(${TARGET_NAME} ov_onnx_frontend) + add_dependencies(${TARGET_NAME} openvino_onnx_frontend) endif() if(ENABLE_OV_PADDLE_FRONTEND) target_compile_definitions(${TARGET_NAME} PRIVATE PADDLE_TEST_MODELS="${CMAKE_CURRENT_SOURCE_DIR}/paddle_reader/models/") - add_dependencies(${TARGET_NAME} ov_paddle_frontend) + add_dependencies(${TARGET_NAME} openvino_paddle_frontend) endif() ie_faster_build(${TARGET_NAME} @@ -196,7 +196,7 @@ function(ie_headers_compilation_with_custom_flags) target_compile_definitions(${target_name} PRIVATE $) if(IE_TEST_PLUGIN_API) - # ngraph, pugixml::static, openvino::itt, inference_engine_preproc headers + # ngraph, pugixml::static, openvino::itt, openvino_gapi_preproc headers target_include_directories(${target_name} SYSTEM PRIVATE $ $) diff --git a/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp b/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp index b36cadb27e7..4f5978e4022 100644 --- a/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp +++ b/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp @@ -28,7 +28,7 @@ static std::string get_extension_path() { } static std::string get_ov_extension_path() { - return FileUtils::makePluginLibraryName({}, std::string("ov_template_extension") + IE_BUILD_POSTFIX); + return FileUtils::makePluginLibraryName({}, std::string("openvino_template_extension") + IE_BUILD_POSTFIX); } class CustomOpsSerializationTest : public ::testing::Test { diff --git a/src/tests/functional/inference_engine/ov_extension_test.cpp b/src/tests/functional/inference_engine/ov_extension_test.cpp index 9a96573d1f6..21aa4cf4983 100644 --- a/src/tests/functional/inference_engine/ov_extension_test.cpp +++ b/src/tests/functional/inference_engine/ov_extension_test.cpp @@ -174,7 +174,7 @@ public: namespace { std::string getOVExtensionPath() { - return FileUtils::makePluginLibraryName({}, std::string("ov_template_extension") + IE_BUILD_POSTFIX); + return FileUtils::makePluginLibraryName({}, std::string("openvino_template_extension") + IE_BUILD_POSTFIX); } } // namespace diff --git a/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt b/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt index 832935c9c98..7570bcabcb9 100644 --- a/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt +++ b/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt @@ -18,8 +18,8 @@ addIeTargetTest( ADD_CPPLINT ) -if(TARGET ov_ir_frontend) - add_dependencies(${TARGET_NAME} ov_ir_frontend) +if(TARGET openvino_ir_frontend) + add_dependencies(${TARGET_NAME} openvino_ir_frontend) endif() ie_faster_build(${TARGET_NAME} UNITY) diff --git a/src/tests/functional/plugin/conformance/test_runner/README.md b/src/tests/functional/plugin/conformance/test_runner/README.md index 79c4b214313..2e05c79aaec 100644 --- a/src/tests/functional/plugin/conformance/test_runner/README.md +++ b/src/tests/functional/plugin/conformance/test_runner/README.md @@ -36,7 +36,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 ov_intel_cpu_plugin. Use only with unregistered in IE Core devices. +* `--plugin_lib_name` is name of plugin library. The example is `openvino_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. [Examples](./op_conformance_runner/skip_configs) * `--config_path` allows to specify path to file contains plugin config. [Example](./op_conformance_runner/config/config_example.txt) 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 9fbab822f54..bb3c3cd3f07 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 @@ -13,18 +13,17 @@ namespace conformance { inline const std::string getPluginLibNameByDevice(const std::string& deviceName) { const std::map devices{ - { "AUTO", "ov_multi_plugin" }, - { "HDDL", "ov_intel_hddl_plugin" }, - { "VPUX", "ov_intel_vpux_plugin" }, - { "AUTO", "ov_auto_plugin" }, - { "CPU", "ov_intel_cpu_plugin" }, - { "GNA", "ov_intel_gna_plugin" }, - { "GPU", "ov_intel_gpu_plugin" }, - { "HETERO", "ov_hetero_plugin" }, - { "BATCH", "ov_auto_batch_plugin" }, - { "MULTI", "ov_multi_plugin" }, - { "MYRIAD", "ov_intel_myriad_plugin" }, - { "TEMPLATE", "ov_template_plugin" }, + { "AUTO", "openvino_auto_plugin" }, + { "HDDL", "openvino_intel_hddl_plugin" }, + { "VPUX", "openvino_intel_vpux_plugin" }, + { "CPU", "openvino_intel_cpu_plugin" }, + { "GNA", "openvino_intel_gna_plugin" }, + { "GPU", "openvino_intel_gpu_plugin" }, + { "HETERO", "openvino_hetero_plugin" }, + { "BATCH", "openvino_auto_batch_plugin" }, + { "MULTI", "openvino_auto_plugin" }, + { "MYRIAD", "openvino_intel_myriad_plugin" }, + { "TEMPLATE", "openvino_template_plugin" }, }; if (devices.find(deviceName) == devices.end()) { throw std::runtime_error("Incorrect device name"); diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp index d5f4965ba87..635bef834ce 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp @@ -15,17 +15,17 @@ namespace conformance { inline const std::string get_plugin_lib_name_by_device(const std::string& deviceName) { const std::map devices{ - { "AUTO", "ov_auto_plugin" }, - { "HDDL", "HDDLPlugin" }, - { "VPUX", "ov_intel_vpux_plugin" }, - { "AUTO", "ov_auto_plugin" }, - { "CPU", "ov_intel_cpu_plugin" }, - { "GNA", "ov_intel_gna_plugin" }, - { "GPU", "ov_intel_gpu_plugin" }, - { "HETERO", "ov_hetero_plugin" }, - { "MULTI", "ov_multi_plugin" }, - { "MYRIAD", "ov_intel_vpu_plugin" }, - { "TEMPLATE", "ov_template_plugin" }, + { "AUTO", "openvino_auto_plugin" }, + { "HDDL", "intel_hddl_plugin" }, + { "VPUX", "openvino_intel_vpux_plugin" }, + { "AUTO", "openvino_auto_plugin" }, + { "CPU", "openvino_intel_cpu_plugin" }, + { "GNA", "openvino_intel_gna_plugin" }, + { "GPU", "openvino_intel_gpu_plugin" }, + { "HETERO", "openvino_hetero_plugin" }, + { "MULTI", "openvino_auto_plugin" }, + { "MYRIAD", "openvino_intel_myriad_plugin" }, + { "TEMPLATE", "openvino_template_plugin" }, }; if (devices.find(deviceName) == devices.end()) { throw std::runtime_error("Incorrect device name"); 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 1a50779d3b0..8a0c9f6b67b 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 @@ -22,7 +22,7 @@ static const char target_device_message[] = "Required. Specify the target device "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 ov_intel_cpu_plugin. Use only with unregistered in IE Core devices"; + "Optional. Name of plugin library. The example is `openvino_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 820ef26b473..9ba753bea29 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 $/src/utils/rt_info/memory_formats_attribute.hpp - $/src/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} $/src) -set(DEPENDENCIES ov_intel_cpu_plugin) +set(INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} $/src) +set(DEPENDENCIES openvino_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 1e5d9d7f1ff..c96a8bf8149 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("ov_intel_cpu_plugin", "CPU"))); + ::testing::Values(std::make_pair("openvino_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 df1df7cc5fc..9304991cfe6 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("ov_intel_cpu_plugin", "CPU"))); + ::testing::Values(std::make_pair("openvino_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 e04ae250d17..e3bbe500f9a 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", "ov_intel_cpu_plugin"}, {"CPU1", "ov_intel_cpu_plugin"}}), + ::testing::Values(std::vector{{"CPU0", "openvino_intel_cpu_plugin"}, {"CPU1", "openvino_intel_cpu_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_singleMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"CPU0", "ov_intel_cpu_plugin"}, {"CPU1", "ov_intel_cpu_plugin"}}), + ::testing::Values(std::vector{{"CPU0", "openvino_intel_cpu_plugin"}, {"CPU1", "openvino_intel_cpu_plugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); diff --git a/src/tests/functional/plugin/gna/CMakeLists.txt b/src/tests/functional/plugin/gna/CMakeLists.txt index fb61dfe1e4a..b8f50b13d89 100644 --- a/src/tests/functional/plugin/gna/CMakeLists.txt +++ b/src/tests/functional/plugin/gna/CMakeLists.txt @@ -8,7 +8,7 @@ addIeTargetTest( NAME ${TARGET_NAME} ROOT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDENCIES - ov_intel_gna_plugin + openvino_intel_gna_plugin LINK_LIBRARIES funcSharedTests ADD_CPPLINT diff --git a/src/tests/functional/plugin/gna/shared_tests_instances/behavior/ov_plugin/core_intergration.cpp b/src/tests/functional/plugin/gna/shared_tests_instances/behavior/ov_plugin/core_intergration.cpp index 0e32e4dac5a..f8c8ab206e0 100644 --- a/src/tests/functional/plugin/gna/shared_tests_instances/behavior/ov_plugin/core_intergration.cpp +++ b/src/tests/functional/plugin/gna/shared_tests_instances/behavior/ov_plugin/core_intergration.cpp @@ -17,7 +17,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(nightly_OVClassBasicTestP, OVClassBasicTestP, - ::testing::Values(std::make_pair("ov_intel_gna_plugin", "GNA"))); + ::testing::Values(std::make_pair("openvino_intel_gna_plugin", "GNA"))); // TODO INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_OVClassNetworkTestP, OVClassNetworkTestP, ::testing::Values("GNA")); diff --git a/src/tests/functional/plugin/gna/shared_tests_instances/behavior/plugin/core_integration.cpp b/src/tests/functional/plugin/gna/shared_tests_instances/behavior/plugin/core_integration.cpp index 08cb5374e87..0ac4b8e5212 100644 --- a/src/tests/functional/plugin/gna/shared_tests_instances/behavior/plugin/core_integration.cpp +++ b/src/tests/functional/plugin/gna/shared_tests_instances/behavior/plugin/core_integration.cpp @@ -15,7 +15,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( nightly_IEClassBasicTestP, IEClassBasicTestP, - ::testing::Values(std::make_pair("ov_intel_gna_plugin", "GNA"))); + ::testing::Values(std::make_pair("openvino_intel_gna_plugin", "GNA"))); // TODO INSTANTIATE_TEST_SUITE_P( diff --git a/src/tests/functional/plugin/gpu/CMakeLists.txt b/src/tests/functional/plugin/gpu/CMakeLists.txt index 39d5feb9212..9ec09a8fd72 100644 --- a/src/tests/functional/plugin/gpu/CMakeLists.txt +++ b/src/tests/functional/plugin/gpu/CMakeLists.txt @@ -12,7 +12,7 @@ addIeTargetTest( INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} DEPENDENCIES - ov_intel_gpu_plugin + openvino_intel_gpu_plugin LINK_LIBRARIES funcSharedTests OpenCL diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 08e3e381934..622ac8b7a50 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -23,7 +23,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(nightly_OVClassCommon, OVClassBasicTestP, - ::testing::Values(std::make_pair("ov_intel_gpu_plugin", "GPU"))); + ::testing::Values(std::make_pair("openvino_intel_gpu_plugin", "GPU"))); INSTANTIATE_TEST_SUITE_P(nightly_OVClassNetworkTestP, OVClassNetworkTestP, ::testing::Values("GPU")); diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/core_integration.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/core_integration.cpp index ba66075b22f..c7feedd377d 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/core_integration.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/core_integration.cpp @@ -21,7 +21,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( nightly_IEClassCommon, IEClassBasicTestP, - ::testing::Values(std::make_pair("ov_intel_gpu_plugin", "GPU")) + ::testing::Values(std::make_pair("openvino_intel_gpu_plugin", "GPU")) ); INSTANTIATE_TEST_SUITE_P( diff --git a/src/tests/functional/plugin/myriad/CMakeLists.txt b/src/tests/functional/plugin/myriad/CMakeLists.txt index 9998c84634b..03162aba8c8 100644 --- a/src/tests/functional/plugin/myriad/CMakeLists.txt +++ b/src/tests/functional/plugin/myriad/CMakeLists.txt @@ -17,7 +17,7 @@ addIeTargetTest( ${XLINK_INCLUDE} ${XLINK_PLATFORM_INCLUDE} DEPENDENCIES - ov_intel_myriad_plugin + openvino_intel_myriad_plugin LINK_LIBRARIES vpu_graph_transformer vpu_common_lib 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 2bfbbd0929a..7ba7fdcdf11 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 @@ -16,7 +16,7 @@ std::vector devices = { }; std::pair plugins[] = { - std::make_pair(std::string("ov_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), + std::make_pair(std::string("openvino_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), }; INSTANTIATE_TEST_SUITE_P( 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 5d62fca7ee1..46614bd967b 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 @@ -16,7 +16,7 @@ std::vector devices = { }; std::pair plugins[] = { - std::make_pair(std::string("ov_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), + std::make_pair(std::string("openvino_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), }; INSTANTIATE_TEST_SUITE_P(smoke_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 231d3ff173d..2e8a6843354 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 @@ -16,7 +16,7 @@ std::vector devices = { }; std::pair plugins[] = { - std::make_pair(std::string("ov_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), + std::make_pair(std::string("openvino_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), }; // diff --git a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/plugin/core_integration.cpp b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/plugin/core_integration.cpp index 64b9be05517..7d9342f5919 100644 --- a/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/plugin/core_integration.cpp +++ b/src/tests/functional/plugin/myriad/shared_tests_instances/behavior/plugin/core_integration.cpp @@ -16,7 +16,7 @@ std::vector devices = { }; std::pair plugins[] = { - std::make_pair(std::string("ov_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), + std::make_pair(std::string("openvino_intel_myriad_plugin"), std::string(CommonTestUtils::DEVICE_MYRIAD)), }; // diff --git a/src/tests/functional/plugin/shared/CMakeLists.txt b/src/tests/functional/plugin/shared/CMakeLists.txt index 3db117acce3..a19731a8769 100644 --- a/src/tests/functional/plugin/shared/CMakeLists.txt +++ b/src/tests/functional/plugin/shared/CMakeLists.txt @@ -9,21 +9,21 @@ set(PUBLIC_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") set(DEPENDENCIES mock_engine) if(ENABLE_HETERO) - list(APPEND DEPENDENCIES ov_hetero_plugin) + list(APPEND DEPENDENCIES openvino_hetero_plugin) endif() if(ENABLE_AUTO OR ENABLE_MULTI) - list(APPEND DEPENDENCIES ov_auto_plugin) + list(APPEND DEPENDENCIES openvino_auto_plugin) endif() if(ENABLE_AUTO_BATCH) - list(APPEND DEPENDENCIES ov_auto_batch_plugin) + list(APPEND DEPENDENCIES openvino_auto_batch_plugin) endif() # remove once CVS-69781 is fixed if(ENABLE_OV_IR_FRONTEND) - list(APPEND DEPENDENCIES ov_ir_frontend) + list(APPEND DEPENDENCIES openvino_ir_frontend) endif() if (ENABLE_OV_ONNX_FRONTEND) diff --git a/src/tests/functional/plugin/shared/include/base/behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/behavior_test_utils.hpp index 00ffc34a204..055d374bd4b 100644 --- a/src/tests/functional/plugin/shared/include/base/behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/behavior_test_utils.hpp @@ -105,7 +105,7 @@ inline InferenceEngine::Core createIECoreWithTemplate() { PluginCache::get().reset(); InferenceEngine::Core ie; #ifndef OPENVINO_STATIC_LIBRARY - std::string pluginName = "ov_template_plugin"; + std::string pluginName = "openvino_template_plugin"; pluginName += IE_BUILD_POSTFIX; ie.RegisterPlugin(pluginName, CommonTestUtils::DEVICE_TEMPLATE); #endif // !OPENVINO_STATIC_LIBRARY diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index e0d0f89ad29..21bb7b9e9d1 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -75,7 +75,7 @@ inline ov::Core createCoreWithTemplate() { ov::test::utils::PluginCache::get().reset(); ov::Core core; #ifndef OPENVINO_STATIC_LIBRARY - std::string pluginName = "ov_template_plugin"; + std::string pluginName = "openvino_template_plugin"; pluginName += IE_BUILD_POSTFIX; core.register_plugin(pluginName, CommonTestUtils::DEVICE_TEMPLATE); #endif // !OPENVINO_STATIC_LIBRARY diff --git a/src/tests/ie_test_utils/functional_test_utils/src/ov_plugin_cache.cpp b/src/tests/ie_test_utils/functional_test_utils/src/ov_plugin_cache.cpp index 1c18a48ee3c..f44035b0e38 100644 --- a/src/tests/ie_test_utils/functional_test_utils/src/ov_plugin_cache.cpp +++ b/src/tests/ie_test_utils/functional_test_utils/src/ov_plugin_cache.cpp @@ -54,7 +54,7 @@ std::shared_ptr PluginCache::core(const std::string &deviceToCheck) { // register template plugin if it is needed try { - std::string pluginName = "ov_template_plugin"; + std::string pluginName = "openvino_template_plugin"; pluginName += IE_BUILD_POSTFIX; ov_core->register_plugin(pluginName, "TEMPLATE"); } catch (...) { diff --git a/src/tests/ie_test_utils/functional_test_utils/src/plugin_cache.cpp b/src/tests/ie_test_utils/functional_test_utils/src/plugin_cache.cpp index 94966097b87..1e87f350bbf 100644 --- a/src/tests/ie_test_utils/functional_test_utils/src/plugin_cache.cpp +++ b/src/tests/ie_test_utils/functional_test_utils/src/plugin_cache.cpp @@ -55,7 +55,7 @@ std::shared_ptr PluginCache::ie(const std::string &device // register template plugin if it is needed try { - std::string pluginName = "ov_template_plugin"; + std::string pluginName = "openvino_template_plugin"; pluginName += IE_BUILD_POSTFIX; ie_core->RegisterPlugin(pluginName, "TEMPLATE"); } catch (...) {} diff --git a/src/tests/unit/cpu/CMakeLists.txt b/src/tests/unit/cpu/CMakeLists.txt index e882ea611aa..e047ddfcb6f 100644 --- a/src/tests/unit/cpu/CMakeLists.txt +++ b/src/tests/unit/cpu/CMakeLists.txt @@ -5,15 +5,15 @@ set(TARGET_NAME cpuUnitTests) if(BUILD_SHARED_LIBS) - set (OBJ_LIB $) + set (OBJ_LIB $) endif() addIeTargetTest( NAME ${TARGET_NAME} ROOT ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES - $/src - $/src/nodes + $/src + $/src/nodes $ OBJECT_FILES ${OBJ_LIB} diff --git a/src/tests/unit/frontends/onnx_import/CMakeLists.txt b/src/tests/unit/frontends/onnx_import/CMakeLists.txt index 7c565516091..d1437d087a9 100644 --- a/src/tests/unit/frontends/onnx_import/CMakeLists.txt +++ b/src/tests/unit/frontends/onnx_import/CMakeLists.txt @@ -11,7 +11,7 @@ addIeTargetTest( gtest gtest_main commonTestUtils - ov_onnx_frontend + openvino_onnx_frontend openvino::util DEFINES ONNX_MODELS_DIR=\"${TEST_MODEL_ZOO}/onnx_import\" diff --git a/src/tests/unit/gna/CMakeLists.txt b/src/tests/unit/gna/CMakeLists.txt index 1122f885bb2..fc10f0bd6f3 100644 --- a/src/tests/unit/gna/CMakeLists.txt +++ b/src/tests/unit/gna/CMakeLists.txt @@ -18,7 +18,7 @@ addIeTargetTest( ngraphFunctions gmock commonTestUtils_s - ov_intel_gna_plugin_test_static + openvino_intel_gna_plugin_test_static engines_test_util ADD_CPPLINT LABELS diff --git a/src/tests_deprecated/behavior/shared_tests/CMakeLists.txt b/src/tests_deprecated/behavior/shared_tests/CMakeLists.txt index c75b5d5fb57..0845c94a8a6 100644 --- a/src/tests_deprecated/behavior/shared_tests/CMakeLists.txt +++ b/src/tests_deprecated/behavior/shared_tests/CMakeLists.txt @@ -8,14 +8,14 @@ file(GLOB_RECURSE SHARED_TESTS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) add_library(${TARGET_NAME} STATIC ${SHARED_TESTS_SRC}) -add_dependencies(${TARGET_NAME} inference_engine_preproc) +add_dependencies(${TARGET_NAME} openvino_gapi_preproc) if(ENABLE_AUTO OR ENABLE_MULTI) - add_dependencies(${TARGET_NAME} ov_auto_plugin) + add_dependencies(${TARGET_NAME} openvino_auto_plugin) endif() if(ENABLE_AUTO_BATCH) - add_dependencies(${TARGET_NAME} ov_auto_batch_plugin) + add_dependencies(${TARGET_NAME} openvino_auto_batch_plugin) endif() diff --git a/src/tests_deprecated/behavior/vpu/CMakeLists.txt b/src/tests_deprecated/behavior/vpu/CMakeLists.txt index e9f674b85ac..38461902ae3 100644 --- a/src/tests_deprecated/behavior/vpu/CMakeLists.txt +++ b/src/tests_deprecated/behavior/vpu/CMakeLists.txt @@ -77,5 +77,5 @@ endfunction(enable_vpu) if (ENABLE_INTEL_MYRIAD) set(MYRIAD_TARGET_NAME MyriadBehaviorTests) - enable_vpu(${MYRIAD_TARGET_NAME} USE_MYRIAD ov_intel_myriad_plugin) + enable_vpu(${MYRIAD_TARGET_NAME} USE_MYRIAD openvino_intel_myriad_plugin) endif() diff --git a/src/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp b/src/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp index a7058552727..9be20fdf2df 100644 --- a/src/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp +++ b/src/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp @@ -127,7 +127,7 @@ TEST_P(MYRIADWatchdog, canDisableWatchdog) { ASSERT_GE(startup_devices.unbooted, 1); auto ctime = Time::now(); - std::shared_ptr myriadPlg = ov::util::load_shared_object(make_plugin_name("ov_intel_myriad_plugin").c_str()); + std::shared_ptr myriadPlg = ov::util::load_shared_object(make_plugin_name("openvino_intel_myriad_plugin").c_str()); void *p = ov::util::get_symbol(myriadPlg, create_plugin_function); bootOneDevice(0, p); @@ -160,7 +160,7 @@ TEST_P(MYRIADWatchdog, canDetectWhenHostSiteStalled) { auto ctime = Time::now(); - std::shared_ptr myriadPlg = ov::util::load_shared_object(make_plugin_name("ov_intel_myriad_plugin").c_str()); + std::shared_ptr myriadPlg = ov::util::load_shared_object(make_plugin_name("openvino_intel_myriad_plugin").c_str()); void *p = ov::util::get_symbol(myriadPlg, create_plugin_function); bootOneDevice(20000, p); diff --git a/src/tests_deprecated/fluid_preproc/CMakeLists.txt b/src/tests_deprecated/fluid_preproc/CMakeLists.txt index 13b06665f61..a3a39e9faf6 100644 --- a/src/tests_deprecated/fluid_preproc/CMakeLists.txt +++ b/src/tests_deprecated/fluid_preproc/CMakeLists.txt @@ -21,10 +21,10 @@ target_include_directories(${TARGET} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/common" "${CMAKE_CURRENT_SOURCE_DIR}/cpu" $ - $) + $) target_compile_definitions(${TARGET} PRIVATE - $) + $) target_link_libraries(${TARGET} PRIVATE opencv_core opencv_imgproc openvino::util inference_engine fluid_test_computations gtest gtest_main) diff --git a/src/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt b/src/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt index 797a9271a85..ea21fdaa1db 100644 --- a/src/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt +++ b/src/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt @@ -17,6 +17,6 @@ endif() target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") -target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_preproc_s inference_engine fluid) +target_link_libraries(${TARGET_NAME} PRIVATE openvino_gapi_preproc_s inference_engine fluid) -add_dependencies(${TARGET_NAME} inference_engine_preproc) +add_dependencies(${TARGET_NAME} openvino_gapi_preproc) diff --git a/src/tests_deprecated/functional/gna/CMakeLists.txt b/src/tests_deprecated/functional/gna/CMakeLists.txt index 1ada97f1035..8bb274c4684 100644 --- a/src/tests_deprecated/functional/gna/CMakeLists.txt +++ b/src/tests_deprecated/functional/gna/CMakeLists.txt @@ -13,14 +13,14 @@ file(GLOB TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instance/single_layer_tests/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/backward_compatibility/*.cpp) -list(APPEND DEPENDENCIES ov_intel_gna_plugin) +list(APPEND DEPENDENCIES openvino_intel_gna_plugin) if(ENABLE_HETERO) - list(APPEND DEPENDENCIES ov_hetero_plugin) + list(APPEND DEPENDENCIES openvino_hetero_plugin) endif() if(ENABLE_INTEL_CPU) - list(APPEND DEPENDENCIES ov_intel_cpu_plugin) + list(APPEND DEPENDENCIES openvino_intel_cpu_plugin) endif() add_executable(${TARGET_NAME} ${TEST_SRC} ${TEST_INCLUDE}) diff --git a/src/tests_deprecated/functional/shared_tests/CMakeLists.txt b/src/tests_deprecated/functional/shared_tests/CMakeLists.txt index 0ceb1672976..f4534bb824b 100644 --- a/src/tests_deprecated/functional/shared_tests/CMakeLists.txt +++ b/src/tests_deprecated/functional/shared_tests/CMakeLists.txt @@ -19,14 +19,14 @@ file(GLOB SHARED_TESTS_SRC add_library(${TARGET_NAME} STATIC ${SHARED_TESTS_SRC}) -add_dependencies(${TARGET_NAME} inference_engine_preproc mock_engine) +add_dependencies(${TARGET_NAME} openvino_gapi_preproc mock_engine) if(ENABLE_AUTO OR ENABLE_MULTI) - add_dependencies(${TARGET_NAME} ov_auto_plugin) + add_dependencies(${TARGET_NAME} openvino_auto_plugin) endif() if(ENABLE_AUTO_BATCH) - add_dependencies(${TARGET_NAME} ov_auto_batch_plugin) + add_dependencies(${TARGET_NAME} openvino_auto_batch_plugin) endif() set_ie_threading_interface_for(${TARGET_NAME}) @@ -61,7 +61,7 @@ endif() target_link_libraries(${TARGET_NAME} PUBLIC ${SHARED_LIBRARIES}) if(ENABLE_HETERO) - add_dependencies(${TARGET_NAME} ov_hetero_plugin) + add_dependencies(${TARGET_NAME} openvino_hetero_plugin) endif() # developer package diff --git a/src/tests_deprecated/functional/vpu/CMakeLists.txt b/src/tests_deprecated/functional/vpu/CMakeLists.txt index 389a6c3da04..5d903b85052 100644 --- a/src/tests_deprecated/functional/vpu/CMakeLists.txt +++ b/src/tests_deprecated/functional/vpu/CMakeLists.txt @@ -6,9 +6,9 @@ set(VPU_DEPENDENCIES vpu_copy_firmware) if (ENABLE_INTEL_GPU) - list(APPEND VPU_DEPENDENCIES ov_intel_gpu_plugin) + list(APPEND VPU_DEPENDENCIES openvino_intel_gpu_plugin) if(ENABLE_HETERO) - list(APPEND VPU_DEPENDENCIES ov_hetero_plugin) + list(APPEND VPU_DEPENDENCIES openvino_hetero_plugin) endif() endif() @@ -72,7 +72,7 @@ addIeTargetTest( VPUCommonTests DEPENDENCIES ${VPU_DEPENDENCIES} - ov_intel_myriad_plugin + openvino_intel_myriad_plugin LABELS # Must be the last parameter. Reason: see description comment for addIeTargetTest(). VPU MYRIAD diff --git a/src/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp b/src/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp index 077af953d22..482c7eece02 100644 --- a/src/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp +++ b/src/tests_deprecated/functional/vpu/myriad_tests/vpu_tests_config.cpp @@ -10,7 +10,7 @@ namespace vpu { namespace tests { -const char* pluginName () { return "ov_intel_myriad_plugin"; } +const char* pluginName () { return "openvino_intel_myriad_plugin"; } const char* pluginNameShort () { return "myriad"; } const char* deviceName () { return "MYRIAD"; } bool deviceForceReset() { return true; } diff --git a/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt b/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt index afbf0a69d32..4e57735f37f 100644 --- a/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt +++ b/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt @@ -49,7 +49,7 @@ if(BUILD_SHARED_LIBS) target_link_libraries(${TARGET_NAME} PRIVATE inference_engine) else() # for static linkage the dependencies are in opposite order - target_link_libraries(ov_runtime PRIVATE ${TARGET_NAME}) + target_link_libraries(openvino PRIVATE ${TARGET_NAME}) endif() # code style diff --git a/src/tests_deprecated/unit/CMakeLists.txt b/src/tests_deprecated/unit/CMakeLists.txt index 8cd91399c09..080663eaece 100644 --- a/src/tests_deprecated/unit/CMakeLists.txt +++ b/src/tests_deprecated/unit/CMakeLists.txt @@ -28,7 +28,7 @@ if (ENABLE_INTEL_GNA AND BUILD_SHARED_LIBS) ) source_group("gna" FILES ${GNA_TESTS}) list(APPEND TEST_SRC ${GNA_TESTS}) - list(APPEND TEST_DEPS ov_intel_gna_plugin_test_static) + list(APPEND TEST_DEPS openvino_intel_gna_plugin_test_static) if(SUGGEST_OVERRIDE_SUPPORTED) set_source_files_properties(engines/gna/graph_tools/graph_copy_tests.cpp @@ -77,7 +77,7 @@ if (ENABLE_INTEL_MYRIAD) ) include_directories( engines/vpu/myriad_tests/helpers - $ + $ ${XLINK_INCLUDE} ${XLINK_PLATFORM_INCLUDE}) diff --git a/tests/conditional_compilation/test_cc.py b/tests/conditional_compilation/test_cc.py index 1e65547e085..b01bc7bdc3b 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", "ov_intel_cpu_plugin"] + libraries = ["openvino", "openvino_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/fuzz/README.md b/tests/fuzz/README.md index ad70db95d47..25daa44ef26 100644 --- a/tests/fuzz/README.md +++ b/tests/fuzz/README.md @@ -75,7 +75,7 @@ To build coverage report after fuzz test execution run: ``` llvm-profdata merge -sparse *.profraw -o default.profdata && \ -llvm-cov show ./read_network-fuzzer -object=lib/libov_runtime.so -instr-profile=default.profdata -format=html -output-dir=read_network-coverage +llvm-cov show ./read_network-fuzzer -object=lib/libopenvino.so -instr-profile=default.profdata -format=html -output-dir=read_network-coverage ``` ## Reproducing findings diff --git a/tests/utils/path_utils.py b/tests/utils/path_utils.py index 1cde97c3f4d..16bac654df7 100644 --- a/tests/utils/path_utils.py +++ b/tests/utils/path_utils.py @@ -36,12 +36,12 @@ def get_lib_path(lib_name): """Function for getting absolute path in OpenVINO directory to specific lib""" os_name = get_os_name() all_libs = { - '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')} + 'openvino_intel_cpu_plugin': { + 'Windows': Path('runtime/bin/intel64/Release/openvino_intel_cpu_plugin.dll'), + 'Linux': Path('runtime/lib/intel64/libopenvino_intel_cpu_plugin.so')}, + 'openvino': { + 'Windows': Path('runtime/bin/intel64/Release/openvino.dll'), + 'Linux': Path('runtime/lib/intel64/libopenvino.so')} } return all_libs[lib_name][os_name] diff --git a/tools/deployment_manager/configs/darwin.json b/tools/deployment_manager/configs/darwin.json index 117ad085d49..7f3ca2bd4e4 100644 --- a/tools/deployment_manager/configs/darwin.json +++ b/tools/deployment_manager/configs/darwin.json @@ -17,13 +17,14 @@ "group": ["ie"], "files": [ "runtime/lib/intel64/libov_runtime.dylib", - "runtime/lib/intel64/libinference_engine_preproc.so", - "runtime/lib/intel64/libinference_engine_c_api.dylib", - "runtime/lib/intel64/libov_hetero_plugin.so", - "runtime/lib/intel64/libov_auto_plugin.so", - "runtime/lib/intel64/libov_ir_frontend.dylib", - "runtime/lib/intel64/libov_onnx_frontend.dylib", - "runtime/lib/intel64/libov_paddle_frontend.dylib", + "runtime/lib/intel64/libopenvino_gapi_preproc.so", + "runtime/lib/intel64/libopenvino_c.dylib", + "runtime/lib/intel64/libopenvino_hetero_plugin.so", + "runtime/lib/intel64/libopenvino_auto_plugin.so", + "runtime/lib/intel64/libopenvino_auto_batch_plugin.so", + "runtime/lib/intel64/libopenvino_ir_frontend.dylib", + "runtime/lib/intel64/libopenvino_onnx_frontend.dylib", + "runtime/lib/intel64/libopenvino_paddle_frontend.dylib", "runtime/lib/intel64/plugins.xml", "runtime/3rdparty/tbb" ] @@ -33,7 +34,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/lib/intel64/libov_intel_cpu_plugin.so" + "runtime/lib/intel64/libopenvino_intel_cpu_plugin.so" ] }, "vpu": { @@ -41,7 +42,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/lib/intel64/libov_intel_myriad_plugin.so", + "runtime/lib/intel64/libopenvino_intel_myriad_plugin.so", "runtime/lib/intel64/usb-ma2x8x.mvcmd", "runtime/lib/intel64/pcie-ma2x8x.mvcmd" ] diff --git a/tools/deployment_manager/configs/linux.json b/tools/deployment_manager/configs/linux.json index 1c876664f4f..995fd0975ae 100644 --- a/tools/deployment_manager/configs/linux.json +++ b/tools/deployment_manager/configs/linux.json @@ -22,14 +22,15 @@ "ie_core": { "group": ["ie"], "files": [ - "runtime/lib/intel64/libov_runtime.so", - "runtime/lib/intel64/libinference_engine_preproc.so", - "runtime/lib/intel64/libinference_engine_c_api.so", - "runtime/lib/intel64/libov_hetero_plugin.so", - "runtime/lib/intel64/libov_auto_plugin.so", - "runtime/lib/intel64/libov_ir_frontend.so", - "runtime/lib/intel64/libov_onnx_frontend.so", - "runtime/lib/intel64/libov_paddle_frontend.so", + "runtime/lib/intel64/libopenvino.so", + "runtime/lib/intel64/libopenvino_gapi_preproc.so", + "runtime/lib/intel64/libopenvino_c.so", + "runtime/lib/intel64/libopenvino_hetero_plugin.so", + "runtime/lib/intel64/libopenvino_auto_plugin.so", + "runtime/lib/intel64/libopenvino_auto_batch_plugin.so", + "runtime/lib/intel64/libopenvino_ir_frontend.so", + "runtime/lib/intel64/libopenvino_onnx_frontend.so", + "runtime/lib/intel64/libopenvino_paddle_frontend.so", "runtime/lib/intel64/plugins.xml", "runtime/3rdparty/tbb" ] @@ -39,7 +40,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/lib/intel64/libov_intel_cpu_plugin.so" + "runtime/lib/intel64/libopenvino_intel_cpu_plugin.so" ] }, "gpu": { @@ -48,7 +49,7 @@ "dependencies" : ["ie_core"], "files": [ "runtime/lib/intel64/cache.json", - "runtime/lib/intel64/libov_intel_gpu_plugin.so", + "runtime/lib/intel64/libopenvino_intel_gpu_plugin.so", "install_dependencies/install_NEO_OCL_driver.sh" ] }, @@ -60,7 +61,7 @@ "runtime/3rdparty/97-myriad-usbboot.rules", "runtime/lib/intel64/usb-ma2x8x.mvcmd", "runtime/lib/intel64/pcie-ma2x8x.mvcmd", - "runtime/lib/intel64/libov_intel_myriad_plugin.so", + "runtime/lib/intel64/libopenvino_intel_myriad_plugin.so", "runtime/lib/intel64/vpu_custom_kernels", "install_dependencies/install_NCS_udev_rules.sh" ] @@ -73,7 +74,7 @@ "runtime/lib/intel64/libgna.so", "runtime/lib/intel64/libgna.so.2", "runtime/lib/intel64/libgna.so.3.0.0.1377", - "runtime/lib/intel64/libov_intel_gna_plugin.so" + "runtime/lib/intel64/libopenvino_intel_gna_plugin.so" ] }, "hddl": { @@ -81,7 +82,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/lib/intel64/libov_intel_hddl_plugin.so", + "runtime/lib/intel64/libopenvino_intel_hddl_plugin.so", "runtime/3rdparty/hddl" ] }, diff --git a/tools/deployment_manager/configs/windows.json b/tools/deployment_manager/configs/windows.json index 5d0027766eb..a50c75967ca 100644 --- a/tools/deployment_manager/configs/windows.json +++ b/tools/deployment_manager/configs/windows.json @@ -16,14 +16,15 @@ "ie_core": { "group": ["ie"], "files": [ - "runtime/bin/intel64/Release/ov_runtime.dll", - "runtime/bin/intel64/Release/inference_engine_preproc.dll", - "runtime/bin/intel64/Release/inference_engine_c_api.dll", - "runtime/bin/intel64/Release/ov_hetero_plugin.dll", - "runtime/bin/intel64/Release/ov_auto_plugin.dll", - "runtime/bin/intel64/Release/ov_ir_frontend.dll", - "runtime/bin/intel64/Release/ov_onnx_frontend.dll", - "runtime/bin/intel64/Release/ov_paddle_frontend.dll", + "runtime/bin/intel64/Release/openvino.dll", + "runtime/bin/intel64/Release/openvino_gapi_preproc.dll", + "runtime/bin/intel64/Release/openvino_c.dll", + "runtime/bin/intel64/Release/openvino_hetero_plugin.dll", + "runtime/bin/intel64/Release/openvino_auto_plugin.dll", + "runtime/bin/intel64/Release/openvino_auto_batch_plugin.dll", + "runtime/bin/intel64/Release/openvino_ir_frontend.dll", + "runtime/bin/intel64/Release/openvino_onnx_frontend.dll", + "runtime/bin/intel64/Release/openvino_paddle_frontend.dll", "runtime/bin/intel64/Release/plugins.xml", "runtime/3rdparty/tbb" ] @@ -33,7 +34,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/bin/intel64/Release/ov_intel_cpu_plugin.dll" + "runtime/bin/intel64/Release/openvino_intel_cpu_plugin.dll" ] }, "gpu": { @@ -42,7 +43,7 @@ "dependencies" : ["ie_core"], "files": [ "runtime/bin/intel64/Release/cache.json", - "runtime/bin/intel64/Release/ov_intel_gpu_plugin.dll" + "runtime/bin/intel64/Release/openvino_intel_gpu_plugin.dll" ] }, "vpu": { @@ -52,7 +53,7 @@ "files": [ "runtime/bin/intel64/Release/usb-ma2x8x.mvcmd", "runtime/bin/intel64/Release/pcie-ma2x8x.elf", - "runtime/bin/intel64/Release/ov_intel_myriad_plugin.dll" + "runtime/bin/intel64/Release/openvino_intel_myriad_plugin.dll" ] }, "gna": { @@ -61,7 +62,7 @@ "dependencies" : ["ie_core"], "files": [ "runtime/bin/intel64/Release/gna.dll", - "runtime/bin/intel64/Release/ov_intel_gna_plugin.dll" + "runtime/bin/intel64/Release/openvino_intel_gna_plugin.dll" ] }, "hddl": { @@ -69,7 +70,7 @@ "group": ["ie"], "dependencies" : ["ie_core"], "files": [ - "runtime/bin/intel64/Release/ov_intel_hddl_plugin.dll", + "runtime/bin/intel64/Release/openvino_intel_hddl_plugin.dll", "runtime/3rdparty/MovidiusDriver", "runtime/3rdparty/hddl" ] diff --git a/tools/mo/CMakeLists.txt b/tools/mo/CMakeLists.txt index 2403368e9b5..637c4211cee 100644 --- a/tools/mo/CMakeLists.txt +++ b/tools/mo/CMakeLists.txt @@ -4,10 +4,10 @@ if(NOT ENABLE_PYTHON) message(WARNING "Please enable IE & nGraph Python API (pyopenvino) targets to enable Model Optimizer target") else() - add_custom_target(model_optimizer DEPENDS ie_api ov_ir_frontend pyopenvino) + add_custom_target(model_optimizer DEPENDS ie_api openvino_ir_frontend pyopenvino) if(ENABLE_TESTS) - add_subdirectory(unit_tests/mock_mo_frontend/ov_mock_mo_frontend) - add_dependencies(model_optimizer ov_mock_mo_frontend) + add_subdirectory(unit_tests/mock_mo_frontend/mock_mo_frontend) + add_dependencies(model_optimizer openvino_mock_mo_frontend) add_subdirectory(unit_tests/mock_mo_frontend/mock_mo_python_api) add_dependencies(model_optimizer mock_mo_python_api) diff --git a/tools/mo/unit_tests/mo/frontend_ngraph_test_actual.py b/tools/mo/unit_tests/mo/frontend_ngraph_test_actual.py index c405e28910d..8653190f1b3 100644 --- a/tools/mo/unit_tests/mo/frontend_ngraph_test_actual.py +++ b/tools/mo/unit_tests/mo/frontend_ngraph_test_actual.py @@ -97,7 +97,7 @@ class TestMainFrontend(unittest.TestCase): def test_simple_convert(self, mock_argparse): f = io.StringIO() with redirect_stdout(f): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') out = f.getvalue() xml_file = re.search(r'\[ SUCCESS \] XML file: (.*)', out).\ @@ -112,7 +112,7 @@ class TestMainFrontend(unittest.TestCase): assert stat.supported == 0 # verify that meta info is added to XML file with open(xml_file) as file: - assert 'ov_mock_mo_frontend' in file.read() + assert 'openvino_mock_mo_frontend' in file.read() @mock_needed @patch('argparse.ArgumentParser.parse_args', @@ -137,14 +137,14 @@ class TestMainFrontend(unittest.TestCase): # verify that meta info is added to XML file with open(xml_file) as file: - assert 'ov_mock_mo_frontend' in file.read() + assert 'openvino_mock_mo_frontend' in file.read() @mock_needed @patch('argparse.ArgumentParser.parse_args', return_value=replaceArgsHelper(_input='newInput1,mock_input2')) def test_override_inputs(self, mock_argparse): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'override_all_inputs' was called @@ -156,7 +156,7 @@ class TestMainFrontend(unittest.TestCase): @patch('argparse.ArgumentParser.parse_args', return_value=replaceArgsHelper(output='newOut1,mock_output2')) def test_override_outputs(self, mock_argparse): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'override_all_outputs' was called @@ -169,7 +169,7 @@ class TestMainFrontend(unittest.TestCase): return_value=replaceArgsHelper(_input='newIn1,newIn2', output='newOut1,newOut2')) def test_extract_subgraph(self, mock_argparse): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'extract_subgraph' was called @@ -183,7 +183,7 @@ class TestMainFrontend(unittest.TestCase): output='new_output2,mock_output1')) def test_override_same_inputs(self, mock_argparse): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'override_all_outputs' was called @@ -198,7 +198,7 @@ class TestMainFrontend(unittest.TestCase): output='mock_output2,mock_output1')) def test_override_same_outputs(self, mock_argparse): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'override_all_inputs' was called @@ -213,7 +213,7 @@ class TestMainFrontend(unittest.TestCase): input_shape='[1,2,3,4]')) @pytest.mark.skip(reason="Unskip as 8301 will be merged") def test_input_shape(self, mock_argparse): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'set_partial_shape' was called @@ -225,7 +225,7 @@ class TestMainFrontend(unittest.TestCase): return_value=replaceArgsHelper(_input='newIn1{i8}')) @pytest.mark.skip(reason="Unskip as 8301 will be merged") def test_element_type(self, mock_argparse): - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'set_element_type' was called @@ -238,7 +238,7 @@ class TestMainFrontend(unittest.TestCase): @pytest.mark.skip(reason="Unskip as 8301 will be merged") def test_set_batch_size(self, mock_argparse): mock_return_partial_shape(PartialShape([-1, 2, 3, 4])) - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() # verify that 'set_element_type' was called @@ -255,7 +255,7 @@ class TestMainFrontend(unittest.TestCase): # so MO shall not convert anything and produce specified error mock_return_partial_shape(PartialShape([122, 2, 3, 4])) with self.assertLogs() as logger: - main(argparse.ArgumentParser(), fem, 'ov_mock_mo_frontend') + main(argparse.ArgumentParser(), fem, 'openvino_mock_mo_frontend') stat = get_model_statistic() diff --git a/tools/mo/unit_tests/mo/moc_frontend/moc_extractor_test_actual.py b/tools/mo/unit_tests/mo/moc_frontend/moc_extractor_test_actual.py index b917b97df82..0b2761043ef 100644 --- a/tools/mo/unit_tests/mo/moc_frontend/moc_extractor_test_actual.py +++ b/tools/mo/unit_tests/mo/moc_frontend/moc_extractor_test_actual.py @@ -42,7 +42,7 @@ class TestMainFrontend(unittest.TestCase): clear_place_statistic() clear_setup() set_max_port_counts(10, 10) - self.fe = fem.load_by_framework('ov_mock_mo_frontend') + self.fe = fem.load_by_framework('openvino_mock_mo_frontend') self.model = self.fe.load('abc.bin') # Mock model has 'tensor' tensor place diff --git a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt similarity index 89% rename from tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt rename to tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt index 43c6f1d0d73..de5bddb0132 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_FE_NAME "ov_mock_mo_frontend") +set(TARGET_FE_NAME "openvino_mock_mo_frontend") file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) @@ -13,7 +13,7 @@ source_group("include" FILES ${LIBRARY_HEADERS}) # Create shared library add_library(${TARGET_FE_NAME} SHARED ${LIBRARY_SRC} ${LIBRARY_HEADERS}) -target_include_directories(${TARGET_FE_NAME} PRIVATE ".") +target_include_directories(${TARGET_FE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(${TARGET_FE_NAME} PUBLIC openvino::runtime PRIVATE ngraph::builder) diff --git a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/mock_mo_frontend.cpp b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/mock_mo_frontend.cpp similarity index 95% rename from tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/mock_mo_frontend.cpp rename to tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/mock_mo_frontend.cpp index 547d201584b..8c681f0d94f 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/mock_mo_frontend.cpp +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/mock_mo_frontend.cpp @@ -29,7 +29,7 @@ extern "C" MOCK_API FrontEndVersion GetAPIVersion() extern "C" MOCK_API void* GetFrontEndData() { FrontEndPluginInfo* res = new FrontEndPluginInfo(); - res->m_name = "ov_mock_mo_frontend"; + res->m_name = "openvino_mock_mo_frontend"; res->m_creator = []() { return std::make_shared(); }; return res; diff --git a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/mock_mo_frontend.hpp b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/mock_mo_frontend.hpp similarity index 99% rename from tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/mock_mo_frontend.hpp rename to tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/mock_mo_frontend.hpp index 55732dfa25f..17d3e9ffe89 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/ov_mock_mo_frontend/mock_mo_frontend.hpp +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/mock_mo_frontend.hpp @@ -9,11 +9,11 @@ #include "openvino/frontend/visibility.hpp" // Defined if we are building the plugin DLL (instead of using it) -#ifdef ov_mock_mo_frontend_EXPORTS +#ifdef openvino_mock_mo_frontend_EXPORTS #define MOCK_API OPENVINO_CORE_EXPORTS #else #define MOCK_API OPENVINO_CORE_IMPORTS -#endif // ov_mock_mo_frontend_EXPORTS +#endif // openvino_mock_mo_frontend_EXPORTS // OK to have 'using' in mock header @@ -453,6 +453,6 @@ private: std::string get_name() const override { m_stat.m_get_name++; - return "ov_mock_mo_frontend"; + return "openvino_mock_mo_frontend"; } }; diff --git a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt index 9e0525ecdda..8636e278e5f 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt @@ -21,7 +21,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}) set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}) set(CMAKE_PDB_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}) -set(TARGET_FE_NAME "ov_mock_mo_frontend") +set(TARGET_FE_NAME "openvino_mock_mo_frontend") set(PYBIND_FE_NAME "mock_mo_python_api") set(PYBIND_FE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/mock_mo_python_api.cpp) diff --git a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/mock_mo_python_api.cpp b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/mock_mo_python_api.cpp index 10cf7ad2236..129da0ef6bd 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/mock_mo_python_api.cpp +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/mock_mo_python_api.cpp @@ -5,7 +5,7 @@ #include #include -#include "../ov_mock_mo_frontend/mock_mo_frontend.hpp" +#include "../mock_mo_frontend/mock_mo_frontend.hpp" namespace py = pybind11; using namespace ngraph;