[GNA] Renamed plugin and moved it to new place (openvinotoolkit#8944)

* Renamed plugin

* Changed plugin source dir

* Fixed tests

* Renamed ENABLE_GNA to ENABLE_INTEL_GNA

* Fixed centos compile error

* One more renaming place

* HF for centos 7

* renamed the name in version api

* Fixed CI configurations

* Disabled GNA plugin for old gcc (<=5.4)

* Fixed Azure Win job

.ci/azure/linux.yml

@@ -88,7 +88,7 @@ jobs:
       rm -rf $(BUILD_SAMPLES_DIR) ; mkdir $(BUILD_SAMPLES_DIR)
       sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR)
       sudo mkdir -p $(SHARE_DIR)
-      sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common
+      sudo apt --assume-yes install nfs-common
       sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(SHARE_DIR) -o vers=4,minorversion=1,sec=sys
       mkdir -p $(CCACHE_DIR)
     displayName: 'Make dir'
@@ -147,7 +147,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DENABLE_PYTHON=ON
         -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS)
-        -DENABLE_GNA=$(CMAKE_BUILD_SHARED_LIBS)
+        -DENABLE_INTEL_GNA=$(CMAKE_BUILD_SHARED_LIBS)
         -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS)
         -DPYTHON_EXECUTABLE=/usr/bin/python3.8
         -DENABLE_WHEEL=ON

.ci/azure/linux_onnxruntime.yml

@@ -93,7 +93,7 @@ jobs:
         -DENABLE_PYTHON=ON
         -DPYTHON_EXECUTABLE=/usr/bin/python3.8
         -DENABLE_VPU=OFF
-        -DENABLE_GNA=OFF
+        -DENABLE_INTEL_GNA=OFF
         -DENABLE_OPENCV=OFF
         -DENABLE_CPPLINT=OFF
         -DENABLE_TESTS=OFF

.ci/azure/windows.yml

@@ -132,7 +132,7 @@ jobs:
 
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -G "Ninja Multi-Config" -DENABLE_ONEDNN_FOR_GPU=OFF -DENABLE_GNA=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_INTEL_GPU=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_GAPI_PREPROCESSING=$(CMAKE_BUILD_SHARED_LIBS) -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_REQUIREMENTS_INSTALL=OFF -DENABLE_FASTER_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DPYTHON_INCLUDE_DIR="C:\hostedtoolcache\windows\Python\3.7.6\x64\include" -DPYTHON_LIBRARY="C:\hostedtoolcache\windows\Python\3.7.6\x64\libs\python37.lib" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)
+      call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -G "Ninja Multi-Config" -DENABLE_ONEDNN_FOR_GPU=OFF -DENABLE_INTEL_GNA=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_INTEL_GPU=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_GAPI_PREPROCESSING=$(CMAKE_BUILD_SHARED_LIBS) -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_REQUIREMENTS_INSTALL=OFF -DENABLE_FASTER_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DPYTHON_INCLUDE_DIR="C:\hostedtoolcache\windows\Python\3.7.6\x64\include" -DPYTHON_LIBRARY="C:\hostedtoolcache\windows\Python\3.7.6\x64\libs\python37.lib" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 

.ci/openvino-onnx/Dockerfile

@@ -56,7 +56,7 @@ WORKDIR /openvino/build
 RUN cmake .. \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DENABLE_VPU=OFF \
-    -DENABLE_GNA=OFF \
+    -DENABLE_INTEL_GNA=OFF \
     -DENABLE_OPENCV=OFF \
     -DENABLE_CPPLINT=OFF \
     -DENABLE_TESTS=OFF \

CODEOWNERS

@@ -49,7 +49,7 @@ azure-pipelines.yml  @openvinotoolkit/openvino-admins
 /inference-engine/scripts/run_tests_myriad_multistick.sh  @openvinotoolkit/openvino-ie-vpu-maintainers
 
 # IE GNA:
-/inference-engine/src/gna_plugin/  @openvinotoolkit/openvino-ie-gna-maintainers
+/src/plugins/intel_gna/  @openvinotoolkit/openvino-ie-gna-maintainers
 /src/inference/include/ie/gna/  @openvinotoolkit/openvino-ie-gna-maintainers
 
 # IE MULTI:

cmake/coverage.cmake

@@ -72,10 +72,10 @@ if (ENABLE_INTEL_GPU)
                         PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
 endif()
 
