diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index 5cc7e70c1fc..b0bd1a9efea 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -403,6 +403,12 @@ jobs: - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Transformations.xml displayName: 'Transformations Tests' + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_legacy_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-LegacyTransformations.xml + displayName: 'Legacy Transformations Tests' + + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/commonUtilsTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-CommonUtilTests.xml + displayName: 'Common Utils Tests' + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineUnitTests.xml displayName: 'IE UT old' diff --git a/.ci/azure/linux_debian.yml b/.ci/azure/linux_debian.yml index 249ff29d8bd..0db9b462284 100644 --- a/.ci/azure/linux_debian.yml +++ b/.ci/azure/linux_debian.yml @@ -320,8 +320,7 @@ jobs: LD_LIBRARY_PATH: $(INSTALL_TEST_DIR) displayName: 'Paddle Frontend UT' - - script: | - $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml + - script: $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml env: LD_LIBRARY_PATH: $(INSTALL_TEST_DIR) displayName: 'TensorFlow Frontend Unit Tests' diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 595a9c155c8..0ce24827ee6 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -286,6 +286,12 @@ jobs: - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\Transformations.xml displayName: 'Transformations Tests' + + - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_legacy_transformations_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\LegacyTransformations.xml + displayName: 'Legacy Transformations Tests' + + - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\commonUtilsTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\CommonUtilTests.xml + displayName: 'Common Utils Tests' - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\InferenceEngineUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-InferenceEngineUnitTests.xml displayName: 'IE UT old' diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f1a6a21bf9a..05f1d38a8d1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -42,7 +42,6 @@ # OpenVINO Func Tests: /src/tests/ @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ie-test-developers -/src/tests_deprecated/ @openvinotoolkit/openvino-ie-tests-maintainers @openvinotoolkit/openvino-ie-test-developers /src/frontends/tests/frontend/shared/ @openvinotoolkit/openvino-ie-tests-maintainers /thirdparty/gtest/ @openvinotoolkit/openvino-ie-tests-maintainers @@ -61,7 +60,6 @@ # OpenVINO GNA: /src/plugins/intel_gna/ @openvinotoolkit/openvino-ie-gna-maintainers -/src/common/legacy/ @openvinotoolkit/openvino-ie-gna-maintainers # OpenVINO Auto (MULTI) plugin: /src/plugins/auto/ @openvinotoolkit/openvino-ie-auto-multi-maintainers diff --git a/.github/labeler.yml b/.github/labeler.yml index fe37bf4f9b4..82c19729ca5 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -56,7 +56,6 @@ 'category: GNA': - 'src/plugins/intel_gna/**/*' -- 'src/common/legacy/**/*' 'category: GPU': - 'src/plugins/intel_gpu/**/*' diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 590e93489eb..36c506a731c 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -41,13 +41,8 @@ ov_coverage_extract(INPUT "openvino" OUTPUT "low_precision_transformations" ov_coverage_genhtml(INFO_FILE "low_precision_transformations" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") -ov_coverage_extract(INPUT "openvino" OUTPUT "legacy" - PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/src/common/legacy/*") -ov_coverage_genhtml(INFO_FILE "legacy" - PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") - ov_coverage_extract(INPUT "openvino" OUTPUT "preprocessing" - PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}src/common/preprocessing/*") + PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}src/common/preprocessing/src/*") ov_coverage_genhtml(INFO_FILE "preprocessing" PREFIX "${OV_COVERAGE_BASE_DIRECTORY}") diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake index b4aed8b69fc..59793b8ebaa 100644 --- a/cmake/developer_package/IEDevScriptsConfig.cmake +++ b/cmake/developer_package/IEDevScriptsConfig.cmake @@ -215,6 +215,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0026 NEW) set(CMAKE_POLICY_DEFAULT_CMP0042 NEW) # CMake 3.9+: `RPATH` settings on macOS do not affect `install_name`. set(CMAKE_POLICY_DEFAULT_CMP0068 NEW) +# CMake 3.12+: find_package() uses _ROOT variables. +set(CMAKE_POLICY_DEFAULT_CMP0074 NEW) # CMake 3.13+: option() honors normal variables. set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) # CMake 3.19+: An imported target missing its location property fails during generation. diff --git a/cmake/features.cmake b/cmake/features.cmake index 727f0cbba1a..6bc2b2c36c1 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -98,9 +98,7 @@ ie_option (ENABLE_HETERO "Enables Hetero Device Plugin" ON) ie_option (ENABLE_TEMPLATE "Enable template plugin" ON) -ie_dependent_option (ENABLE_GAPI_TESTS "tests for GAPI kernels" ON "ENABLE_GAPI_PREPROCESSING;ENABLE_TESTS" OFF) - -ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_GAPI_TESTS" OFF) +ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_TESTS;ENABLE_GAPI_PREPROCESSING" OFF) ie_dependent_option (ENABLE_DATA "fetch models from testdata repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF) diff --git a/docs/Doxyfile.config b/docs/Doxyfile.config index 64b8ba49201..3dc3c07d640 100644 --- a/docs/Doxyfile.config +++ b/docs/Doxyfile.config @@ -833,17 +833,9 @@ INPUT = "@MARKDOWN_INPUT@" \ "@OpenVINO_SOURCE_DIR@/src/frontends/common/include/" \ "@OpenVINO_SOURCE_DIR@/src/common/conditional_compilation/include/" \ "@OpenVINO_SOURCE_DIR@/src/common/itt/include/" \ - "@OpenVINO_SOURCE_DIR@/src/common/legacy/include/" \ - "@OpenVINO_SOURCE_DIR@/src/common/legacy/include/" \ "@OpenVINO_SOURCE_DIR@/src/common/low_precision_transformations/include/" \ "@OpenVINO_SOURCE_DIR@/src/common/low_precision_transformations/include/" \ "@OpenVINO_SOURCE_DIR@/src/common/offline_transformations/include/" \ - "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/" \ - "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/arm_neon/" \ - "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/cpu_x86_avx2/" \ - "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/cpu_x86_avx512/" \ - "@OpenVINO_SOURCE_DIR@/src/common/preprocessing/cpu_x86_sse42/" \ - "@OpenVINO_SOURCE_DIR@/src/common/snippets/include/" \ "@OpenVINO_SOURCE_DIR@/src/common/transformations/include/" \ "@OpenVINO_SOURCE_DIR@/src/common/util/include/" \ "@OpenVINO_SOURCE_DIR@/src/core/include/" \ diff --git a/docs/dev/test_coverage.md b/docs/dev/test_coverage.md index 348af3b83df..96c2d5badca 100644 --- a/docs/dev/test_coverage.md +++ b/docs/dev/test_coverage.md @@ -65,7 +65,6 @@ coverage/paddle_frontend/index.html coverage/tf_frontend/index.html coverage/openvino/index.html coverage/onnx_frontend/index.html -coverage/legacy/index.html coverage/ir_frontend/index.html coverage/low_precision_transformations/index.html coverage/template_plugin/index.html diff --git a/docs/snippets/CMakeLists.txt b/docs/snippets/CMakeLists.txt index a2c83448a9f..4e3b702e191 100644 --- a/docs/snippets/CMakeLists.txt +++ b/docs/snippets/CMakeLists.txt @@ -92,7 +92,7 @@ target_include_directories(${TARGET_NAME} PRIVATE "${OpenVINO_SOURCE_DIR}/src/in "${OpenVINO_SOURCE_DIR}/src/core/include" "${OpenVINO_SOURCE_DIR}/src/bindings/c/include" "${OpenVINO_SOURCE_DIR}/src/common/transformations/include" - "${OpenVINO_SOURCE_DIR}/src/common/preprocessing" + "${OpenVINO_SOURCE_DIR}/src/common/preprocessing/src" "${OpenVINO_SOURCE_DIR}/src/common/util/include" "${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include" "${OpenVINO_SOURCE_DIR}/src/frontends/common/include" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 075df7034e9..31f93f7f05d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,6 +29,5 @@ add_subdirectory(common/preprocessing) add_subdirectory(bindings) if(ENABLE_TESTS) - add_subdirectory(tests_deprecated) add_subdirectory(tests) endif() diff --git a/src/README.md b/src/README.md index 6721e9fe035..7b3586e4eff 100644 --- a/src/README.md +++ b/src/README.md @@ -11,7 +11,6 @@ frontends/ // OpenVINO frontends inference/ // Provides API for model inference plugins/ // OpenVINO plugins tests/ // A backed of tests binaries for core and plugins -tests_deprecated/ // Deprecated tests ``` ## OpenVINO Runtime library diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake index 583451f57e2..5667f33f0b6 100644 --- a/src/cmake/openvino.cmake +++ b/src/cmake/openvino.cmake @@ -50,6 +50,12 @@ endif() if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${TARGET_NAME} PUBLIC OPENVINO_STATIC_LIBRARY) + + # TODO: remove together we GNA plugin + # for static linkage the dependencies are in opposite order + if(TARGET inference_engine_ir_v7_reader) + target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_ir_v7_reader) + endif() endif() if(WIN32) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 0513962a174..ce10d767bff 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory(conditional_compilation) add_subdirectory(util) add_subdirectory(snippets) -add_subdirectory(legacy) add_subdirectory(transformations) add_subdirectory(offline_transformations) add_subdirectory(low_precision_transformations) diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt index 11fa0eadb7a..e11be311e03 100644 --- a/src/common/preprocessing/CMakeLists.txt +++ b/src/common/preprocessing/CMakeLists.txt @@ -2,223 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 # -set (TARGET_NAME "openvino_gapi_preproc") +add_subdirectory(src) -file(GLOB LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) -file(GLOB LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) - -# -# Provides compilation flags for AVX512F, AVX512BW, AVX512DQ -# instructions support depending on an OS and a compiler -# -macro(ie_avx512_core_optimization_flags flags) - if(WIN32) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") - set(${flags} /QxCORE-AVX512) - elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(${flags} /arch:AVX512) - else() - message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}") - endif() - else() - if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") - set(${flags} -xCORE-AVX512) - else() - set(${flags} -mavx512f -mavx512bw -mavx512dq -mfma) - if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12) - list(APPEND ${flags} -Wno-error=maybe-uninitialized -Wno-maybe-uninitialized) - endif() - endif() - endif() -endmacro() - -if(ENABLE_SSE42) - file(GLOB SSE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.cpp) - file(GLOB SSE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.hpp) - - list(APPEND LIBRARY_HEADERS ${SSE_HEADERS}) - list(APPEND LIBRARY_SRC ${SSE_SRC}) - - ie_sse42_optimization_flags(sse4_2_flags) - set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_OPTIONS "${sse4_2_flags}") - add_definitions(-DHAVE_SSE=1) -endif() - -if(ENABLE_AVX2) - file(GLOB AVX2_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.cpp) - file(GLOB AVX2_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.hpp) - - list(APPEND LIBRARY_HEADERS ${AVX2_HEADERS}) - list(APPEND LIBRARY_SRC ${AVX2_SRC}) - - ie_avx2_optimization_flags(avx2_flags) - set_source_files_properties(${AVX2_SRC} PROPERTIES COMPILE_OPTIONS "${avx2_flags}") - add_definitions(-DHAVE_AVX2=1) -endif() - - -# Workaround for GCC version 5.4 and 5.5 bugs in Debug configuration. -if (CMAKE_COMPILER_IS_GNUCXX AND - (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5) AND - (CMAKE_BUILD_TYPE STREQUAL Debug)) - set(GNU_5_DEBUG_CASE ON) -endif() - -if(ENABLE_AVX512F AND NOT GNU_5_DEBUG_CASE) - file(GLOB AVX512_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.cpp) - file(GLOB AVX512_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.hpp) - - list(APPEND LIBRARY_HEADERS ${AVX512_HEADERS}) - list(APPEND LIBRARY_SRC ${AVX512_SRC}) - - ie_avx512_core_optimization_flags(avx512_flags) - set_source_files_properties(${AVX512_SRC} PROPERTIES COMPILE_OPTIONS "${avx512_flags}") - add_definitions(-DHAVE_AVX512=1) -endif() - -if(ARM OR AARCH64) - ie_arm_neon_optimization_flags(neon_flags) - - file(GLOB NEON_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.hpp) - file(GLOB NEON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.cpp) - - list(APPEND LIBRARY_HEADERS ${NEON_HEADERS}) - list(APPEND LIBRARY_SRC ${NEON_SRC}) - - if(neon_flags) - set_source_files_properties(${NEON_SRC} PROPERTIES COMPILE_OPTIONS "${neon_flags}") - endif() - - add_definitions(-DHAVE_NEON=1) -endif() - -# Create object library - -if(ENABLE_GAPI_PREPROCESSING) - add_library(${TARGET_NAME}_obj OBJECT - ${LIBRARY_SRC} - ${LIBRARY_HEADERS}) - ie_faster_build(${TARGET_NAME}_obj UNITY) - - target_compile_definitions(${TARGET_NAME}_obj PRIVATE - IMPLEMENT_INFERENCE_ENGINE_PLUGIN - $ - $ - ENABLE_GAPI_PREPROCESSING) - - target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE - $ - $ - $) - - target_include_directories(${TARGET_NAME}_obj PRIVATE - "${CMAKE_CURRENT_SOURCE_DIR}" - $ - $) - - set_ie_threading_interface_for(${TARGET_NAME}_obj) - - add_cpplint_target(${TARGET_NAME}_obj_cpplint FOR_TARGETS ${TARGET_NAME}_obj) - - set(library_sources $) -endif() - -# Create module library file from object library - -if(ENABLE_GAPI_PREPROCESSING) - if(BUILD_SHARED_LIBS) - set(library_type MODULE) - else() - set(library_type STATIC) - endif() -else() - set(library_type INTERFACE) -endif() - -add_library(${TARGET_NAME} ${library_type} ${library_sources}) - -set_ie_threading_interface_for(${TARGET_NAME}) - -if(ENABLE_GAPI_PREPROCESSING) - target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_GAPI_PREPROCESSING) - target_link_libraries(${TARGET_NAME} PRIVATE fluid openvino::itt openvino::util) - - if(BUILD_SHARED_LIBS) - target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime) - # make plugin to depend on preprocessing library - foreach(plugin IN LISTS PLUGIN_FILES) - string(REPLACE ":" ";" plugin "${plugin}") - list(REMOVE_AT plugin 0) - add_dependencies(${plugin} openvino_gapi_preproc) - endforeach() - add_dependencies(ov_plugins openvino_gapi_preproc) - else() - # for static linkage the dependencies are in opposite order - target_link_libraries(openvino PRIVATE ${TARGET_NAME}) - endif() - - # Workaround to avoid warnings caused with bug in the avx512intrin.h of GCC5 - if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND - (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5)) - set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized") - endif() - - if(WIN32 AND NOT library_type STREQUAL "INTERFACE") - set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) - endif() - - ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) - - ie_add_vs_version_file(NAME ${TARGET_NAME} - FILEDESCRIPTION "OpenVINO Preprocessing plugin") -endif() - -target_include_directories(${TARGET_NAME} INTERFACE - $ - $) - -# Static library used for unit tests which are always built - -if(ENABLE_GAPI_PREPROCESSING) - add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL - $) - - set_ie_threading_interface_for(${TARGET_NAME}_s) - - target_include_directories(${TARGET_NAME}_s INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") - - if(WIN32) - set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) - endif() - - target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt openvino::runtime) - - target_compile_definitions(${TARGET_NAME}_s INTERFACE USE_STATIC_IE) - - set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON) -endif() - -# LTO - -if(TARGET ${TARGET_NAME}_obj) - set_target_properties(${TARGET_NAME}_obj ${TARGET_NAME}_s - PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) -endif() - -if(NOT library_type STREQUAL "INTERFACE") - set_target_properties(${TARGET_NAME} - PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) -endif() - -# developer package - -openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) - -# install - -if(BUILD_SHARED_LIBS) - install(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR} COMPONENT ${OV_CPACK_COMP_CORE}) -else() - ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) +if(ENABLE_TESTS) + add_subdirectory(tests) endif() diff --git a/src/common/preprocessing/src/CMakeLists.txt b/src/common/preprocessing/src/CMakeLists.txt new file mode 100644 index 00000000000..11fa0eadb7a --- /dev/null +++ b/src/common/preprocessing/src/CMakeLists.txt @@ -0,0 +1,224 @@ +# Copyright (C) 2018-2023 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + +set (TARGET_NAME "openvino_gapi_preproc") + +file(GLOB LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) +file(GLOB LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) + +# +# Provides compilation flags for AVX512F, AVX512BW, AVX512DQ +# instructions support depending on an OS and a compiler +# +macro(ie_avx512_core_optimization_flags flags) + if(WIN32) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + set(${flags} /QxCORE-AVX512) + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(${flags} /arch:AVX512) + else() + message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}") + endif() + else() + if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + set(${flags} -xCORE-AVX512) + else() + set(${flags} -mavx512f -mavx512bw -mavx512dq -mfma) + if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12) + list(APPEND ${flags} -Wno-error=maybe-uninitialized -Wno-maybe-uninitialized) + endif() + endif() + endif() +endmacro() + +if(ENABLE_SSE42) + file(GLOB SSE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.cpp) + file(GLOB SSE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.hpp) + + list(APPEND LIBRARY_HEADERS ${SSE_HEADERS}) + list(APPEND LIBRARY_SRC ${SSE_SRC}) + + ie_sse42_optimization_flags(sse4_2_flags) + set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_OPTIONS "${sse4_2_flags}") + add_definitions(-DHAVE_SSE=1) +endif() + +if(ENABLE_AVX2) + file(GLOB AVX2_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.cpp) + file(GLOB AVX2_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx2/*.hpp) + + list(APPEND LIBRARY_HEADERS ${AVX2_HEADERS}) + list(APPEND LIBRARY_SRC ${AVX2_SRC}) + + ie_avx2_optimization_flags(avx2_flags) + set_source_files_properties(${AVX2_SRC} PROPERTIES COMPILE_OPTIONS "${avx2_flags}") + add_definitions(-DHAVE_AVX2=1) +endif() + + +# Workaround for GCC version 5.4 and 5.5 bugs in Debug configuration. +if (CMAKE_COMPILER_IS_GNUCXX AND + (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5) AND + (CMAKE_BUILD_TYPE STREQUAL Debug)) + set(GNU_5_DEBUG_CASE ON) +endif() + +if(ENABLE_AVX512F AND NOT GNU_5_DEBUG_CASE) + file(GLOB AVX512_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.cpp) + file(GLOB AVX512_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_avx512/*.hpp) + + list(APPEND LIBRARY_HEADERS ${AVX512_HEADERS}) + list(APPEND LIBRARY_SRC ${AVX512_SRC}) + + ie_avx512_core_optimization_flags(avx512_flags) + set_source_files_properties(${AVX512_SRC} PROPERTIES COMPILE_OPTIONS "${avx512_flags}") + add_definitions(-DHAVE_AVX512=1) +endif() + +if(ARM OR AARCH64) + ie_arm_neon_optimization_flags(neon_flags) + + file(GLOB NEON_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.hpp) + file(GLOB NEON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.cpp) + + list(APPEND LIBRARY_HEADERS ${NEON_HEADERS}) + list(APPEND LIBRARY_SRC ${NEON_SRC}) + + if(neon_flags) + set_source_files_properties(${NEON_SRC} PROPERTIES COMPILE_OPTIONS "${neon_flags}") + endif() + + add_definitions(-DHAVE_NEON=1) +endif() + +# Create object library + +if(ENABLE_GAPI_PREPROCESSING) + add_library(${TARGET_NAME}_obj OBJECT + ${LIBRARY_SRC} + ${LIBRARY_HEADERS}) + ie_faster_build(${TARGET_NAME}_obj UNITY) + + target_compile_definitions(${TARGET_NAME}_obj PRIVATE + IMPLEMENT_INFERENCE_ENGINE_PLUGIN + $ + $ + ENABLE_GAPI_PREPROCESSING) + + target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE + $ + $ + $) + + target_include_directories(${TARGET_NAME}_obj PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}" + $ + $) + + set_ie_threading_interface_for(${TARGET_NAME}_obj) + + add_cpplint_target(${TARGET_NAME}_obj_cpplint FOR_TARGETS ${TARGET_NAME}_obj) + + set(library_sources $) +endif() + +# Create module library file from object library + +if(ENABLE_GAPI_PREPROCESSING) + if(BUILD_SHARED_LIBS) + set(library_type MODULE) + else() + set(library_type STATIC) + endif() +else() + set(library_type INTERFACE) +endif() + +add_library(${TARGET_NAME} ${library_type} ${library_sources}) + +set_ie_threading_interface_for(${TARGET_NAME}) + +if(ENABLE_GAPI_PREPROCESSING) + target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_GAPI_PREPROCESSING) + target_link_libraries(${TARGET_NAME} PRIVATE fluid openvino::itt openvino::util) + + if(BUILD_SHARED_LIBS) + target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime) + # make plugin to depend on preprocessing library + foreach(plugin IN LISTS PLUGIN_FILES) + string(REPLACE ":" ";" plugin "${plugin}") + list(REMOVE_AT plugin 0) + add_dependencies(${plugin} openvino_gapi_preproc) + endforeach() + add_dependencies(ov_plugins openvino_gapi_preproc) + else() + # for static linkage the dependencies are in opposite order + target_link_libraries(openvino PRIVATE ${TARGET_NAME}) + endif() + + # Workaround to avoid warnings caused with bug in the avx512intrin.h of GCC5 + if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND + (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 5.5)) + set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized") + endif() + + if(WIN32 AND NOT library_type STREQUAL "INTERFACE") + set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) + endif() + + ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) + + ie_add_vs_version_file(NAME ${TARGET_NAME} + FILEDESCRIPTION "OpenVINO Preprocessing plugin") +endif() + +target_include_directories(${TARGET_NAME} INTERFACE + $ + $) + +# Static library used for unit tests which are always built + +if(ENABLE_GAPI_PREPROCESSING) + add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL + $) + + set_ie_threading_interface_for(${TARGET_NAME}_s) + + target_include_directories(${TARGET_NAME}_s INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") + + if(WIN32) + set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) + endif() + + target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt openvino::runtime) + + target_compile_definitions(${TARGET_NAME}_s INTERFACE USE_STATIC_IE) + + set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON) +endif() + +# LTO + +if(TARGET ${TARGET_NAME}_obj) + set_target_properties(${TARGET_NAME}_obj ${TARGET_NAME}_s + PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) +endif() + +if(NOT library_type STREQUAL "INTERFACE") + set_target_properties(${TARGET_NAME} + PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) +endif() + +# developer package + +openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) + +# install + +if(BUILD_SHARED_LIBS) + install(TARGETS ${TARGET_NAME} + LIBRARY DESTINATION ${OV_CPACK_PLUGINSDIR} COMPONENT ${OV_CPACK_COMP_CORE}) +else() + ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) +endif() diff --git a/src/common/preprocessing/arm_neon/ie_preprocess_gapi_kernels_neon.cpp b/src/common/preprocessing/src/arm_neon/ie_preprocess_gapi_kernels_neon.cpp similarity index 100% rename from src/common/preprocessing/arm_neon/ie_preprocess_gapi_kernels_neon.cpp rename to src/common/preprocessing/src/arm_neon/ie_preprocess_gapi_kernels_neon.cpp diff --git a/src/common/preprocessing/arm_neon/ie_preprocess_gapi_kernels_neon.hpp b/src/common/preprocessing/src/arm_neon/ie_preprocess_gapi_kernels_neon.hpp similarity index 100% rename from src/common/preprocessing/arm_neon/ie_preprocess_gapi_kernels_neon.hpp rename to src/common/preprocessing/src/arm_neon/ie_preprocess_gapi_kernels_neon.hpp diff --git a/src/common/preprocessing/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.cpp b/src/common/preprocessing/src/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.cpp similarity index 100% rename from src/common/preprocessing/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.cpp rename to src/common/preprocessing/src/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.cpp diff --git a/src/common/preprocessing/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.hpp b/src/common/preprocessing/src/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.hpp similarity index 100% rename from src/common/preprocessing/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.hpp rename to src/common/preprocessing/src/cpu_x86_avx2/ie_preprocess_gapi_kernels_avx2.hpp diff --git a/src/common/preprocessing/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.cpp b/src/common/preprocessing/src/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.cpp similarity index 100% rename from src/common/preprocessing/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.cpp rename to src/common/preprocessing/src/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.cpp diff --git a/src/common/preprocessing/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.hpp b/src/common/preprocessing/src/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.hpp similarity index 100% rename from src/common/preprocessing/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.hpp rename to src/common/preprocessing/src/cpu_x86_avx512/ie_preprocess_gapi_kernels_avx512.hpp diff --git a/src/common/preprocessing/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.cpp b/src/common/preprocessing/src/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.cpp similarity index 100% rename from src/common/preprocessing/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.cpp rename to src/common/preprocessing/src/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.cpp diff --git a/src/common/preprocessing/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.hpp b/src/common/preprocessing/src/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.hpp similarity index 100% rename from src/common/preprocessing/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.hpp rename to src/common/preprocessing/src/cpu_x86_sse42/ie_preprocess_gapi_kernels_sse42.hpp diff --git a/src/common/preprocessing/ie_preprocess_data.cpp b/src/common/preprocessing/src/ie_preprocess_data.cpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_data.cpp rename to src/common/preprocessing/src/ie_preprocess_data.cpp diff --git a/src/common/preprocessing/ie_preprocess_data.hpp b/src/common/preprocessing/src/ie_preprocess_data.hpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_data.hpp rename to src/common/preprocessing/src/ie_preprocess_data.hpp diff --git a/src/common/preprocessing/ie_preprocess_gapi.cpp b/src/common/preprocessing/src/ie_preprocess_gapi.cpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_gapi.cpp rename to src/common/preprocessing/src/ie_preprocess_gapi.cpp diff --git a/src/common/preprocessing/ie_preprocess_gapi.hpp b/src/common/preprocessing/src/ie_preprocess_gapi.hpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_gapi.hpp rename to src/common/preprocessing/src/ie_preprocess_gapi.hpp diff --git a/src/common/preprocessing/ie_preprocess_gapi_kernels.cpp b/src/common/preprocessing/src/ie_preprocess_gapi_kernels.cpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_gapi_kernels.cpp rename to src/common/preprocessing/src/ie_preprocess_gapi_kernels.cpp diff --git a/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp b/src/common/preprocessing/src/ie_preprocess_gapi_kernels.hpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_gapi_kernels.hpp rename to src/common/preprocessing/src/ie_preprocess_gapi_kernels.hpp diff --git a/src/common/preprocessing/ie_preprocess_gapi_kernels_impl.hpp b/src/common/preprocessing/src/ie_preprocess_gapi_kernels_impl.hpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_gapi_kernels_impl.hpp rename to src/common/preprocessing/src/ie_preprocess_gapi_kernels_impl.hpp diff --git a/src/common/preprocessing/ie_preprocess_gapi_kernels_simd_impl.hpp b/src/common/preprocessing/src/ie_preprocess_gapi_kernels_simd_impl.hpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_gapi_kernels_simd_impl.hpp rename to src/common/preprocessing/src/ie_preprocess_gapi_kernels_simd_impl.hpp diff --git a/src/common/preprocessing/ie_preprocess_itt.hpp b/src/common/preprocessing/src/ie_preprocess_itt.hpp similarity index 100% rename from src/common/preprocessing/ie_preprocess_itt.hpp rename to src/common/preprocessing/src/ie_preprocess_itt.hpp diff --git a/src/tests_deprecated/fluid_preproc/CMakeLists.txt b/src/common/preprocessing/tests/CMakeLists.txt similarity index 100% rename from src/tests_deprecated/fluid_preproc/CMakeLists.txt rename to src/common/preprocessing/tests/CMakeLists.txt diff --git a/src/tests_deprecated/fluid_preproc/common/fluid_tests.cpp b/src/common/preprocessing/tests/common/fluid_tests.cpp similarity index 100% rename from src/tests_deprecated/fluid_preproc/common/fluid_tests.cpp rename to src/common/preprocessing/tests/common/fluid_tests.cpp diff --git a/src/tests_deprecated/fluid_preproc/common/fluid_tests.hpp b/src/common/preprocessing/tests/common/fluid_tests.hpp similarity index 100% rename from src/tests_deprecated/fluid_preproc/common/fluid_tests.hpp rename to src/common/preprocessing/tests/common/fluid_tests.hpp diff --git a/src/tests_deprecated/fluid_preproc/common/fluid_tests_common.hpp b/src/common/preprocessing/tests/common/fluid_tests_common.hpp similarity index 100% rename from src/tests_deprecated/fluid_preproc/common/fluid_tests_common.hpp rename to src/common/preprocessing/tests/common/fluid_tests_common.hpp diff --git a/src/tests_deprecated/fluid_preproc/cpu/fluid_tests_cpu.cpp b/src/common/preprocessing/tests/cpu/fluid_tests_cpu.cpp similarity index 100% rename from src/tests_deprecated/fluid_preproc/cpu/fluid_tests_cpu.cpp rename to src/common/preprocessing/tests/cpu/fluid_tests_cpu.cpp diff --git a/src/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt b/src/common/preprocessing/tests/fluid_test_computations/CMakeLists.txt similarity index 100% rename from src/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt rename to src/common/preprocessing/tests/fluid_test_computations/CMakeLists.txt diff --git a/src/tests_deprecated/fluid_preproc/fluid_test_computations/fluid_test_computations.cpp b/src/common/preprocessing/tests/fluid_test_computations/fluid_test_computations.cpp similarity index 100% rename from src/tests_deprecated/fluid_preproc/fluid_test_computations/fluid_test_computations.cpp rename to src/common/preprocessing/tests/fluid_test_computations/fluid_test_computations.cpp diff --git a/src/tests_deprecated/fluid_preproc/fluid_test_computations/fluid_test_computations.hpp b/src/common/preprocessing/tests/fluid_test_computations/fluid_test_computations.hpp similarity index 100% rename from src/tests_deprecated/fluid_preproc/fluid_test_computations/fluid_test_computations.hpp rename to src/common/preprocessing/tests/fluid_test_computations/fluid_test_computations.hpp diff --git a/src/common/transformations/tests/CMakeLists.txt b/src/common/transformations/tests/CMakeLists.txt index 5f704a42528..91fed873102 100644 --- a/src/common/transformations/tests/CMakeLists.txt +++ b/src/common/transformations/tests/CMakeLists.txt @@ -21,13 +21,6 @@ ov_add_test_target( TRANSFORMATIONS ) -file(GLOB_RECURSE legacy_tests - "${CMAKE_CURRENT_SOURCE_DIR}/legacy/*.cpp" # CVS-55385 - ) - -set_source_files_properties(${legacy_tests} PROPERTIES INCLUDE_DIRECTORIES - $) - if(WIN32) string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 4039b45fe3f..cd3f081a5bc 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -19,18 +19,18 @@ file (GLOB LIBRARY_SRC ) # TODO: WA for OneHot pass usage in reshape -set(LEGACY_SRC_ROOT "${OpenVINO_SOURCE_DIR}/src/common/legacy/src") +set(LEGACY_ROOT "${OpenVINO_SOURCE_DIR}/src/plugins/intel_gna/legacy") set(LEGACY_LIBRARY_SHARED_SRCS - "${LEGACY_SRC_ROOT}/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp" - "${LEGACY_SRC_ROOT}/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp" - "${LEGACY_SRC_ROOT}/ngraph_ops/nms_ie.cpp" - "${LEGACY_SRC_ROOT}/ngraph_ops/onehot_ie.cpp") + "${LEGACY_ROOT}/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp" + "${LEGACY_ROOT}/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp" + "${LEGACY_ROOT}/src/ngraph_ops/nms_ie.cpp" + "${LEGACY_ROOT}/src/ngraph_ops/onehot_ie.cpp") set_source_files_properties(${LEGACY_LIBRARY_SHARED_SRCS} PROPERTIES COMPILE_DEFINITIONS "USE_STATIC_IE" - INCLUDE_DIRECTORIES $) + INCLUDE_DIRECTORIES "${LEGACY_ROOT}/include") set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/cnn_network_ngraph_impl.cpp" PROPERTIES - INCLUDE_DIRECTORIES $) + INCLUDE_DIRECTORIES "${LEGACY_ROOT}/include") set(IE_STATIC_DEPENDENT_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/file_utils.cpp) list(REMOVE_ITEM LIBRARY_SRC ${IE_STATIC_DEPENDENT_FILES}) @@ -153,7 +153,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_BINARY_DIR}" # for ie_ir_version.hpp $<$:$> - $ + "${LEGACY_ROOT}/include" $ $) @@ -180,14 +180,7 @@ ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_obj # Static library used for unit tests which are always built -file(GLOB_RECURSE legacy_src "${LEGACY_SRC_ROOT}/*.cpp" - "${LEGACY_SRC_ROOT}/*.hpp") - -set_source_files_properties(${legacy_src} PROPERTIES - INCLUDE_DIRECTORIES $) - add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL - ${legacy_src} $) set_ie_threading_interface_for(${TARGET_NAME}_s) @@ -197,8 +190,7 @@ endif() target_include_directories(${TARGET_NAME}_s PUBLIC $ - $ - $/src>) + $) if(WIN32) set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) @@ -231,5 +223,5 @@ install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" COMPONENT ${OV_CPACK_COMP_CORE_DEV}) if(ENABLE_TESTS) -add_subdirectory(tests) + add_subdirectory(tests) endif() diff --git a/src/inference/tests/functional/CMakeLists.txt b/src/inference/tests/functional/CMakeLists.txt index 56026ef5e82..5b8ff536d4f 100644 --- a/src/inference/tests/functional/CMakeLists.txt +++ b/src/inference/tests/functional/CMakeLists.txt @@ -2,6 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 # +if(SUGGEST_OVERRIDE_SUPPORTED) + ie_add_compiler_flags(-Wno-suggest-override) +endif() + set(TARGET_NAME ov_inference_functional_tests) set(DEPENDENCIES @@ -32,7 +36,6 @@ if(ENABLE_AUTO_BATCH) list(APPEND COMPILE_DEFINITIONS ENABLE_AUTO_BATCH) endif() - ov_add_test_target( NAME ${TARGET_NAME} ROOT ${CMAKE_CURRENT_SOURCE_DIR} @@ -50,11 +53,3 @@ ov_add_test_target( add_compile_definitions(${TARGET_NAME} ${COMPILE_DEFINITIONS}) -check_cxx_compiler_flag(-Wno-suggest-override SUPPORT_WNO_SUGGEST_OVERRIDE) -if (SUPPORT_WNO_SUGGEST_OVERRIDE) - ie_add_compiler_flags(-Wno-suggest-override) -endif() - -set(legacy_tests "${CMAKE_CURRENT_SOURCE_DIR}/cnn_ngraph_impl_tests.cpp") #CVS-55375 -set_source_files_properties(${legacy_tests} PROPERTIES INCLUDE_DIRECTORIES - $) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp index b45811698cc..2cc3719c41a 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp @@ -19,7 +19,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_Convolution_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::Convolution::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 8, 64}), ::testing::Values(ngraph::Shape{64, 8, 1}), ::testing::Values(ngraph::Shape{64, 1}), @@ -30,7 +30,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolution::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 12, 5}), ::testing::Values(ngraph::Shape{4, 5, 3, 2}), ::testing::Values(ngraph::Shape{20, 1}), @@ -41,7 +41,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::ConvolutionBackpropData::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 12, 64}), ::testing::Values(ngraph::Shape{12, 20, 1}), ::testing::Values(ngraph::Shape{20, 1}), @@ -52,7 +52,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 12, 64}), ::testing::Values(ngraph::Shape{4, 3, 5, 1}), ::testing::Values(ngraph::Shape{1, 20, 1}), @@ -71,7 +71,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::Convolution::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 3, 64, 64}), ::testing::Values(ngraph::Shape{20, 3, 1, 1}), ::testing::ValuesIn(const_shapes_2d), @@ -82,7 +82,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolution::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 12, 64, 64}), ::testing::Values(ngraph::Shape{4, 5, 3, 1, 2}), ::testing::ValuesIn(const_shapes_2d), @@ -93,7 +93,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::ConvolutionBackpropData::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 3, 64, 64}), ::testing::Values(ngraph::Shape{3, 20, 3, 3}), ::testing::ValuesIn(const_shapes_2d), @@ -104,7 +104,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(4), ADD(5)})), + ::testing::ValuesIn(IN({ MUL(4), /* ADD(5) */})), ::testing::Values(ngraph::Shape{1, 12, 64, 64}), ::testing::Values(ngraph::Shape{4, 3, 5, 1, 1}), ::testing::ValuesIn(const_shapes_2d), @@ -120,7 +120,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::Convolution::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(6), ADD(6)})), + ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})), ::testing::Values(ngraph::Shape{1, 3, 3, 3}), ::testing::Values(ngraph::Shape{3, 3, 1, 1}), ::testing::ValuesIn(neg_const_shapes_2d), @@ -131,7 +131,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolution::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(6), ADD(6)})), + ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})), ::testing::Values(ngraph::Shape{1, 12, 3, 3}), ::testing::Values(ngraph::Shape{4, 5, 3, 1, 1}), ::testing::ValuesIn(neg_const_shapes_2d), @@ -142,7 +142,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::ConvolutionBackpropData::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(6), ADD(6)})), + ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})), ::testing::Values(ngraph::Shape{1, 12, 3, 3}), ::testing::Values(ngraph::Shape{12, 3, 1, 1}), ::testing::ValuesIn(neg_const_shapes_2d), @@ -153,7 +153,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::get_type_info_static()), - ::testing::ValuesIn(IN({MUL(6), ADD(6)})), + ::testing::ValuesIn(IN({MUL(6), /* ADD(6) */})), ::testing::Values(ngraph::Shape{1, 12, 3, 3}), ::testing::Values(ngraph::Shape{4, 3, 5, 1, 1}), ::testing::ValuesIn(neg_const_shapes_2d), diff --git a/src/plugins/intel_gna/CMakeLists.txt b/src/plugins/intel_gna/CMakeLists.txt index 27467e99c8a..8f2ee48e83b 100644 --- a/src/plugins/intel_gna/CMakeLists.txt +++ b/src/plugins/intel_gna/CMakeLists.txt @@ -6,6 +6,8 @@ if (NOT ENABLE_INTEL_GNA) return() endif() +add_subdirectory(legacy) + set(TARGET_NAME "openvino_intel_gna_plugin") if (ENABLE_INTEL_GNA_DEBUG) @@ -90,7 +92,6 @@ target_include_directories(${TARGET_NAME}_test_static $ PRIVATE $) -set_target_properties(${TARGET_NAME}_test_static PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_test_static) set_target_properties(${TARGET_NAME} ${TARGET_NAME}_test_static PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/src/common/legacy/CMakeLists.txt b/src/plugins/intel_gna/legacy/CMakeLists.txt similarity index 65% rename from src/common/legacy/CMakeLists.txt rename to src/plugins/intel_gna/legacy/CMakeLists.txt index 746326ef4b5..e0f1d7cccef 100644 --- a/src/common/legacy/CMakeLists.txt +++ b/src/plugins/intel_gna/legacy/CMakeLists.txt @@ -55,6 +55,34 @@ target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime target_include_directories(${TARGET_NAME} INTERFACE $) +# Compile with USE_STATIC_IE + +set(LEGACY_LIBRARY_SHARED_SRCS + "${CMAKE_CURRENT_SOURCE_DIR}/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/src/ngraph_ops/nms_ie.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/src/ngraph_ops/onehot_ie.cpp") +list(REMOVE_ITEM LIBRARY_SRC ${LEGACY_LIBRARY_SHARED_SRCS}) + +add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL + ${LIBRARY_SRC} + ${PUBLIC_HEADERS}) + +target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE) + +target_include_directories(${TARGET_NAME}_s + PUBLIC + $ + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/src + $/src # For CNNNetworkNGraphImpl + $ + $) + +set_target_properties(${TARGET_NAME}_s PROPERTIES + EXCLUDE_FROM_ALL ON + INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) + # LTO set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj @@ -67,3 +95,7 @@ openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}) # install ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE} OPTIONAL) + +if(ENABLE_TESTS) + add_subdirectory(tests) +endif() diff --git a/src/common/legacy/include/legacy/cnn_network_impl.hpp b/src/plugins/intel_gna/legacy/include/legacy/cnn_network_impl.hpp similarity index 100% rename from src/common/legacy/include/legacy/cnn_network_impl.hpp rename to src/plugins/intel_gna/legacy/include/legacy/cnn_network_impl.hpp diff --git a/src/common/legacy/include/legacy/convert_function_to_cnn_network.hpp b/src/plugins/intel_gna/legacy/include/legacy/convert_function_to_cnn_network.hpp similarity index 100% rename from src/common/legacy/include/legacy/convert_function_to_cnn_network.hpp rename to src/plugins/intel_gna/legacy/include/legacy/convert_function_to_cnn_network.hpp diff --git a/src/common/legacy/include/legacy/details/ie_cnn_network_iterator.hpp b/src/plugins/intel_gna/legacy/include/legacy/details/ie_cnn_network_iterator.hpp similarity index 100% rename from src/common/legacy/include/legacy/details/ie_cnn_network_iterator.hpp rename to src/plugins/intel_gna/legacy/include/legacy/details/ie_cnn_network_iterator.hpp diff --git a/src/common/legacy/include/legacy/details/ie_cnn_network_tools.h b/src/plugins/intel_gna/legacy/include/legacy/details/ie_cnn_network_tools.h similarity index 100% rename from src/common/legacy/include/legacy/details/ie_cnn_network_tools.h rename to src/plugins/intel_gna/legacy/include/legacy/details/ie_cnn_network_tools.h diff --git a/src/common/legacy/include/legacy/graph_tools.hpp b/src/plugins/intel_gna/legacy/include/legacy/graph_tools.hpp similarity index 100% rename from src/common/legacy/include/legacy/graph_tools.hpp rename to src/plugins/intel_gna/legacy/include/legacy/graph_tools.hpp diff --git a/src/common/legacy/include/legacy/graph_transformer.h b/src/plugins/intel_gna/legacy/include/legacy/graph_transformer.h similarity index 100% rename from src/common/legacy/include/legacy/graph_transformer.h rename to src/plugins/intel_gna/legacy/include/legacy/graph_transformer.h diff --git a/src/common/legacy/include/legacy/ie_ir_version.hpp b/src/plugins/intel_gna/legacy/include/legacy/ie_ir_version.hpp similarity index 100% rename from src/common/legacy/include/legacy/ie_ir_version.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ie_ir_version.hpp diff --git a/src/common/legacy/include/legacy/ie_layers.h b/src/plugins/intel_gna/legacy/include/legacy/ie_layers.h similarity index 100% rename from src/common/legacy/include/legacy/ie_layers.h rename to src/plugins/intel_gna/legacy/include/legacy/ie_layers.h diff --git a/src/common/legacy/include/legacy/ie_layers_internal.hpp b/src/plugins/intel_gna/legacy/include/legacy/ie_layers_internal.hpp similarity index 100% rename from src/common/legacy/include/legacy/ie_layers_internal.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ie_layers_internal.hpp diff --git a/src/common/legacy/include/legacy/ie_layers_property.hpp b/src/plugins/intel_gna/legacy/include/legacy/ie_layers_property.hpp similarity index 100% rename from src/common/legacy/include/legacy/ie_layers_property.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ie_layers_property.hpp diff --git a/src/common/legacy/include/legacy/ie_reader.hpp b/src/plugins/intel_gna/legacy/include/legacy/ie_reader.hpp similarity index 100% rename from src/common/legacy/include/legacy/ie_reader.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ie_reader.hpp diff --git a/src/common/legacy/include/legacy/ie_util_internal.hpp b/src/plugins/intel_gna/legacy/include/legacy/ie_util_internal.hpp similarity index 100% rename from src/common/legacy/include/legacy/ie_util_internal.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ie_util_internal.hpp diff --git a/src/common/legacy/include/legacy/layer_transform.hpp b/src/plugins/intel_gna/legacy/include/legacy/layer_transform.hpp similarity index 100% rename from src/common/legacy/include/legacy/layer_transform.hpp rename to src/plugins/intel_gna/legacy/include/legacy/layer_transform.hpp diff --git a/src/common/legacy/include/legacy/net_pass.h b/src/plugins/intel_gna/legacy/include/legacy/net_pass.h similarity index 100% rename from src/common/legacy/include/legacy/net_pass.h rename to src/plugins/intel_gna/legacy/include/legacy/net_pass.h diff --git a/src/common/legacy/include/legacy/ngraph_ops/convolution_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/convolution_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/convolution_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/convolution_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/crop_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/crop_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/crop_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/crop_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/eltwise.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/eltwise.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/eltwise.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/eltwise.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/fully_connected.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/fully_connected.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/fully_connected.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/fully_connected.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/gather_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gather_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/gather_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gather_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/interp.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/interp.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/interp.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/interp.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/lrn_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/lrn_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/lrn_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/lrn_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/nms_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/nms_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/nms_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/nms_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/normalize_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/normalize_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/normalize_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/normalize_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/onehot_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/onehot_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/onehot_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/onehot_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/pad_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/pad_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/pad_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/pad_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/power.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/power.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/power.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/power.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/proposal_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/proposal_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/proposal_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/proposal_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/relu_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/relu_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/relu_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/relu_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/scaleshift.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/scaleshift.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/scaleshift.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/scaleshift.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/selu_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/selu_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/selu_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/selu_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/swish_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/swish_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/swish_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/swish_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/tile_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/tile_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/tile_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/tile_ie.hpp diff --git a/src/common/legacy/include/legacy/ngraph_ops/topk_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/topk_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/ngraph_ops/topk_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/topk_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp diff --git a/src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp similarity index 100% rename from src/common/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp rename to src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp diff --git a/src/common/legacy/src/cnn_network_impl.cpp b/src/plugins/intel_gna/legacy/src/cnn_network_impl.cpp similarity index 100% rename from src/common/legacy/src/cnn_network_impl.cpp rename to src/plugins/intel_gna/legacy/src/cnn_network_impl.cpp diff --git a/src/common/legacy/src/convert_function_to_cnn_network.cpp b/src/plugins/intel_gna/legacy/src/convert_function_to_cnn_network.cpp similarity index 100% rename from src/common/legacy/src/convert_function_to_cnn_network.cpp rename to src/plugins/intel_gna/legacy/src/convert_function_to_cnn_network.cpp diff --git a/src/common/legacy/src/graph_tools.cpp b/src/plugins/intel_gna/legacy/src/graph_tools.cpp similarity index 100% rename from src/common/legacy/src/graph_tools.cpp rename to src/plugins/intel_gna/legacy/src/graph_tools.cpp diff --git a/src/common/legacy/src/graph_transformer.cpp b/src/plugins/intel_gna/legacy/src/graph_transformer.cpp similarity index 100% rename from src/common/legacy/src/graph_transformer.cpp rename to src/plugins/intel_gna/legacy/src/graph_transformer.cpp diff --git a/src/common/legacy/src/ie_layer_validators.cpp b/src/plugins/intel_gna/legacy/src/ie_layer_validators.cpp similarity index 100% rename from src/common/legacy/src/ie_layer_validators.cpp rename to src/plugins/intel_gna/legacy/src/ie_layer_validators.cpp diff --git a/src/common/legacy/src/ie_layer_validators.hpp b/src/plugins/intel_gna/legacy/src/ie_layer_validators.hpp similarity index 100% rename from src/common/legacy/src/ie_layer_validators.hpp rename to src/plugins/intel_gna/legacy/src/ie_layer_validators.hpp diff --git a/src/common/legacy/src/ie_layers.cpp b/src/plugins/intel_gna/legacy/src/ie_layers.cpp similarity index 100% rename from src/common/legacy/src/ie_layers.cpp rename to src/plugins/intel_gna/legacy/src/ie_layers.cpp diff --git a/src/common/legacy/src/ie_layers_internal.cpp b/src/plugins/intel_gna/legacy/src/ie_layers_internal.cpp similarity index 100% rename from src/common/legacy/src/ie_layers_internal.cpp rename to src/plugins/intel_gna/legacy/src/ie_layers_internal.cpp diff --git a/src/common/legacy/src/ie_legacy_itt.hpp b/src/plugins/intel_gna/legacy/src/ie_legacy_itt.hpp similarity index 100% rename from src/common/legacy/src/ie_legacy_itt.hpp rename to src/plugins/intel_gna/legacy/src/ie_legacy_itt.hpp diff --git a/src/common/legacy/src/ie_util_internal.cpp b/src/plugins/intel_gna/legacy/src/ie_util_internal.cpp similarity index 100% rename from src/common/legacy/src/ie_util_internal.cpp rename to src/plugins/intel_gna/legacy/src/ie_util_internal.cpp diff --git a/src/common/legacy/src/layer_transform.cpp b/src/plugins/intel_gna/legacy/src/layer_transform.cpp similarity index 100% rename from src/common/legacy/src/layer_transform.cpp rename to src/plugins/intel_gna/legacy/src/layer_transform.cpp diff --git a/src/common/legacy/src/net_pass.cpp b/src/plugins/intel_gna/legacy/src/net_pass.cpp similarity index 100% rename from src/common/legacy/src/net_pass.cpp rename to src/plugins/intel_gna/legacy/src/net_pass.cpp diff --git a/src/common/legacy/src/network_serializer_v7.cpp b/src/plugins/intel_gna/legacy/src/network_serializer_v7.cpp similarity index 100% rename from src/common/legacy/src/network_serializer_v7.cpp rename to src/plugins/intel_gna/legacy/src/network_serializer_v7.cpp diff --git a/src/common/legacy/src/network_serializer_v7.hpp b/src/plugins/intel_gna/legacy/src/network_serializer_v7.hpp similarity index 100% rename from src/common/legacy/src/network_serializer_v7.hpp rename to src/plugins/intel_gna/legacy/src/network_serializer_v7.hpp diff --git a/src/common/legacy/src/ngraph_ops/convolution_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/convolution_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/convolution_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/convolution_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/crop_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/crop_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/crop_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/crop_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/deconvolution_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/deconvolution_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/eltwise.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/eltwise.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/eltwise.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/eltwise.cpp diff --git a/src/common/legacy/src/ngraph_ops/fully_connected.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/fully_connected.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/fully_connected.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/fully_connected.cpp diff --git a/src/common/legacy/src/ngraph_ops/gather_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/gather_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/gather_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/gather_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/gather_tree_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/gather_tree_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/gather_tree_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/gather_tree_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/gru_cell_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/gru_cell_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/gru_cell_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/gru_cell_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/gru_sequence_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/gru_sequence_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/gru_sequence_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/gru_sequence_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/interp.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/interp.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/interp.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/interp.cpp diff --git a/src/common/legacy/src/ngraph_ops/lrn_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/lrn_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/lrn_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/lrn_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/lstm_cell_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/lstm_cell_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/lstm_cell_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/lstm_cell_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/lstm_sequence_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/lstm_sequence_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/lstm_sequence_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/lstm_sequence_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/nms_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/nms_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/nms_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/nms_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/normalize_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/normalize_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/normalize_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/normalize_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/onehot_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/onehot_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/onehot_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/onehot_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/pad_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/pad_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/pad_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/pad_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/power.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/power.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/power.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/power.cpp diff --git a/src/common/legacy/src/ngraph_ops/proposal_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/proposal_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/proposal_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/proposal_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/relu_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/relu_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/relu_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/relu_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/rnn_cell_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/rnn_cell_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/rnn_cell_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/rnn_cell_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/rnn_sequence_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/rnn_sequence_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/rnn_sequence_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/rnn_sequence_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/scaleshift.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/scaleshift.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/scaleshift.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/scaleshift.cpp diff --git a/src/common/legacy/src/ngraph_ops/selu_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/selu_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/selu_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/selu_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/swish_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/swish_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/swish_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/swish_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/tile_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/tile_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/tile_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/tile_ie.cpp diff --git a/src/common/legacy/src/ngraph_ops/topk_ie.cpp b/src/plugins/intel_gna/legacy/src/ngraph_ops/topk_ie.cpp similarity index 100% rename from src/common/legacy/src/ngraph_ops/topk_ie.cpp rename to src/plugins/intel_gna/legacy/src/ngraph_ops/topk_ie.cpp diff --git a/src/common/legacy/src/precomp.hpp b/src/plugins/intel_gna/legacy/src/precomp.hpp similarity index 100% rename from src/common/legacy/src/precomp.hpp rename to src/plugins/intel_gna/legacy/src/precomp.hpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_convolutions.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_convolutions.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_convolutions.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_convolutions.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fc_fusion.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/reshape_fc_fusion.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fc_fusion.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/reshape_fc_fusion.cpp diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp similarity index 100% rename from src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp rename to src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp diff --git a/src/plugins/intel_gna/legacy/tests/CMakeLists.txt b/src/plugins/intel_gna/legacy/tests/CMakeLists.txt new file mode 100644 index 00000000000..590ecee9a87 --- /dev/null +++ b/src/plugins/intel_gna/legacy/tests/CMakeLists.txt @@ -0,0 +1,32 @@ +# Copyright (C) 2018-2023 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + +if(CMAKE_COMPILER_IS_GNUCXX) + ie_add_compiler_flags(-Wno-missing-declarations) + ie_add_compiler_flags(-Wno-bool-compare) +endif() + +set(TARGET_NAME ov_legacy_transformations_tests) + +ov_add_test_target( + NAME ${TARGET_NAME} + ROOT ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDENCIES + LINK_LIBRARIES + gmock + funcTestUtils + sharedTestClasses + lptNgraphFunctions + inference_engine_legacy + ADD_CLANG_FORMAT + INCLUDES + $/src + LABELS + TRANSFORMATIONS +) + +if(WIN32) + string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") +endif() diff --git a/src/common/transformations/tests/legacy/conv_fusion_test.cpp b/src/plugins/intel_gna/legacy/tests/conv_fusion_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/conv_fusion_test.cpp rename to src/plugins/intel_gna/legacy/tests/conv_fusion_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_cells_to_cells_ie_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_cells_to_cells_ie_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_cells_to_cells_ie_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_cells_to_cells_ie_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_convolution_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_convolution_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_convolution_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_convolution_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_deconvolution_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_deconvolution_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_deconvolution_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_deconvolution_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_gather_to_gather_ie.cpp b/src/plugins/intel_gna/legacy/tests/convert_gather_to_gather_ie.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_gather_to_gather_ie.cpp rename to src/plugins/intel_gna/legacy/tests/convert_gather_to_gather_ie.cpp diff --git a/src/common/transformations/tests/legacy/convert_interpolate_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_interpolate_to_legacy.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_interpolate_to_legacy.cpp rename to src/plugins/intel_gna/legacy/tests/convert_interpolate_to_legacy.cpp diff --git a/src/common/transformations/tests/legacy/convert_lrn_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_lrn_to_legacy.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_lrn_to_legacy.cpp rename to src/plugins/intel_gna/legacy/tests/convert_lrn_to_legacy.cpp diff --git a/src/common/transformations/tests/legacy/convert_matmul_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_matmul_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_matmul_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_matmul_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_ngraph_to_cnn_network_tests.cpp b/src/plugins/intel_gna/legacy/tests/convert_ngraph_to_cnn_network_tests.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_ngraph_to_cnn_network_tests.cpp rename to src/plugins/intel_gna/legacy/tests/convert_ngraph_to_cnn_network_tests.cpp diff --git a/src/common/transformations/tests/legacy/convert_nms5_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_nms5_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_nms5_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_nms5_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_nms_to_nms_ie_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_nms_to_nms_ie_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_nms_to_nms_ie_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_nms_to_nms_ie_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_pad_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_pad_to_legacy.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_pad_to_legacy.cpp rename to src/plugins/intel_gna/legacy/tests/convert_pad_to_legacy.cpp diff --git a/src/common/transformations/tests/legacy/convert_sequences_to_sequences_ie_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_sequences_to_sequences_ie_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_sequences_to_sequences_ie_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_sequences_to_sequences_ie_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_strided_slice_to_crop_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_strided_slice_to_crop_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_strided_slice_to_crop_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_strided_slice_to_crop_test.cpp diff --git a/src/common/transformations/tests/legacy/convert_tile_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_tile_to_legacy.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_tile_to_legacy.cpp rename to src/plugins/intel_gna/legacy/tests/convert_tile_to_legacy.cpp diff --git a/src/common/transformations/tests/legacy/convert_topk_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_topk_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/convert_topk_test.cpp rename to src/plugins/intel_gna/legacy/tests/convert_topk_test.cpp diff --git a/src/common/transformations/tests/legacy/fc_bias_fusion_test.cpp b/src/plugins/intel_gna/legacy/tests/fc_bias_fusion_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/fc_bias_fusion_test.cpp rename to src/plugins/intel_gna/legacy/tests/fc_bias_fusion_test.cpp diff --git a/src/common/transformations/tests/legacy/keep_constant_inputs_tests.cpp b/src/plugins/intel_gna/legacy/tests/keep_constant_inputs_tests.cpp similarity index 100% rename from src/common/transformations/tests/legacy/keep_constant_inputs_tests.cpp rename to src/plugins/intel_gna/legacy/tests/keep_constant_inputs_tests.cpp diff --git a/src/common/transformations/tests/legacy/mul_add_conversion_test.cpp b/src/plugins/intel_gna/legacy/tests/mul_add_conversion_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/mul_add_conversion_test.cpp rename to src/plugins/intel_gna/legacy/tests/mul_add_conversion_test.cpp diff --git a/src/common/transformations/tests/legacy/reshape_fc_fusion_test.cpp b/src/plugins/intel_gna/legacy/tests/reshape_fc_fusion_test.cpp similarity index 100% rename from src/common/transformations/tests/legacy/reshape_fc_fusion_test.cpp rename to src/plugins/intel_gna/legacy/tests/reshape_fc_fusion_test.cpp diff --git a/src/plugins/intel_gna/tests/CMakeLists.txt b/src/plugins/intel_gna/tests/CMakeLists.txt index b43208089a5..2ba310b20d7 100644 --- a/src/plugins/intel_gna/tests/CMakeLists.txt +++ b/src/plugins/intel_gna/tests/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright (C) 2022 Intel Corporation # SPDX-License-Identifier: Apache-2.0 # + enable_testing() if(NOT MSVC) @@ -10,10 +11,25 @@ if(NOT MSVC) ie_add_compiler_flags(-Wno-all) endif() +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + ie_add_compiler_flags(/wd4244) + ie_add_compiler_flags(/wd4267) + ie_add_compiler_flags(/wd4305) + ie_add_compiler_flags(/wd4273) + ie_add_compiler_flags(/wd4661) + ie_add_compiler_flags(/wd4018) + ie_add_compiler_flags(/wd4334) +endif() + if(ENABLE_TESTS) + add_subdirectory(deprecated/readers) + add_subdirectory(deprecated/helpers) + add_subdirectory(unit) + add_subdirectory(deprecated/unit) endif() if(ENABLE_FUNCTIONAL_TESTS) + add_subdirectory(deprecated/functional) add_subdirectory(functional) -endif() \ No newline at end of file +endif() diff --git a/src/tests_deprecated/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/CMakeLists.txt similarity index 92% rename from src/tests_deprecated/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/CMakeLists.txt index 60717a6e295..2a493371e3b 100644 --- a/src/tests_deprecated/CMakeLists.txt +++ b/src/plugins/intel_gna/tests/deprecated/CMakeLists.txt @@ -4,7 +4,6 @@ enable_testing() - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ie_add_compiler_flags(/wd4244) ie_add_compiler_flags(/wd4267) @@ -26,10 +25,6 @@ endif() add_subdirectory(readers) add_subdirectory(helpers) -if (ENABLE_GAPI_TESTS) - add_subdirectory(fluid_preproc) -endif() - if (ENABLE_FUNCTIONAL_TESTS) add_subdirectory(functional) endif() diff --git a/src/tests_deprecated/functional/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/functional/CMakeLists.txt similarity index 100% rename from src/tests_deprecated/functional/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/functional/CMakeLists.txt diff --git a/src/tests_deprecated/functional/gna/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/functional/gna/CMakeLists.txt similarity index 100% rename from src/tests_deprecated/functional/gna/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/functional/gna/CMakeLists.txt diff --git a/src/tests_deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp b/src/plugins/intel_gna/tests/deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp similarity index 100% rename from src/tests_deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp diff --git a/src/tests_deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp b/src/plugins/intel_gna/tests/deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp similarity index 100% rename from src/tests_deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp diff --git a/src/tests_deprecated/functional/gna/shared_tests_instance/single_layer_tests/ti_tests.cpp b/src/plugins/intel_gna/tests/deprecated/functional/gna/shared_tests_instance/single_layer_tests/ti_tests.cpp similarity index 100% rename from src/tests_deprecated/functional/gna/shared_tests_instance/single_layer_tests/ti_tests.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/gna/shared_tests_instance/single_layer_tests/ti_tests.cpp diff --git a/src/tests_deprecated/functional/gna/test_model_repo.cpp b/src/plugins/intel_gna/tests/deprecated/functional/gna/test_model_repo.cpp similarity index 100% rename from src/tests_deprecated/functional/gna/test_model_repo.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/gna/test_model_repo.cpp diff --git a/src/tests_deprecated/functional/shared_tests/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/CMakeLists.txt similarity index 100% rename from src/tests_deprecated/functional/shared_tests/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/CMakeLists.txt diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp diff --git a/src/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp diff --git a/src/tests_deprecated/functional/shared_tests/input_tests/parser_tests.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/input_tests/parser_tests.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/input_tests/parser_tests.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/input_tests/parser_tests.hpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/npy.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/npy.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/npy.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/npy.hpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/plg_test.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/plg_test.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/plg_test.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/plg_test.hpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/rnn_gen.cpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_gen.cpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/rnn_gen.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_gen.cpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/rnn_gen.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_gen.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/rnn_gen.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_gen.hpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/rnn_referee.cpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_referee.cpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/rnn_referee.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_referee.cpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/rnn_referee.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_referee.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/rnn_referee.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_referee.hpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/rnn_util.cpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_util.cpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/rnn_util.cpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_util.cpp diff --git a/src/tests_deprecated/functional/shared_tests/lstm/rnn_util.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_util.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/lstm/rnn_util.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/lstm/rnn_util.hpp diff --git a/src/tests_deprecated/functional/shared_tests/precomp.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/precomp.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/precomp.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/precomp.hpp diff --git a/src/tests_deprecated/functional/shared_tests/single_layer_tests/ti_tests.hpp b/src/plugins/intel_gna/tests/deprecated/functional/shared_tests/single_layer_tests/ti_tests.hpp similarity index 100% rename from src/tests_deprecated/functional/shared_tests/single_layer_tests/ti_tests.hpp rename to src/plugins/intel_gna/tests/deprecated/functional/shared_tests/single_layer_tests/ti_tests.hpp diff --git a/src/tests_deprecated/helpers/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/helpers/CMakeLists.txt similarity index 81% rename from src/tests_deprecated/helpers/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/helpers/CMakeLists.txt index 0aceb79c71c..93155838a37 100644 --- a/src/tests_deprecated/helpers/CMakeLists.txt +++ b/src/plugins/intel_gna/tests/deprecated/helpers/CMakeLists.txt @@ -25,19 +25,17 @@ function(add_helpers target_name) $ $ PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") - - set_property(TARGET ${target_name} PROPERTY COMPILE_PDB_NAME ${target_name}) - - # add_cpplint_target(${target_name}_cpplint FOR_TARGETS ${target_name}) endfunction() add_helpers(${TARGET_NAME}) -target_link_libraries(${TARGET_NAME} PUBLIC commonTestUtils) +target_link_libraries(${TARGET_NAME} PUBLIC commonTestUtils + PRIVATE inference_engine_legacy) add_helpers(${TARGET_NAME}_s USE_STATIC_IE) -target_link_libraries(${TARGET_NAME}_s PUBLIC commonTestUtils_s) +target_link_libraries(${TARGET_NAME}_s PUBLIC commonTestUtils_s + PRIVATE inference_engine_legacy_s) if (ENABLE_DATA) add_dependencies(${TARGET_NAME} data) diff --git a/src/plugins/intel_gna/tests/deprecated/helpers/cnnlayer_utils.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/cnnlayer_utils.hpp new file mode 100644 index 00000000000..c7b190f3d9f --- /dev/null +++ b/src/plugins/intel_gna/tests/deprecated/helpers/cnnlayer_utils.hpp @@ -0,0 +1,25 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include + +namespace CommonTestUtils { + +IE_SUPPRESS_DEPRECATED_START + +inline std::shared_ptr getLayerByName(const InferenceEngine::CNNNetwork& network, + const std::string& layerName) { + InferenceEngine::details::CNNNetworkIterator i(network), end; + while (i != end) { + auto layer = *i; + if (layer->name == layerName) + return layer; + ++i; + } + IE_THROW(NotFound) << "Layer " << layerName << " not found in network"; +} + +IE_SUPPRESS_DEPRECATED_END + +} // namespace CommonTestUtils diff --git a/src/tests_deprecated/helpers/common_layers_params.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/common_layers_params.cpp similarity index 100% rename from src/tests_deprecated/helpers/common_layers_params.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/common_layers_params.cpp diff --git a/src/tests_deprecated/helpers/common_layers_params.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/common_layers_params.hpp similarity index 100% rename from src/tests_deprecated/helpers/common_layers_params.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/common_layers_params.hpp diff --git a/src/tests_deprecated/helpers/ie_core_adapter.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/ie_core_adapter.cpp similarity index 100% rename from src/tests_deprecated/helpers/ie_core_adapter.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/ie_core_adapter.cpp diff --git a/src/tests_deprecated/helpers/ie_core_adapter.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/ie_core_adapter.hpp similarity index 100% rename from src/tests_deprecated/helpers/ie_core_adapter.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/ie_core_adapter.hpp diff --git a/src/tests_deprecated/helpers/single_layer_common.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/single_layer_common.cpp similarity index 100% rename from src/tests_deprecated/helpers/single_layer_common.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/single_layer_common.cpp diff --git a/src/tests_deprecated/helpers/single_layer_common.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/single_layer_common.hpp similarity index 100% rename from src/tests_deprecated/helpers/single_layer_common.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/single_layer_common.hpp diff --git a/src/tests_deprecated/helpers/test_model_path.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/test_model_path.cpp similarity index 100% rename from src/tests_deprecated/helpers/test_model_path.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/test_model_path.cpp diff --git a/src/tests_deprecated/helpers/test_model_path.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/test_model_path.hpp similarity index 100% rename from src/tests_deprecated/helpers/test_model_path.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/test_model_path.hpp diff --git a/src/tests_deprecated/helpers/test_model_repo.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/test_model_repo.hpp similarity index 100% rename from src/tests_deprecated/helpers/test_model_repo.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/test_model_repo.hpp diff --git a/src/tests_deprecated/helpers/tests_common.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/tests_common.cpp similarity index 100% rename from src/tests_deprecated/helpers/tests_common.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/tests_common.cpp diff --git a/src/tests_deprecated/helpers/tests_common.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/tests_common.hpp similarity index 100% rename from src/tests_deprecated/helpers/tests_common.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/tests_common.hpp diff --git a/src/tests_deprecated/helpers/tests_file_utils.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/tests_file_utils.cpp similarity index 100% rename from src/tests_deprecated/helpers/tests_file_utils.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/tests_file_utils.cpp diff --git a/src/tests_deprecated/helpers/tests_file_utils.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/tests_file_utils.hpp similarity index 100% rename from src/tests_deprecated/helpers/tests_file_utils.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/tests_file_utils.hpp diff --git a/src/tests_deprecated/helpers/version_printer.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/version_printer.cpp similarity index 100% rename from src/tests_deprecated/helpers/version_printer.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/version_printer.cpp diff --git a/src/tests_deprecated/helpers/xml_father.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/xml_father.hpp similarity index 100% rename from src/tests_deprecated/helpers/xml_father.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/xml_father.hpp diff --git a/src/tests_deprecated/helpers/xml_net_builder.cpp b/src/plugins/intel_gna/tests/deprecated/helpers/xml_net_builder.cpp similarity index 100% rename from src/tests_deprecated/helpers/xml_net_builder.cpp rename to src/plugins/intel_gna/tests/deprecated/helpers/xml_net_builder.cpp diff --git a/src/tests_deprecated/helpers/xml_net_builder.hpp b/src/plugins/intel_gna/tests/deprecated/helpers/xml_net_builder.hpp similarity index 100% rename from src/tests_deprecated/helpers/xml_net_builder.hpp rename to src/plugins/intel_gna/tests/deprecated/helpers/xml_net_builder.hpp diff --git a/src/tests_deprecated/readers/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/readers/CMakeLists.txt similarity index 100% rename from src/tests_deprecated/readers/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/readers/CMakeLists.txt diff --git a/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/CMakeLists.txt similarity index 92% rename from src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/CMakeLists.txt index dbcb5368a45..98c9a8275d9 100644 --- a/src/tests_deprecated/readers/ir_reader_v7/CMakeLists.txt +++ b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/CMakeLists.txt @@ -45,9 +45,6 @@ endif() 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(openvino PRIVATE ${TARGET_NAME}) endif() # code style diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_blob_proxy.hpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_blob_proxy.hpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_blob_proxy.hpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_blob_proxy.hpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.h b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.h similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.h rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.h diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_format_parser.cpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_format_parser.cpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_format_parser.cpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_format_parser.cpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_format_parser.h b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_format_parser.h similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_format_parser.h rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_format_parser.h diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_ir_itt.hpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_itt.hpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_ir_itt.hpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_itt.hpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_ir_parser.cpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_parser.cpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_ir_parser.cpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_parser.cpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_ir_parser.hpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_parser.hpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_ir_parser.hpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_parser.hpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_ir_reader.cpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_reader.cpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_ir_reader.cpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_reader.cpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_ir_reader.hpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_reader.hpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_ir_reader.hpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_ir_reader.hpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_layer_parsers.cpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_parsers.cpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_layer_parsers.cpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_parsers.cpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_layer_parsers.h b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_parsers.h similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_layer_parsers.h rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_parsers.h diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_layer_validators.cpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_validators.cpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_layer_validators.cpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_validators.cpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/ie_layer_validators.hpp b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_validators.hpp similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/ie_layer_validators.hpp rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/ie_layer_validators.hpp diff --git a/src/tests_deprecated/readers/ir_reader_v7/parsers.h b/src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/parsers.h similarity index 100% rename from src/tests_deprecated/readers/ir_reader_v7/parsers.h rename to src/plugins/intel_gna/tests/deprecated/readers/ir_reader_v7/parsers.h diff --git a/src/tests_deprecated/unit/CMakeLists.txt b/src/plugins/intel_gna/tests/deprecated/unit/CMakeLists.txt similarity index 96% rename from src/tests_deprecated/unit/CMakeLists.txt rename to src/plugins/intel_gna/tests/deprecated/unit/CMakeLists.txt index 959b2499c3e..ead07cc76ce 100644 --- a/src/tests_deprecated/unit/CMakeLists.txt +++ b/src/plugins/intel_gna/tests/deprecated/unit/CMakeLists.txt @@ -74,6 +74,10 @@ endif() target_compile_options(${TARGET_NAME} PRIVATE $<$: -Wno-error=inconsistent-missing-override >) target_compile_options(${TARGET_NAME} PRIVATE $<$: -Wno-error=inconsistent-missing-override >) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS -IGNORE:4286) +endif() + target_link_libraries(${TARGET_NAME} PRIVATE # static libraries inference_engine_s # need to have this explicitly for USE_STATIC_IE diff --git a/src/tests_deprecated/unit/engines/gna/I8_quantisation_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/I8_quantisation_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/I8_quantisation_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/I8_quantisation_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp diff --git a/src/tests_deprecated/unit/engines/gna/gna_api_stub.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_api_stub.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/gna_api_stub.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_api_stub.cpp diff --git a/src/tests_deprecated/unit/engines/gna/gna_matcher.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_matcher.cpp similarity index 99% rename from src/tests_deprecated/unit/engines/gna/gna_matcher.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_matcher.cpp index b2409c20e14..d3eb120c098 100644 --- a/src/tests_deprecated/unit/engines/gna/gna_matcher.cpp +++ b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_matcher.cpp @@ -377,7 +377,6 @@ void GNAPropagateMatcher :: match() { BlobMap input_blob_map; BlobMap output_blob_map; for (auto info : inputsInfo) { - size_t current_size = InferenceEngine::details::product(info.second->getTensorDesc().getDims()); input_blob_map[info.first] = input[info.first]; } size_t offset = 0; diff --git a/src/tests_deprecated/unit/engines/gna/gna_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/gna_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/gna_mock_api.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_mock_api.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/gna_mock_api.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_mock_api.hpp diff --git a/src/tests_deprecated/unit/engines/gna/gna_proc_type_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_proc_type_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/gna_proc_type_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/gna_proc_type_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/graph_tools/graph_copy_tests.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/graph_tools/graph_copy_tests.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/graph_tools/graph_copy_tests.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/graph_tools/graph_copy_tests.cpp diff --git a/src/tests_deprecated/unit/engines/gna/graph_tools/graph_test_base.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/graph_tools/graph_test_base.hpp similarity index 99% rename from src/tests_deprecated/unit/engines/gna/graph_tools/graph_test_base.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/graph_tools/graph_test_base.hpp index 0e02c96e60d..f49aa4c50d8 100644 --- a/src/tests_deprecated/unit/engines/gna/graph_tools/graph_test_base.hpp +++ b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/graph_tools/graph_test_base.hpp @@ -12,6 +12,7 @@ #include "unit_test_utils/mocks/mock_icnn_network.hpp" #include "common_test_utils/common_utils.hpp" +#include "cnnlayer_utils.hpp" namespace GraphTest { diff --git a/src/tests_deprecated/unit/engines/gna/graph_tools/graph_tools_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/graph_tools/graph_tools_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/graph_tools/graph_tools_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/graph_tools/graph_tools_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/i16_quantisation_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/i16_quantisation_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/gna_permute_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_permute_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/gna_permute_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_permute_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp diff --git a/src/tests_deprecated/unit/engines/gna/layers/permute_irs.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/permute_irs.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/layers/permute_irs.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/layers/permute_irs.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/conv_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/conv_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/conv_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/conv_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/copy_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/copy_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/copy_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/copy_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/diag_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/diag_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/diag_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/diag_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/fill_with_data.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/fill_with_data.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/fill_with_data.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/fill_with_data.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/input_data_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/input_data_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/input_data_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/input_data_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/nnet_base_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/nnet_base_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/nnet_base_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/nnet_base_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/pool_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/pool_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/pool_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/pool_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/precision_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/precision_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/precision_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/precision_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/pwl_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/pwl_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/pwl_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/pwl_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/pwl_quantization_metrics_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/pwl_quantization_metrics_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/pwl_quantization_metrics_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/pwl_quantization_metrics_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/matchers/weights_matcher.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/weights_matcher.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/matchers/weights_matcher.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/matchers/weights_matcher.hpp diff --git a/src/tests_deprecated/unit/engines/gna/test_irs.cpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/test_irs.cpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/test_irs.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/test_irs.cpp diff --git a/src/tests_deprecated/unit/engines/gna/test_irs.hpp b/src/plugins/intel_gna/tests/deprecated/unit/engines/gna/test_irs.hpp similarity index 100% rename from src/tests_deprecated/unit/engines/gna/test_irs.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/engines/gna/test_irs.hpp diff --git a/src/inference/tests/functional/cnn_ngraph_impl_tests.cpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/cnn_ngraph_impl_tests.cpp similarity index 99% rename from src/inference/tests/functional/cnn_ngraph_impl_tests.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/cnn_ngraph_impl_tests.cpp index 9872c651814..337d924f591 100644 --- a/src/inference/tests/functional/cnn_ngraph_impl_tests.cpp +++ b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/cnn_ngraph_impl_tests.cpp @@ -40,6 +40,7 @@ #include "common_test_utils/file_utils.hpp" #include "ie_precision.hpp" #include "transformations/rt_info/primitives_priority_attribute.hpp" +#include "cnnlayer_utils.hpp" using namespace testing; using namespace InferenceEngine; diff --git a/src/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp similarity index 100% rename from src/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp diff --git a/src/tests_deprecated/unit/inference_engine_tests/layer_transform_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/layer_transform_test.cpp similarity index 100% rename from src/tests_deprecated/unit/inference_engine_tests/layer_transform_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/layer_transform_test.cpp diff --git a/src/tests_deprecated/unit/inference_engine_tests/layers_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/layers_test.cpp similarity index 100% rename from src/tests_deprecated/unit/inference_engine_tests/layers_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/layers_test.cpp diff --git a/src/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_const_infer_test.cpp similarity index 99% rename from src/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_const_infer_test.cpp index fc51c818c07..4a73e6b0607 100644 --- a/src/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp +++ b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_const_infer_test.cpp @@ -20,6 +20,7 @@ #include #include #include "common_test_utils/common_utils.hpp" +#include "cnnlayer_utils.hpp" namespace IE = InferenceEngine; diff --git a/src/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_const_infer_test.hpp similarity index 100% rename from src/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_const_infer_test.hpp diff --git a/src/tests_deprecated/unit/inference_engine_tests/util_test.cpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_test.cpp similarity index 100% rename from src/tests_deprecated/unit/inference_engine_tests/util_test.cpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_test.cpp diff --git a/src/tests_deprecated/unit/inference_engine_tests/util_test.hpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_test.hpp similarity index 100% rename from src/tests_deprecated/unit/inference_engine_tests/util_test.hpp rename to src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/util_test.hpp diff --git a/src/plugins/intel_gna/tests/unit/CMakeLists.txt b/src/plugins/intel_gna/tests/unit/CMakeLists.txt index 3be542db88f..769f2d30a57 100644 --- a/src/plugins/intel_gna/tests/unit/CMakeLists.txt +++ b/src/plugins/intel_gna/tests/unit/CMakeLists.txt @@ -27,12 +27,16 @@ addIeTargetTest( gmock commonTestUtils_s openvino_intel_gna_plugin_test_static - engines_test_util + inference_engine_legacy_s ADD_CPPLINT LABELS GNA ) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS -IGNORE:4286) +endif() + if(SUGGEST_OVERRIDE_SUPPORTED) set_source_files_properties(gna_model_serial_test.cpp PROPERTIES COMPILE_OPTIONS -Wno-suggest-override) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 08a884f9e9c..009299dcc97 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -18,8 +18,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ie_add_compiler_flags(/wd4273) ie_add_compiler_flags(/wd4309) ie_add_compiler_flags(/wd4804) -endif() -if(NOT MSVC) +else() ie_add_compiler_flags(-Wno-missing-declarations) ie_add_compiler_flags(-Wno-sign-compare) ie_add_compiler_flags(-Wno-odr) diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/clamp_fq.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/clamp_fq.hpp index fdca0617719..6561a55a5ba 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/clamp_fq.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/clamp_fq.hpp @@ -9,7 +9,7 @@ namespace SubgraphTestsDefinitions { TEST_P(ClampFakeQuantizeSubgraphTest, CompareWithRefs) { -Run(); + Run(); } } // namespace SubgraphTestsDefinitions diff --git a/src/tests/functional/shared_test_classes/CMakeLists.txt b/src/tests/functional/shared_test_classes/CMakeLists.txt index b98d9e0caa2..2acaca26824 100644 --- a/src/tests/functional/shared_test_classes/CMakeLists.txt +++ b/src/tests/functional/shared_test_classes/CMakeLists.txt @@ -20,7 +20,6 @@ addIeTarget( PRIVATE funcTestUtils ngraphFunctions - inference_engine_legacy ) ie_faster_build(${TARGET_NAME} diff --git a/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp b/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp index 9b997dbf8c3..23ed252de17 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp @@ -5,8 +5,9 @@ #include "transformations/common_optimizations/conv_mul_fusion.hpp" #include "ngraph/pass/constant_folding.hpp" #include "shared_test_classes/subgraph/conv_eltwise_fusion.hpp" -#include -#include + +// #include +// #include namespace SubgraphTestsDefinitions { @@ -70,8 +71,8 @@ void ConvEltwiseFusion::SetUp() { manager.register_pass(); } else if (eltwise_type == ngraph::opset4::Add::get_type_info_static()) { eltwise = std::make_shared(conv, eltwise_const); - manager.register_pass(); - manager.register_pass(); + // manager.register_pass(); + // manager.register_pass(); } else { throw ngraph::ngraph_error("Unsupported type"); } diff --git a/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt index ef80b536d13..8686aaa72ec 100644 --- a/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt +++ b/src/tests/ie_test_utils/common_test_utils/CMakeLists.txt @@ -29,8 +29,6 @@ function(add_common_utils ADD_TARGET_NAME) # USE_STATIC_IE is passed if(ARGN) target_link_libraries(${ADD_TARGET_NAME} PRIVATE inference_engine_s) - else() - target_link_libraries(${ADD_TARGET_NAME} PRIVATE inference_engine_legacy) endif() ie_faster_build(${ADD_TARGET_NAME} @@ -58,7 +56,6 @@ function(add_common_utils ADD_TARGET_NAME) PUBLIC $ PRIVATE - $ $) target_include_directories(${ADD_TARGET_NAME} SYSTEM PUBLIC ${IE_TESTS_ROOT}/ie_test_utils) diff --git a/src/tests/ie_test_utils/common_test_utils/common_utils.cpp b/src/tests/ie_test_utils/common_test_utils/common_utils.cpp index 54356be6d22..41d4f840127 100644 --- a/src/tests/ie_test_utils/common_test_utils/common_utils.cpp +++ b/src/tests/ie_test_utils/common_test_utils/common_utils.cpp @@ -7,27 +7,10 @@ #include #include -#include #include namespace CommonTestUtils { -IE_SUPPRESS_DEPRECATED_START - -std::shared_ptr getLayerByName(const InferenceEngine::CNNNetwork& network, - const std::string& layerName) { - InferenceEngine::details::CNNNetworkIterator i(network), end; - while (i != end) { - auto layer = *i; - if (layer->name == layerName) - return layer; - ++i; - } - IE_THROW(NotFound) << "Layer " << layerName << " not found in network"; -} - -IE_SUPPRESS_DEPRECATED_END - std::ostream& operator<<(std::ostream& os, OpType type) { switch (type) { case OpType::SCALAR: diff --git a/src/tests/ie_test_utils/common_test_utils/common_utils.hpp b/src/tests/ie_test_utils/common_test_utils/common_utils.hpp index 6f263149a50..2db03ad813f 100644 --- a/src/tests/ie_test_utils/common_test_utils/common_utils.hpp +++ b/src/tests/ie_test_utils/common_test_utils/common_utils.hpp @@ -27,11 +27,6 @@ enum class OpType { SCALAR, VECTOR }; std::ostream& operator<<(std::ostream& os, OpType type); -IE_SUPPRESS_DEPRECATED_START -std::shared_ptr getLayerByName(const InferenceEngine::CNNNetwork& network, - const std::string& layerName); -IE_SUPPRESS_DEPRECATED_END - template inline std::string vec2str(const std::vector& vec) { if (!vec.empty()) { diff --git a/src/tests/ie_test_utils/common_test_utils/tests/CMakeLists.txt b/src/tests/ie_test_utils/common_test_utils/tests/CMakeLists.txt index 95ed4ff033a..57d8a6bfb81 100644 --- a/src/tests/ie_test_utils/common_test_utils/tests/CMakeLists.txt +++ b/src/tests/ie_test_utils/common_test_utils/tests/CMakeLists.txt @@ -1,3 +1,7 @@ +# Copyright (C) 2018-2023 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + set(TARGET_NAME commonUtilsTests) addIeTargetTest( @@ -8,4 +12,4 @@ addIeTargetTest( LINK_LIBRARIES commonTestUtils ADD_CPPLINT -) \ No newline at end of file +) diff --git a/src/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/src/tests/ie_test_utils/unit_test_utils/CMakeLists.txt index 86a87d239c4..c99a67859c0 100644 --- a/src/tests/ie_test_utils/unit_test_utils/CMakeLists.txt +++ b/src/tests/ie_test_utils/unit_test_utils/CMakeLists.txt @@ -22,7 +22,4 @@ addIeTarget( commonTestUtils_s inference_engine_s gmock - INCLUDES - PRIVATE - $ ) diff --git a/src/tests/ie_test_utils/unit_test_utils/mock.cpp b/src/tests/ie_test_utils/unit_test_utils/mock.cpp index f9c60870761..81a946e499d 100644 --- a/src/tests/ie_test_utils/unit_test_utils/mock.cpp +++ b/src/tests/ie_test_utils/unit_test_utils/mock.cpp @@ -21,17 +21,11 @@ #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_ivariable_state_internal.hpp" #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinference_plugin.hpp" -#include - using namespace InferenceEngine; void MockNotEmptyICNNNetwork::getOutputsInfo(OutputsDataMap& out) const noexcept { IE_SUPPRESS_DEPRECATED_START auto data = std::make_shared(MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME, Precision::UNSPECIFIED); - getInputTo(data)[""] = std::make_shared(LayerParams{ - MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME, - "FullyConnected", - Precision::FP32 }); out[MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME] = data; IE_SUPPRESS_DEPRECATED_END } @@ -41,11 +35,6 @@ void MockNotEmptyICNNNetwork::getInputsInfo(InputsDataMap &inputs) const noexcep auto inputInfo = std::make_shared(); auto inData = std::make_shared(MockNotEmptyICNNNetwork::INPUT_BLOB_NAME, Precision::UNSPECIFIED); - auto inputLayer = std::make_shared(LayerParams{ - MockNotEmptyICNNNetwork::INPUT_BLOB_NAME, - "Input", - Precision::FP32 }); - getInputTo(inData)[MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME] = inputLayer; inData->setDims(MockNotEmptyICNNNetwork::INPUT_DIMENSIONS); inData->setLayout(Layout::NCHW); inputInfo->setInputData(inData); @@ -53,12 +42,6 @@ void MockNotEmptyICNNNetwork::getInputsInfo(InputsDataMap &inputs) const noexcep auto outData = std::make_shared(MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME, Precision::UNSPECIFIED); outData->setDims(MockNotEmptyICNNNetwork::OUTPUT_DIMENSIONS); outData->setLayout(Layout::NCHW); - getInputTo(outData)[""] = std::make_shared(LayerParams{ - MockNotEmptyICNNNetwork::OUTPUT_BLOB_NAME, - "FullyConnected", - Precision::FP32 }); - - inputLayer->outData.push_back(outData); inputs[MockNotEmptyICNNNetwork::INPUT_BLOB_NAME] = inputInfo; IE_SUPPRESS_DEPRECATED_END @@ -75,6 +58,7 @@ std::shared_ptr MockNotEmptyICNNNetwork::getFunction() noexcep results.push_back(std::make_shared(relu)); return std::make_shared(results, parameters, "empty_function"); } + std::shared_ptr MockNotEmptyICNNNetwork::getFunction() const noexcept { ngraph::ParameterVector parameters; parameters.push_back(std::make_shared( diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt b/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt index 5e52a734daa..2150a80e8fa 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt @@ -19,7 +19,6 @@ addIeTarget( PRIVATE ngraphFunctions openvino::runtime::dev - inference_engine_legacy ADD_CPPLINT DEPENDENCIES ngraphFunctions