Renamed ov_runtime => openvino, ov_ => openvino_ prefix (openvinotool…

…kit#10069)

* Renamed ov_runtime => openvino, ov_ => openvino_ prefix

* Coverage fix

* More fixes

* Fixed MO tests with custom FE

.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

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()
 

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")

cmake/developer_package/plugins/plugins.cmake

@@ -102,31 +102,32 @@ 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 inference_engine_ir_v7_reader)
-                add_dependencies(${IE_PLUGIN_NAME} inference_engine_ir_v7_reader)
+            if(TARGET openvino_onnx_frontend)
+                add_dependencies(${IE_PLUGIN_NAME} openvino_onnx_frontend)
             endif()
-            if(TARGET ov_onnx_frontend)
-                add_dependencies(${IE_PLUGIN_NAME} ov_onnx_frontend)
+            if(TARGET openvino_paddle_frontend)
+                add_dependencies(${IE_PLUGIN_NAME} openvino_paddle_frontend)
             endif()
-            if(TARGET ov_paddle_frontend)
-                add_dependencies(${IE_PLUGIN_NAME} ov_paddle_frontend)
+            if(TARGET openvino_tensorflow_frontend)
+                add_dependencies(${IE_PLUGIN_NAME} openvino_tensorflow_frontend)
             endif()
-            if(TARGET ov_tensorflow_frontend)
-                add_dependencies(${IE_PLUGIN_NAME} ov_tensorflow_frontend)
+            # 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()
         endif()
 
@@ -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()

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()
 

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")
 

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)

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}

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:

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
 

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

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)

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)
 

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)

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]

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)

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,