-if(ENABLE_GNA)
-    ie_coverage_extract(INPUT "openvino" OUTPUT "gna_plugin"
-                        PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/inference-engine/src/gna_plugin/*")
-    ie_coverage_genhtml(INFO_FILE "gna_plugin"
+if(ENABLE_INTEL_GNA)
+    ie_coverage_extract(INPUT "openvino" OUTPUT "ov_intel_gna_plugin"
+                        PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/plugins/intel_gna/*")
+    ie_coverage_genhtml(INFO_FILE "ov_intel_gna_plugin"
                         PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
 endif()
 

cmake/dependencies.cmake

@@ -84,10 +84,10 @@ if(THREADING STREQUAL "OMP")
     endif()
     update_deps_cache(OMP "${OMP}" "Path to OMP root folder")
     debug_message(STATUS "intel_omp=" ${OMP})
-    
+
     ie_cpack_add_component(omp REQUIRED)
     file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
-    install(FILES ${source_list} 
+    install(FILES ${source_list}
             DESTINATION "runtime/3rdparty/omp/lib"
             COMPONENT omp)
 endif()
@@ -267,7 +267,7 @@ endif()
 
 include(${OpenVINO_SOURCE_DIR}/cmake/ie_parallel.cmake)
 
-if(ENABLE_GNA)
+if(ENABLE_INTEL_GNA)
     reset_deps_cache(
             GNA
             GNA_PLATFORM_DIR
@@ -297,7 +297,7 @@ if(ENABLE_GNA)
         else()
             LIST(APPEND FILES_TO_EXTRACT_LIST gna_${GNA_VERSION}/linux)
         endif()
-     
+
         RESOLVE_DEPENDENCY(GNA
                 ARCHIVE_UNIFIED "GNA/GNA_${GNA_VERSION}.zip"
                 TARGET_PATH "${TEMP}/gna_${GNA_VERSION}"

cmake/features.cmake

@@ -59,8 +59,6 @@ cmake_dependent_option (ENABLE_WHEEL "Build wheel packages for PyPi" OFF
 # Inference Engine specific options
 #
 
-ie_dependent_option (ENABLE_GNA "GNA support for inference engine" ON "NOT APPLE;NOT ANDROID;X86_64" OFF)
-
 # "MKL-DNN library based on OMP or TBB or Sequential implementation: TBB|OMP|SEQ"
 if(X86 OR ARM OR (MSVC AND (ARM OR AARCH64)) )
     set(THREADING_DEFAULT "SEQ")
@@ -86,7 +84,10 @@ endif()
 
 ie_dependent_option (ENABLE_TBBBIND_2_5 "Enable TBBBind_2_5 static usage in OpenVINO runtime" ON "ENABLE_TBBBIND_2_5_DEFAULT" OFF)
 
-if (ENABLE_GNA)
+ie_dependent_option (ENABLE_INTEL_GNA "GNA support for inference engine" ON
+    "NOT APPLE;NOT ANDROID;X86_64;CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.4" OFF)
+
+if (ENABLE_INTEL_GNA)
     if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.4)
         set (DEFAULT_GNA_LIB GNA1)
     else()
@@ -210,8 +211,8 @@ if (ENABLE_MKL_DNN)
     add_definitions(-DENABLE_MKL_DNN=1)
 endif()
 
-if (ENABLE_GNA)
-    add_definitions(-DENABLE_GNA)
+if (ENABLE_INTEL_GNA)
+    add_definitions(-DENABLE_INTEL_GNA)
 
     if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.4)
         message(WARNING "${GNA_LIBRARY_VERSION} is not supported on GCC version ${CMAKE_CXX_COMPILER_VERSION}. Fallback to GNA1")

docs/IE_DG/Deep_Learning_Inference_Engine_DevGuide.md

@@ -69,7 +69,7 @@ The table below shows the plugin libraries and additional dependencies for Linux
 | 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            |  -                                          |
+| 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               |

docs/IE_DG/inference_engine_intro.md

@@ -74,7 +74,7 @@ The table below shows the plugin libraries and additional dependencies for Linux
 | 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            |  -                                          |
+| 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               |

inference-engine/src/CMakeLists.txt

@@ -17,6 +17,3 @@ if(ENABLE_VPU)
     add_subdirectory(vpu)
 endif()
 
-if(ENABLE_GNA)
-    add_subdirectory(gna_plugin)
-endif()

inference-engine/tests/functional/plugin/CMakeLists.txt

@@ -12,7 +12,7 @@ if (ENABLE_INTEL_GPU)
     add_subdirectory(gpu)
 endif()
 
-if (ENABLE_GNA)
+if (ENABLE_INTEL_GNA)
     add_subdirectory(gna)
 endif()
 

inference-engine/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp

@@ -21,7 +21,7 @@ inline const std::string getPluginLibNameByDevice(const std::string& deviceName)
             { "VPUX", "VPUXPlugin" },
             { "AUTO", "ov_auto_plugin" },
             { "CPU", "MKLDNNPlugin" },
-            { "GNA", "GNAPlugin" },
+            { "GNA", "ov_intel_gna_plugin" },
             { "GPU", "ov_intel_gpu_plugin" },
             { "HETERO", "ov_hetero_plugin" },
             { "MULTI", "ov_multi_plugin" },

inference-engine/tests/functional/plugin/gna/CMakeLists.txt

@@ -8,7 +8,7 @@ addIeTargetTest(
         NAME ${TARGET_NAME}
         ROOT ${CMAKE_CURRENT_SOURCE_DIR}
         DEPENDENCIES
-            GNAPlugin
+            ov_intel_gna_plugin
         LINK_LIBRARIES
             funcSharedTests
         ADD_CPPLINT

inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/ov_plugin/core_intergration.cpp

@@ -16,7 +16,7 @@ namespace {
 
 INSTANTIATE_TEST_SUITE_P(nightly_OVClassBasicTestP,
         OVClassBasicTestP,
-        ::testing::Values(std::make_pair("GNAPlugin", "GNA")));
+        ::testing::Values(std::make_pair("ov_intel_gna_plugin", "GNA")));
 
 // TODO
 INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_OVClassNetworkTestP, OVClassNetworkTestP, ::testing::Values("GNA"));

inference-engine/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("GNAPlugin", "GNA")));
+        ::testing::Values(std::make_pair("ov_intel_gna_plugin", "GNA")));
 
 // TODO
 INSTANTIATE_TEST_SUITE_P(

inference-engine/tests/unit/CMakeLists.txt

@@ -16,7 +16,7 @@ if (ENABLE_MKL_DNN)
     add_subdirectory(cpu)
 endif ()
 
-if (ENABLE_GNA)
+if (ENABLE_INTEL_GNA)
     add_subdirectory(gna)
 endif ()
 

inference-engine/tests/unit/gna/CMakeLists.txt

@@ -18,7 +18,7 @@ addIeTargetTest(
                 ngraphFunctions
             gmock
             commonTestUtils_s
-            GNAPlugin_test_static
+            ov_intel_gna_plugin_test_static
             engines_test_util
         ADD_CPPLINT
         LABELS

inference-engine/tests_deprecated/functional/CMakeLists.txt

@@ -10,6 +10,6 @@ if (ENABLE_MYRIAD)
     add_subdirectory(vpu)
 endif()
 
-if (ENABLE_GNA)
+if (ENABLE_INTEL_GNA)
     add_subdirectory(gna)
 endif()

inference-engine/tests_deprecated/functional/gna/CMakeLists.txt

@@ -13,7 +13,7 @@ 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 GNAPlugin)
+list(APPEND DEPENDENCIES ov_intel_gna_plugin)
 
 if(ENABLE_HETERO)
     list(APPEND DEPENDENCIES ov_hetero_plugin)

inference-engine/tests_deprecated/unit/CMakeLists.txt

@@ -19,7 +19,7 @@ file(GLOB
         )
 
 # TODO: fix CVS-71010 and remove BUILD_SHARED_LIBS
-if (ENABLE_GNA AND BUILD_SHARED_LIBS)
+if (ENABLE_INTEL_GNA AND BUILD_SHARED_LIBS)
     file(GLOB
             GNA_TESTS
             engines/gna/*cpp
@@ -28,7 +28,7 @@ if (ENABLE_GNA AND BUILD_SHARED_LIBS)
             )
     source_group("gna" FILES ${GNA_TESTS})
     list(APPEND TEST_SRC ${GNA_TESTS})
-    list(APPEND TEST_DEPS GNAPlugin_test_static)
+    list(APPEND TEST_DEPS ov_intel_gna_plugin_test_static)
 
     if(SUGGEST_OVERRIDE_SUPPORTED)
         set_source_files_properties(engines/gna/graph_tools/graph_copy_tests.cpp

inference-engine/tests_deprecated/unit/engines/gna/graph_tools/graph_copy_tests.cpp

@@ -13,7 +13,7 @@
 #include "graph_test_base.hpp"
 #include <memory>
 
-#ifdef ENABLE_GNA
+#ifdef ENABLE_INTEL_GNA
 # include <frontend/model_quantizer.hpp>
 #endif
 
@@ -95,7 +95,7 @@ TEST_F(GraphCopyTests, canPreserveAttributes) {
     ASSERT_STREQ(idMemInput.c_str(), "r-1-2-3");
 }
 
-#ifdef ENABLE_GNA
+#ifdef ENABLE_INTEL_GNA
 using namespace GNAPluginNS;
 struct _FP32_2_FP32  : public GNAPluginNS::frontend::QuantDescTmpl<float, float, float, float, float> {
 };

src/inference/CMakeLists.txt

@@ -200,7 +200,7 @@ endif()
 target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_API)
 
 ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
-                    POSSIBLE_PLUGINS ov_auto_plugin ov_hetero_plugin ov_intel_gpu_plugin GNAPlugin MKLDNNPlugin myriadPlugin)
+                    POSSIBLE_PLUGINS ov_auto_plugin ov_hetero_plugin ov_intel_gpu_plugin ov_intel_gna_plugin MKLDNNPlugin myriadPlugin)
 
 ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
 

src/plugins/CMakeLists.txt

@@ -10,6 +10,10 @@ if(ENABLE_INTEL_GPU)
     add_subdirectory(intel_gpu)
 endif()
 
+if(ENABLE_INTEL_GNA)
+    add_subdirectory(intel_gna)
+endif()
+
 if(ENABLE_AUTO OR ENABLE_MULTI)
     add_subdirectory(auto)
 endif()

inference-engine/src/gna_plugin/CMakeLists.txt → src/plugins/intel_gna/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(TARGET_NAME "GNAPlugin")
+set(TARGET_NAME "ov_intel_gna_plugin")
 
 if(CMAKE_COMPILER_IS_GNUCC)
     ie_add_compiler_flags(-Wno-all)

inference-engine/src/gna_plugin/frontend/scale_factor_calc.hpp → src/plugins/intel_gna/frontend/scale_factor_calc.hpp

@@ -9,7 +9,7 @@
 #include <utility>
 #include <limits>
 #include <string>
-#include <map>
+#include <tuple>
 
 #include <legacy/ie_layers.h>
 #include "gna_upstream_iterator.hpp"
@@ -1108,7 +1108,7 @@ class ScaleFactorPerLayer<InferenceEngine::ConcatLayer*, QUANT_DESC> {
 template<typename QUANT_DESC>
 class ScaleFactorPerLayer<InferenceEngine::WeightableLayer*, QUANT_DESC> {
  private:
-    std::vector<std::tuple<uint16_t const, float const, float const>> thresholds {
+    std::vector<std::tuple<uint16_t const, float const, float const>> thresholds = {
         // tuple values: scale factor threshold, scale factor reduction factor for I16 precision, for I8 precision
         std::make_tuple(30, 0.50f, 0.50f),     // entry check value
         std::make_tuple(100, 0.50f, 0.50f),    // if below this threshold, then use this factor

inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp → src/plugins/intel_gna/gna_plugin_entry_points.cpp

@@ -16,7 +16,7 @@ static const Version gnaPluginDescription = {
         "_with_GNA_LIB_VER==2"
 #endif
         ,
-        "GNAPlugin"
+        "ov_intel_gna_plugin"
 };
 
 IE_DEFINE_PLUGIN_CREATE_FUNCTION(GNAPluginInternal, gnaPluginDescription)

tools/deployment_manager/configs/linux.json

@@ -80,7 +80,7 @@
         "runtime/lib/intel64/libgna.so.2",
         "runtime/lib/intel64/libgna.so.3.0.0.1377",
         "runtime/lib/intel64/libinference_engine_legacy.so",
-        "runtime/lib/intel64/libGNAPlugin.so"
+        "runtime/lib/intel64/libov_intel_gna_plugin.so"
       ]
     },
     "hddl": {

tools/deployment_manager/configs/windows.json

@@ -68,7 +68,7 @@
       "files": [
         "runtime/bin/intel64/Release/gna.dll",
         "runtime/bin/intel64/Release/inference_engine_legacy.dll",
-        "runtime/bin/intel64/Release/GNAPlugin.dll"
+        "runtime/bin/intel64/Release/ov_intel_gna_plugin.dll"
       ]
     },
     "hddl": {