From 7a1cd37b9db5b31b36ef1ae646bdedebdfbac261 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 14 Mar 2024 22:45:28 +0400 Subject: [PATCH] Deleted InferenceEngineDeveloperPackageConfig.cmake generation (#22926) ### Details: - Deleted InferenceEngineDeveloperPackageConfig.cmake generation --- .github/workflows/code_style.yml | 5 ----- .github/workflows/coverage.yml | 1 - .github/workflows/mac.yml | 1 - .github/workflows/mac_arm64.yml | 1 - cmake/extra_modules.cmake | 15 +++++---------- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml index 585ee997e3b..4e5514a8d0e 100644 --- a/.github/workflows/code_style.yml +++ b/.github/workflows/code_style.yml @@ -20,11 +20,6 @@ jobs: sudo apt update sudo apt --assume-yes install clang-format-9 - - name: Install dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r ./src/bindings/python/requirements.txt - # Run cmake with -DENABLE_PROFILING_ITT=ON -DSELECTIVE_BUILD=COLLECT in order to enable codestyle check for ITT collector - name: CMake configure run: cmake -DENABLE_PYTHON=ON -DENABLE_TESTS=ON -DENABLE_PROFILING_ITT=ON -DSELECTIVE_BUILD=COLLECT -B build diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 9e38183cf18..23135222f02 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -40,7 +40,6 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install -r ${{ github.workspace }}/src/bindings/python/wheel/requirements-dev.txt - python3 -m pip install -r ${{ github.workspace }}/src/bindings/python/requirements.txt # For running Paddle frontend unit tests python3 -m pip install -r ${{ github.workspace }}/src/frontends/paddle/tests/requirements.txt # For running ONNX frontend unit tests diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index f727575a977..1ee2c30c8ea 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -115,7 +115,6 @@ jobs: run: | # For Python API python3 -m pip install -r ${{ env.OPENVINO_REPO }}/src/bindings/python/wheel/requirements-dev.txt - python3 -m pip install -r ${{ env.OPENVINO_REPO }}/src/bindings/python/requirements.txt # For running ONNX frontend unit tests python3 -m pip install --force-reinstall -r ${{ env.OPENVINO_REPO }}/src/frontends/onnx/tests/requirements.txt diff --git a/.github/workflows/mac_arm64.yml b/.github/workflows/mac_arm64.yml index 4babf69f4ad..f270dccfb82 100644 --- a/.github/workflows/mac_arm64.yml +++ b/.github/workflows/mac_arm64.yml @@ -114,7 +114,6 @@ jobs: run: | # For Python API python3 -m pip install -r ${{ env.OPENVINO_REPO }}/src/bindings/python/wheel/requirements-dev.txt - python3 -m pip install -r ${{ env.OPENVINO_REPO }}/src/bindings/python/requirements.txt # For running ONNX frontend unit tests python3 -m pip install --force-reinstall -r ${{ env.OPENVINO_REPO }}/src/frontends/onnx/tests/requirements.txt diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake index c38df4610d1..7b2839ba2ce 100644 --- a/cmake/extra_modules.cmake +++ b/cmake/extra_modules.cmake @@ -103,30 +103,25 @@ endfunction() # function(_ov_register_extra_modules) - set(InferenceEngineDeveloperPackage_DIR "${CMAKE_CURRENT_BINARY_DIR}/build-modules") set(OpenVINODeveloperPackage_DIR "${CMAKE_BINARY_DIR}/build-modules") set(OpenVINO_DIR "${CMAKE_BINARY_DIR}") function(_ov_generate_fake_developer_package NS) - if(NS STREQUAL "openvino") - set(devconfig_file "${OpenVINODeveloperPackage_DIR}/OpenVINODeveloperPackageConfig.cmake") - else() - set(devconfig_file "${InferenceEngineDeveloperPackage_DIR}/InferenceEngineDeveloperPackageConfig.cmake") - endif() + set(devconfig_file "${OpenVINODeveloperPackage_DIR}/OpenVINODeveloperPackageConfig.cmake") file(REMOVE "${devconfig_file}") file(WRITE "${devconfig_file}" "\# !! AUTOGENERATED: DON'T EDIT !!\n\n") foreach(exported_target IN LISTS _OPENVINO_DEVELOPER_PACKAGE_TARGETS) - file(APPEND "${devconfig_file}" "if(NOT TARGET ${NS}::${exported_target}) - add_library(${NS}::${exported_target} ALIAS ${exported_target}) + string(REPLACE "openvino_" "" exported_target_clean_name "${exported_target}") + + file(APPEND "${devconfig_file}" "if(NOT TARGET openvino::${exported_target_clean_name}) + add_library(${NS}::${exported_target_clean_name} ALIAS ${exported_target}) endif()\n") endforeach() endfunction() _ov_generate_fake_developer_package("openvino") - # TODO: remove with API 1.0 removal - _ov_generate_fake_developer_package("IE") # detect where OPENVINO_EXTRA_MODULES contains folders with CMakeLists.txt # other folders are supposed to have sub-folders with CMakeLists.txt