[GPU] Renamed GPU plugin to ov_intel_gpu_plugin (#8957)

2021-12-02 11:06:00 +03:00
1 parent 85f5528cad
commit 0f667b90ff
@@ -8,9 +8,9 @@ After you have used the Model Optimizer to create an Intermediate Representation

 Inference Engine is a set of C++ libraries providing a common API to deliver inference solutions on the platform of your choice: CPU, GPU, or VPU. Use the Inference Engine API to read the Intermediate Representation, set the input and output formats, and execute the model on devices. While the C++ libraries is the primary implementation, C libraries and Python bindings are also available.

-For Intel® Distribution of OpenVINO™ toolkit, Inference Engine binaries are delivered within release packages. 
+For Intel® Distribution of OpenVINO™ toolkit, Inference Engine binaries are delivered within release packages.

-The open source version is available in the [OpenVINO™ toolkit GitHub repository](https://github.com/openvinotoolkit/openvino) and can be built for supported platforms using the <a href="https://github.com/openvinotoolkit/openvino/wiki/BuildingCode">Inference Engine Build Instructions</a>.    
+The open source version is available in the [OpenVINO™ toolkit GitHub repository](https://github.com/openvinotoolkit/openvino) and can be built for supported platforms using the <a href="https://github.com/openvinotoolkit/openvino/wiki/BuildingCode">Inference Engine Build Instructions</a>.

 To learn about how to use the Inference Engine API for your application, see the [Integrating Inference Engine in Your Application](Integrate_with_customer_application_new_API.md) documentation.

@@ -66,7 +66,7 @@ The table below shows the plugin libraries and additional dependencies for Linux
 | Plugin | Library name for Linux      | Dependency libraries for Linux                              | Library name for Windows | Dependency libraries for Windows                                                                       | Library name for macOS       | Dependency libraries for macOS              |
 |--------|-----------------------------|-------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------------------------------|------------------------------|---------------------------------------------|
 | CPU    | `libMKLDNNPlugin.so`        | `libinference_engine_lp_transformations.so`                 | `MKLDNNPlugin.dll`       | `inference_engine_lp_transformations.dll`                                                              | `libMKLDNNPlugin.so`      | `inference_engine_lp_transformations.dylib` |
-| GPU    | `libclDNNPlugin.so`         | `libinference_engine_lp_transformations.so`, `libOpenCL.so` | `clDNNPlugin.dll`        | `OpenCL.dll`, `inference_engine_lp_transformations.dll`                                                |  Is not supported            |  -                                          |
+| GPU    | `libov_intel_gpu_plugin.so`         | `libinference_engine_lp_transformations.so`, `libOpenCL.so` | `ov_intel_gpu_plugin.dll`        | `OpenCL.dll`, `inference_engine_lp_transformations.dll`                                                |  Is not supported            |  -                                          |
 | MYRIAD | `libmyriadPlugin.so`        | `libusb.so`,                                                | `myriadPlugin.dll`       | `usb.dll`                                                                                              | `libmyriadPlugin.so`      | `libusb.dylib`                              |
 | HDDL   | `libHDDLPlugin.so`          | `libbsl.so`, `libhddlapi.so`, `libmvnc-hddl.so`             | `HDDLPlugin.dll`         | `bsl.dll`, `hddlapi.dll`, `json-c.dll`, `libcrypto-1_1-x64.dll`, `libssl-1_1-x64.dll`, `mvnc-hddl.dll` |  Is not supported            |  -                                          |
 | GNA    | `libGNAPlugin.so`           | `libgna.so`,                                                | `GNAPlugin.dll`          | `gna.dll`                                                                                              |  Is not supported            |  -                                          |
@@ -11,9 +11,9 @@ After you have used the Model Optimizer to create an Intermediate Representation

 Inference Engine is a set of C++ libraries providing a common API to deliver inference solutions on the platform of your choice: CPU, GPU, or VPU. Use the Inference Engine API to read the Intermediate Representation, set the input and output formats, and execute the model on devices. While the C++ libraries is the primary implementation, C libraries and Python bindings are also available.

-For Intel® Distribution of OpenVINO™ toolkit, Inference Engine binaries are delivered within release packages. 
+For Intel® Distribution of OpenVINO™ toolkit, Inference Engine binaries are delivered within release packages.

-The open source version is available in the [OpenVINO™ toolkit GitHub repository](https://github.com/openvinotoolkit/openvino) and can be built for supported platforms using the <a href="https://github.com/openvinotoolkit/openvino/wiki/BuildingCode">Inference Engine Build Instructions</a>.    
+The open source version is available in the [OpenVINO™ toolkit GitHub repository](https://github.com/openvinotoolkit/openvino) and can be built for supported platforms using the <a href="https://github.com/openvinotoolkit/openvino/wiki/BuildingCode">Inference Engine Build Instructions</a>.

 To learn about how to use the Inference Engine API for your application, see the [Integrating Inference Engine in Your Application](Integrate_with_customer_application_new_API.md) documentation.

@@ -71,7 +71,7 @@ The table below shows the plugin libraries and additional dependencies for Linux
 | Plugin | Library name for Linux      | Dependency libraries for Linux                              | Library name for Windows | Dependency libraries for Windows                                                                       | Library name for macOS       | Dependency libraries for macOS              |
 |--------|-----------------------------|-------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------------------------------|------------------------------|---------------------------------------------|
 | CPU    | `libMKLDNNPlugin.so`        | `libinference_engine_lp_transformations.so`                 | `MKLDNNPlugin.dll`       | `inference_engine_lp_transformations.dll`                                                              | `libMKLDNNPlugin.so`      | `inference_engine_lp_transformations.dylib` |
-| GPU    | `libclDNNPlugin.so`         | `libinference_engine_lp_transformations.so`, `libOpenCL.so` | `clDNNPlugin.dll`        | `OpenCL.dll`, `inference_engine_lp_transformations.dll`                                                |  Is not supported            |  -                                          |
+| GPU    | `libov_intel_gpu_plugin.so`         | `libinference_engine_lp_transformations.so`, `libOpenCL.so` | `ov_intel_gpu_plugin.dll`        | `OpenCL.dll`, `inference_engine_lp_transformations.dll`                                                |  Is not supported            |  -                                          |
 | MYRIAD | `libmyriadPlugin.so`        | `libusb.so`,                                                | `myriadPlugin.dll`       | `usb.dll`                                                                                              | `libmyriadPlugin.so`      | `libusb.dylib`                              |
 | HDDL   | `libHDDLPlugin.so`          | `libbsl.so`, `libhddlapi.so`, `libmvnc-hddl.so`             | `HDDLPlugin.dll`         | `bsl.dll`, `hddlapi.dll`, `json-c.dll`, `libcrypto-1_1-x64.dll`, `libssl-1_1-x64.dll`, `mvnc-hddl.dll` |  Is not supported            |  -                                          |
 | GNA    | `libGNAPlugin.so`           | `libgna.so`,                                                | `GNAPlugin.dll`          | `gna.dll`                                                                                              |  Is not supported            |  -                                          |
@@ -22,7 +22,7 @@ inline const std::string getPluginLibNameByDevice(const std::string& deviceName)
            { "AUTO", "MultiDevicePlugin" },
            { "CPU", "MKLDNNPlugin" },
            { "GNA", "GNAPlugin" },
-            { "GPU", "clDNNPlugin" },
+            { "GPU", "ov_intel_gpu_plugin" },
            { "HETERO", "ov_hetero_plugin" },
            { "MULTI", "MultiDevicePlugin" },
            { "MYRIAD", "myriadPlugin" },
@@ -12,7 +12,7 @@ addIeTargetTest(
        INCLUDES
            ${CMAKE_CURRENT_SOURCE_DIR}
        DEPENDENCIES
-            clDNNPlugin
+            ov_intel_gpu_plugin
        LINK_LIBRARIES
            funcSharedTests
            OpenCL
@@ -20,7 +20,7 @@ namespace {

 INSTANTIATE_TEST_SUITE_P(nightly_OVClassCommon,
        OVClassBasicTestP,
-        ::testing::Values(std::make_pair("clDNNPlugin", "GPU")));
+        ::testing::Values(std::make_pair("ov_intel_gpu_plugin", "GPU")));

 INSTANTIATE_TEST_SUITE_P(nightly_OVClassNetworkTestP, OVClassNetworkTestP, ::testing::Values("GPU"));

@@ -193,4 +193,4 @@ INSTANTIATE_TEST_SUITE_P(
        nightly_OVClassSetGlobalConfigTest, OVClassSetGlobalConfigTest,
        ::testing::Values("GPU")
 );
-}  // namespace
+}  // namespace
@@ -21,7 +21,7 @@ namespace {

 INSTANTIATE_TEST_SUITE_P(
        nightly_IEClassCommon, IEClassBasicTestP,
-        ::testing::Values(std::make_pair("clDNNPlugin", "GPU"))
+        ::testing::Values(std::make_pair("ov_intel_gpu_plugin", "GPU"))
 );

 INSTANTIATE_TEST_SUITE_P(
@@ -6,7 +6,7 @@ set(VPU_DEPENDENCIES
    vpu_copy_firmware)

 if (ENABLE_INTEL_GPU)
-    list(APPEND VPU_DEPENDENCIES clDNNPlugin)
+    list(APPEND VPU_DEPENDENCIES ov_intel_gpu_plugin)
    if(ENABLE_HETERO)
        list(APPEND VPU_DEPENDENCIES ov_hetero_plugin)
    endif()
@@ -31,7 +31,7 @@ if(ENABLE_MKL_DNN)
 endif()

 if(ENABLE_INTEL_GPU)
-    add_dependencies(${TARGET_NAME} clDNNPlugin)
+    add_dependencies(${TARGET_NAME} ov_intel_gpu_plugin)
 endif()

 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -461,7 +461,7 @@ if (ENABLE_INTEL_GPU AND NGRAPH_UNIT_TEST_BACKENDS_ENABLE)
    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 clDNNPlugin)
+        list(APPEND UNIT_TESTS_DEPENDENCIES ov_intel_gpu_plugin)
    endif()
 endif()

@@ -200,7 +200,7 @@ endif()
 target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_API)

 ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
-                    POSSIBLE_PLUGINS MultiDevicePlugin ov_hetero_plugin clDNNPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
+                    POSSIBLE_PLUGINS MultiDevicePlugin ov_hetero_plugin ov_intel_gpu_plugin GNAPlugin MKLDNNPlugin myriadPlugin)

 ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #

-set (TARGET_NAME "clDNNPlugin")
+set (TARGET_NAME "ov_intel_gpu_plugin")

 if(CMAKE_COMPILER_IS_GNUCXX)
    ie_add_compiler_flags(-Wno-all)
@@ -52,7 +52,7 @@
      "dependencies" : ["ie_core"],
      "files": [
        "runtime/lib/intel64/cache.json",
-        "runtime/lib/intel64/libclDNNPlugin.so",
+        "runtime/lib/intel64/libov_intel_gpu_plugin.so",
        "runtime/lib/intel64/libinference_engine_lp_transformations.so",
        "install_dependencies/install_NEO_OCL_driver.sh"
      ]
@@ -47,7 +47,7 @@
      "files": [
        "runtime/bin/intel64/Release/cache.json",
        "runtime/bin/intel64/Release/inference_engine_lp_transformations.dll",
-        "runtime/bin/intel64/Release/clDNNPlugin.dll"
+        "runtime/bin/intel64/Release/ov_intel_gpu_plugin.dll"
      ]
    },
    "vpu": {