From 45e71796c614f4fc55e06167d544eaeaa45998ed Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 15 Jun 2024 20:44:04 +0400 Subject: [PATCH] Use ZIP cpack generator on Windows (#25042) ### Details: - *item1* - *...* ### Tickets: - *ticket-id* --- .github/workflows/job_tokenizers.yml | 16 ++-------------- cmake/developer_package/features.cmake | 6 +++++- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/job_tokenizers.yml b/.github/workflows/job_tokenizers.yml index 684abf8e026a45..fbe5b97a1ea520 100644 --- a/.github/workflows/job_tokenizers.yml +++ b/.github/workflows/job_tokenizers.yml @@ -92,15 +92,6 @@ jobs: Expand-Archive openvino_package.zip -DestinationPath "${{ env.INSTALL_DIR }}" popd - # - # Dependencies - # - - - name: Install python dependencies - run: | - # wheel packaging - python3 -m pip install -r ${{ env.OPENVINO_TOKENIZERS_REPO }}/requirements-build.txt - # # Build # @@ -109,19 +100,16 @@ jobs: if: runner.os != 'Windows' run: | source ${INSTALL_DIR}/setupvars.sh - python -m build --wheel --outdir ${EXTENSION_BUILD_DIR} ${OPENVINO_TOKENIZERS_REPO} + python -m pip wheel -v --no-deps --wheel-dir ${EXTENSION_BUILD_DIR} ${OPENVINO_TOKENIZERS_REPO} env: - CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' - CMAKE_GENERATOR: 'Unix Makefiles' - name: Build tokenizers wheel (Windows) if: runner.os == 'Windows' run: | . "${{ env.INSTALL_DIR }}/setupvars.ps1" - python3 -m build --wheel --outdir ${env:EXTENSION_BUILD_DIR} ${env:OPENVINO_TOKENIZERS_REPO} + python3 -m pip wheel -v --no-deps --wheel-dir ${env:EXTENSION_BUILD_DIR} ${env:OPENVINO_TOKENIZERS_REPO} env: - CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' # diff --git a/cmake/developer_package/features.cmake b/cmake/developer_package/features.cmake index cbe343f208f4b7..d2fdcd4cf12049 100644 --- a/cmake/developer_package/features.cmake +++ b/cmake/developer_package/features.cmake @@ -5,7 +5,11 @@ include(options) include(target_flags) -set (CPACK_GENERATOR "TGZ" CACHE STRING "Cpack generator for OpenVINO") +if(WIN32) + set (CPACK_GENERATOR "ZIP" CACHE STRING "Cpack generator for OpenVINO") +else() + set (CPACK_GENERATOR "TGZ" CACHE STRING "Cpack generator for OpenVINO") +endif() ov_dependent_option (ENABLE_LTO "Enable Link Time Optimization" OFF "LINUX;NOT ARM;CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9" OFF)