[GNA] Renamed plugin and moved it to new place (#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
This commit is contained in:
Mikhail Ryzhov 2021-12-06 13:00:35 +03:00 committed by GitHub
parent 86ab2e5f1b
commit 40691e9cc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
168 changed files with 46 additions and 44 deletions

View File

@ -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

View File

@ -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

View File

@ -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'

View File

@ -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 \

View File

@ -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:

View File

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

View File

@ -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}"

View File

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

View File

@ -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 |

View File

@ -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 |

View File

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

View File

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

View File

@ -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" },

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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> {
};

View File

@ -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})

View File

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

View File

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

View File

@ -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

View File

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

Some files were not shown because too many files have changed in this diff Show More