From 18cc7cefd036c37adac215bac01d0202ca4a4ceb Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 28 Mar 2024 20:52:47 +0400 Subject: [PATCH] Use only Java API, Custom ops in contrib build (#23706) ### Details: - Use only Java API, Custom ops in contrib build - It will allow avoid breaking GHA pipelines with some changes in Contrib repo Co-authored-by: Alina Kladieva --- .github/workflows/coverity.yml | 2 -- .github/workflows/linux.yml | 3 +-- .github/workflows/linux_arm64.yml | 3 +-- .github/workflows/mac.yml | 4 +--- .github/workflows/mac_arm64.yml | 4 +--- .github/workflows/windows.yml | 16 +--------------- 6 files changed, 5 insertions(+), 27 deletions(-) diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 9976078295a..7d7a2d9faec 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -87,9 +87,7 @@ jobs: -DENABLE_CPPLINT=OFF \ -DENABLE_STRICT_DEPENDENCIES=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DBUILD_nvidia_plugin=OFF \ -DENABLE_FASTER_BUILD=OFF \ - -DOPENVINO_EXTRA_MODULES=${OPENVINO_CONTRIB_REPO}/modules \ -S ${OPENVINO_REPO} \ -B ${BUILD_DIR} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c26182fd718..d89d187930b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -223,9 +223,8 @@ jobs: - name: Cmake & Build - OpenVINO Contrib run: | cmake \ - -DBUILD_nvidia_plugin=OFF \ -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" \ - -DOPENVINO_EXTRA_MODULES=${OPENVINO_CONTRIB_REPO}/modules \ + -DOPENVINO_EXTRA_MODULES="${OPENVINO_CONTRIB_REPO}/modules/java_api;${OPENVINO_CONTRIB_REPO}/modules/custom_operations" \ -S ${OPENVINO_REPO} \ -B ${BUILD_DIR} cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml index 32a2147a2b2..3fbe11b4ad2 100644 --- a/.github/workflows/linux_arm64.yml +++ b/.github/workflows/linux_arm64.yml @@ -228,9 +228,8 @@ jobs: - name: Cmake & Build - OpenVINO Contrib run: | cmake \ - -DBUILD_nvidia_plugin=OFF \ -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" \ - -DOPENVINO_EXTRA_MODULES=${OPENVINO_CONTRIB_REPO}/modules \ + -DOPENVINO_EXTRA_MODULES="${OPENVINO_CONTRIB_REPO}/modules/java_api;${OPENVINO_CONTRIB_REPO}/modules/custom_operations" \ -S ${OPENVINO_REPO} \ -B ${BUILD_DIR} cmake --build ${BUILD_DIR} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 1ee2c30c8ea..6331aaae61a 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -180,10 +180,8 @@ jobs: - name: Cmake & Build - OpenVINO Contrib run: | cmake \ - -DBUILD_nvidia_plugin=OFF \ - -DBUILD_java_api=OFF \ -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" \ - -DOPENVINO_EXTRA_MODULES=${{ env.OPENVINO_CONTRIB_REPO }}/modules \ + -DOPENVINO_EXTRA_MODULES=${{ env.OPENVINO_CONTRIB_REPO }}/modules/custom_operations \ -S ${{ env.OPENVINO_REPO }} \ -B ${{ env.BUILD_DIR }} cmake --build ${{ env.BUILD_DIR }} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} diff --git a/.github/workflows/mac_arm64.yml b/.github/workflows/mac_arm64.yml index f270dccfb82..b816d5e6a4d 100644 --- a/.github/workflows/mac_arm64.yml +++ b/.github/workflows/mac_arm64.yml @@ -179,10 +179,8 @@ jobs: - name: Cmake & Build - OpenVINO Contrib run: | cmake \ - -DBUILD_nvidia_plugin=OFF \ - -DBUILD_java_api=OFF \ -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" \ - -DOPENVINO_EXTRA_MODULES=${{ env.OPENVINO_CONTRIB_REPO }}/modules \ + -DOPENVINO_EXTRA_MODULES=${{ OPENVINO_CONTRIB_REPO }}/modules/custom_operations \ -S ${{ env.OPENVINO_REPO }} \ -B ${{ env.BUILD_DIR }} cmake --build ${{ env.BUILD_DIR }} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8586ab0cdb2..f75208e0217 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -149,7 +149,6 @@ jobs: run: | cmake -G "${{ env.CMAKE_GENERATOR }}" ` -DENABLE_CPPLINT=OFF ` - -DBUILD_nvidia_plugin=OFF ` -DBUILD_SHARED_LIBS=ON ` -DENABLE_TESTS=ON ` -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ` @@ -157,7 +156,7 @@ jobs: -DENABLE_PYTHON=ON ` -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON ` -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" ` - -DOPENVINO_EXTRA_MODULES=${{ env.OPENVINO_CONTRIB_REPO }}/modules ` + -DOPENVINO_EXTRA_MODULES="${{ env.OPENVINO_CONTRIB_REPO }}/modules/custom_operations;${{ env.OPENVINO_CONTRIB_REPO }}/modules/java_api" ` -S ${{ env.OPENVINO_REPO }} ` -B ${{ env.BUILD_DIR }} @@ -207,24 +206,11 @@ jobs: } Compress-Archive @compress - - name: Cmake & Build - OpenVINO Contrib - if: ${{ 'false' }} # Ticket: 122441 - run: | - cmake ` - -DBUILD_nvidia_plugin=OFF ` - -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" ` - -DOPENVINO_EXTRA_MODULES=${{ env.OPENVINO_CONTRIB_REPO }}/modules ` - -S ${{ env.OPENVINO_REPO }} ` - -B ${{ env.BUILD_DIR }} - cmake --build ${{ env.BUILD_DIR }} --parallel --config ${{ env.CMAKE_BUILD_TYPE }} --verbose - - name: CMake configure, build and install - OpenVINO JS API if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API run: cmake -DCPACK_GENERATOR=NPM -DENABLE_SYSTEM_TBB=OFF -UTBB* -S ${{ env.OPENVINO_REPO }} -B ${{ env.BUILD_DIR }} - cmake --build ${{ env.BUILD_DIR }} --parallel - cmake -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR_JS }} -P ${{ env.BUILD_DIR }}/cmake_install.cmake #