From be12544ba3999be4446cdddacb93868e4cbfbbd5 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Wed, 19 Mar 2025 15:36:36 +0100 Subject: [PATCH 01/17] [GHA] Save Linux artifacts to cloud share --- .github/workflows/linux.yml | 61 ++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4861d95e78..915809c287 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,6 +27,10 @@ env: HF_HOME: /mount/caches/huggingface GENAI_ARCHIVE_NAME: genai.tar.gz GENAI_SAMPLES_NAME: genai_samples.tar.gz + ARTIFACTS_SHARE: '/mount/build-artifacts' + BASE_PRODUCT_TYPE: public_linux_ubuntu_22_04_x86_64 + GENAI_WHEELS_ARTIFACT_NAME: 'genai_wheels' + GENAI_ARCHIVE_ARTIFACT_BASE_NAME: 'genai_archive' jobs: openvino_download: @@ -97,6 +101,7 @@ jobs: INSTALL_TESTS_DIR: ${{ github.workspace }}/tests BUILD_DIR: ${{ github.workspace }}/build SRC_DIR: ${{ github.workspace }}/src + MANIFEST_PATH: ${{ github.workspace }}/manifest.yml steps: - name: Clone openvino.genai @@ -105,6 +110,17 @@ jobs: path: ${{ env.SRC_DIR }} submodules: recursive + - name: Generate product manifest + id: create_manifest + uses: openvinotoolkit/openvino/.github/actions/create_manifest@master + with: + repos: | + ${{ env.SRC_DIR }} + product_type: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }}) + target_arch: 'x86_64' + build_type: ${{ matrix.build-type }} + save_to: ${{ env.MANIFEST_PATH }} + - name: Download OpenVINO package uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: @@ -149,6 +165,14 @@ jobs: path: ${{ env.INSTALL_TESTS_DIR }} if-no-files-found: 'error' + - name: Upload manifest + if: ${{ always() }} + uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 + with: + name: manifest_${{ matrix.build-type }} + path: ${{ env.MANIFEST_PATH }} + if-no-files-found: 'error' + genai_build_wheel: name: Build Wheel needs: [ openvino_download ] @@ -208,10 +232,45 @@ jobs: if: ${{ always() }} uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: - name: genai_wheels + name: ${{ env.GENAI_WHEELS_ARTIFACT_NAME }} path: ${{ env.INSTALL_DIR }} if-no-files-found: 'error' + store_artifacts: + name: Store build artifacts + strategy: + matrix: + build_type: [Release] + needs: [openvino_download, genai_build_wheel, genai_build_cmake] + timeout-minutes: 10 + defaults: + run: + shell: bash + runs-on: aks-linux-2-cores-8gb + container: + image: openvinogithubactions.azurecr.io/library/python:3.12-slim + volumes: + - /mount:/mount + - ${{ github.workspace }}:${{ github.workspace }} + env: + CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.tar.gz + WHEEL_PACKAGE: ${{ github.workspace }}/wheels + MANIFEST_PATH: ${{ github.workspace }}/manifest.yml + + steps: + - name: Download genai package & manifest + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + with: + pattern: "{${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build_type }},manifest_${{ matrix.build_type }}}" + path: ${{ github.workspace }} + merge-multiple: true + + - name: Download genai wheels + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + with: + name: ${{ env.GENAI_WHEELS_ARTIFACT_NAME }} + path: ${{ env.WHEEL_PACKAGE }} + genai_build_samples: name: Build Samples - ${{ matrix.build-type }} strategy: From c8481831f08f1e207bb7bbaca309cab817955e52 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Wed, 19 Mar 2025 15:50:32 +0100 Subject: [PATCH 02/17] [GHA] Save Windows artifacts to cloud share --- .github/workflows/windows.yml | 59 +++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 656054ee64..4da4f51822 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,6 +22,10 @@ env: CMAKE_CXX_COMPILER_LAUNCHER: ccache CMAKE_C_COMPILER_LAUNCHER: ccache CCACHE_MAXSIZE: 500Mi + ARTIFACTS_SHARE: '/mount/build-artifacts' + BASE_PRODUCT_TYPE: public_windows_vs2022 + GENAI_WHEELS_ARTIFACT_NAME: 'genai_wheels' + GENAI_ARCHIVE_ARTIFACT_BASE_NAME: 'genai_cpack' jobs: openvino_download: @@ -70,6 +74,7 @@ jobs: SRC_DIR: ${{ github.workspace }}\src\genai BUILD_DIR: ${{ github.workspace }}\build\genai CCACHE_DIR: ${{ github.workspace }}\ccache + MANIFEST_PATH: ${{ github.workspace }}\manifest.yml steps: - name: Clone genai @@ -83,6 +88,17 @@ jobs: with: python-version: ${{ env.PYTHON_VERSION }} + - name: Generate product manifest + id: create_manifest + uses: openvinotoolkit/openvino/.github/actions/create_manifest@master + with: + repos: | + ${{ env.SRC_DIR }} + product_type: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }} + target_arch: 'x86_64' + build_type: ${{ matrix.build-type }} + save_to: ${{ env.MANIFEST_PATH }} + - name: Download OpenVINO package uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: @@ -174,6 +190,14 @@ jobs: name: genai_tests_${{ matrix.build-type }} path: ${{ env.INSTALL_TESTS_DIR }} if-no-files-found: 'error' + + - name: Upload manifest + if: ${{ always() }} + uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 + with: + name: manifest_${{ matrix.build-type }} + path: ${{ env.MANIFEST_PATH }} + if-no-files-found: 'error' genai_build_wheel: name: genai wheel @@ -280,6 +304,41 @@ jobs: path: ${{ env.INSTALL_DIR }} if-no-files-found: 'error' + store_artifacts: + name: Store build artifacts + strategy: + matrix: + build_type: [Release] + needs: [openvino_download, genai_build_wheel, genai_build_cpack] + timeout-minutes: 10 + defaults: + run: + shell: bash + runs-on: aks-linux-2-cores-8gb + container: + image: openvinogithubactions.azurecr.io/library/python:3.12-slim + volumes: + - /mount:/mount + - ${{ github.workspace }}:${{ github.workspace }} + env: + CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.zip + WHEEL_PACKAGE: ${{ github.workspace }}/wheels + MANIFEST_PATH: ${{ github.workspace }}/manifest.yml + + steps: + - name: Download genai package & manifest + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + with: + pattern: "{${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }},manifest_${{ matrix.build-type }}}" + path: ${{ github.workspace }} + merge-multiple: true + + - name: Download genai wheels + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + with: + name: ${{ env.GENAI_WHEELS_ARTIFACT_NAME }} + path: ${{ env.WHEEL_PACKAGE }} + genai_build_samples: name: Build Samples - ${{ matrix.build-type }} strategy: From 8905b6b706362d291488776de5d4e4177522a407 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Wed, 19 Mar 2025 16:13:32 +0100 Subject: [PATCH 03/17] Add missing step --- .github/workflows/linux.yml | 12 ++++++++++++ .github/workflows/windows.yml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 915809c287..eba92297c3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -271,6 +271,18 @@ jobs: name: ${{ env.GENAI_WHEELS_ARTIFACT_NAME }} path: ${{ env.WHEEL_PACKAGE }} + - name: Store ${{ matrix.build_type }} artifacts to a shared drive + id: store_artifacts + if: ${{ always() }} + uses: openvinotoolkit/openvino/.github/actions/store_artifacts@master + with: + artifacts: | + ${{ env.CPACK_PACKAGE }} + ${{ env.WHEEL_PACKAGE }} + ${{ env.MANIFEST_PATH }} + storage_dir: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }} + storage_root: ${{ env.ARTIFACTS_SHARE }} + genai_build_samples: name: Build Samples - ${{ matrix.build-type }} strategy: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4da4f51822..355ac70df4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -339,6 +339,18 @@ jobs: name: ${{ env.GENAI_WHEELS_ARTIFACT_NAME }} path: ${{ env.WHEEL_PACKAGE }} + - name: Store ${{ matrix.build_type }} artifacts to a shared drive + id: store_artifacts + if: ${{ always() }} + uses: openvinotoolkit/openvino/.github/actions/store_artifacts@master + with: + artifacts: | + ${{ env.CPACK_PACKAGE }} + ${{ env.WHEEL_PACKAGE }} + ${{ env.MANIFEST_PATH }} + storage_dir: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }} + storage_root: ${{ env.ARTIFACTS_SHARE }} + genai_build_samples: name: Build Samples - ${{ matrix.build-type }} strategy: From 1ca5336d6614422daeace24a8945f9314bcafc9e Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Wed, 19 Mar 2025 16:53:10 +0100 Subject: [PATCH 04/17] Fix build-type --- .github/workflows/linux.yml | 2 +- .github/workflows/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index eba92297c3..8e677c74f4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -240,7 +240,7 @@ jobs: name: Store build artifacts strategy: matrix: - build_type: [Release] + build-type: [Release] needs: [openvino_download, genai_build_wheel, genai_build_cmake] timeout-minutes: 10 defaults: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 355ac70df4..8c36ba13d2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -308,7 +308,7 @@ jobs: name: Store build artifacts strategy: matrix: - build_type: [Release] + build-type: [Release] needs: [openvino_download, genai_build_wheel, genai_build_cpack] timeout-minutes: 10 defaults: From ad4fbf1b73d45a367e79d64c7a0a1c2f5425970b Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Wed, 19 Mar 2025 20:33:57 +0100 Subject: [PATCH 05/17] Fixes for cpack --- .github/workflows/linux.yml | 20 ++++++++++++++++---- .github/workflows/windows.yml | 34 ++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8e677c74f4..5f38ef623d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -116,7 +116,7 @@ jobs: with: repos: | ${{ env.SRC_DIR }} - product_type: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }}) + product_type: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }} target_arch: 'x86_64' build_type: ${{ matrix.build-type }} save_to: ${{ env.MANIFEST_PATH }} @@ -253,17 +253,29 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: + CPACK_PATH: ${{ github.workspace }}/ov_genai CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.tar.gz WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml steps: - - name: Download genai package & manifest + - name: Download genai package uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: - pattern: "{${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build_type }},manifest_${{ matrix.build_type }}}" + name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} + path: ${{ env.CPACK_PATH }} + + - name: Pack Artifacts + run: | + pushd ${CPACK_PATH} + tar -czvf ${CPACK_PACKAGE} * + popd + + - name: Download manifest + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + with: + name: manifest_${{ matrix.build-type }} path: ${{ github.workspace }} - merge-multiple: true - name: Download genai wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8c36ba13d2..54d4775c6d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -159,6 +159,16 @@ jobs: # # Upload build artifacts # + + - name: Pack Artifacts + run: | + $file=Get-ChildItem -Path "${{ GENAI_INSTALL_DIR }}" + $compress = @{ + Path = $file + CompressionLevel = "Optimal" + DestinationPath = "${{ env.BUILD_DIR }}/${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}.zip" + } + Compress-Archive @compress - name: Save ccache if: always() && steps.ccache-restore.outputs.cache-hit != 'true' && github.event_name == 'push' @@ -172,9 +182,9 @@ jobs: uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: genai_cpack_${{ matrix.build-type }} - path: ${{ env.GENAI_INSTALL_DIR }} + path: ${{ env.BUILD_DIR }}/*.zip if-no-files-found: 'error' - + - name: Upload Tools if: always() uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 @@ -182,7 +192,7 @@ jobs: name: genai_tools_${{ matrix.build-type }} path: ${{ env.INSTALL_TOOLS_DIR }} if-no-files-found: 'error' - + - name: Upload Tests if: always() uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 @@ -321,17 +331,29 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: + CPACK_PATH: ${{ github.workspace }}/ov_genai CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.zip WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml steps: - - name: Download genai package & manifest + - name: Download genai package uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: - pattern: "{${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }},manifest_${{ matrix.build-type }}}" + name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} + path: ${{ env.CPACK_PATH }} + + - name: Pack Artifacts + run: | + pushd ${CPACK_PATH} + tar -czvf ${CPACK_PACKAGE} * + popd + + - name: Download manifest + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + with: + name: manifest_${{ matrix.build-type }} path: ${{ github.workspace }} - merge-multiple: true - name: Download genai wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 From f517b887973c93f0aaf2c866ac08861f7ea4d90c Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Wed, 19 Mar 2025 20:58:15 +0100 Subject: [PATCH 06/17] Fixes for wheels --- .github/workflows/linux.yml | 11 +++-------- .github/workflows/windows.yml | 13 ++++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5f38ef623d..435512ae71 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -271,17 +271,12 @@ jobs: tar -czvf ${CPACK_PACKAGE} * popd - - name: Download manifest + - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: - name: manifest_${{ matrix.build-type }} + pattern: '{${{ env.GENAI_WHEELS_ARTIFACT_NAME }},manifest_${{ matrix.build-type }}}' path: ${{ github.workspace }} - - - name: Download genai wheels - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 - with: - name: ${{ env.GENAI_WHEELS_ARTIFACT_NAME }} - path: ${{ env.WHEEL_PACKAGE }} + merge-multiple: true - name: Store ${{ matrix.build_type }} artifacts to a shared drive id: store_artifacts diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 54d4775c6d..7421087b63 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -162,7 +162,7 @@ jobs: - name: Pack Artifacts run: | - $file=Get-ChildItem -Path "${{ GENAI_INSTALL_DIR }}" + $file=Get-ChildItem -Path "${{ env.GENAI_INSTALL_DIR }}" $compress = @{ Path = $file CompressionLevel = "Optimal" @@ -349,17 +349,12 @@ jobs: tar -czvf ${CPACK_PACKAGE} * popd - - name: Download manifest + - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: - name: manifest_${{ matrix.build-type }} + pattern: '{${{ env.GENAI_WHEELS_ARTIFACT_NAME }},manifest_${{ matrix.build-type }}}' path: ${{ github.workspace }} - - - name: Download genai wheels - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 - with: - name: ${{ env.GENAI_WHEELS_ARTIFACT_NAME }} - path: ${{ env.WHEEL_PACKAGE }} + merge-multiple: true - name: Store ${{ matrix.build_type }} artifacts to a shared drive id: store_artifacts From 06049ec039004f805aabab4414b200165527ca64 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Sun, 23 Mar 2025 20:14:51 +0100 Subject: [PATCH 07/17] Align structure with tokenizers --- .github/workflows/linux.yml | 7 ++----- .github/workflows/windows.yml | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 435512ae71..ed24f1f9be 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -253,7 +253,6 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: - CPACK_PATH: ${{ github.workspace }}/ov_genai CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.tar.gz WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml @@ -263,13 +262,11 @@ jobs: uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} - path: ${{ env.CPACK_PATH }} + path: ${{ github.workspace }}/ov_genai - name: Pack Artifacts run: | - pushd ${CPACK_PATH} - tar -czvf ${CPACK_PACKAGE} * - popd + tar -czvf ${CPACK_PACKAGE} ov_genai - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7421087b63..bc24f78a99 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -331,7 +331,6 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: - CPACK_PATH: ${{ github.workspace }}/ov_genai CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.zip WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml @@ -341,13 +340,11 @@ jobs: uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} - path: ${{ env.CPACK_PATH }} + path: ov_genai - name: Pack Artifacts run: | - pushd ${CPACK_PATH} - tar -czvf ${CPACK_PACKAGE} * - popd + tar -czvf ${CPACK_PACKAGE} ov_genai - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 From 0b7311d4ca72b58ee040542bc66c7c6a1671548f Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Sun, 23 Mar 2025 20:16:01 +0100 Subject: [PATCH 08/17] Update linux.yml --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9f9608337c..beadf7014f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -262,7 +262,7 @@ jobs: uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} - path: ${{ github.workspace }}/ov_genai + path: ov_genai - name: Pack Artifacts run: | From f0fb4fb883f5a4bfabf213a3fa9940c727ffd4d4 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Sun, 23 Mar 2025 20:43:49 +0100 Subject: [PATCH 09/17] Revert "Update linux.yml" This reverts commit 0b7311d4ca72b58ee040542bc66c7c6a1671548f. --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index beadf7014f..9f9608337c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -262,7 +262,7 @@ jobs: uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} - path: ov_genai + path: ${{ github.workspace }}/ov_genai - name: Pack Artifacts run: | From 14ebd7d6bd3df665deacd5c0f22f6ef4b5dc1998 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Sun, 23 Mar 2025 20:43:54 +0100 Subject: [PATCH 10/17] Revert "Align structure with tokenizers" This reverts commit 06049ec039004f805aabab4414b200165527ca64. --- .github/workflows/linux.yml | 7 +++++-- .github/workflows/windows.yml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9f9608337c..994c42b6d3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -253,6 +253,7 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: + CPACK_PATH: ${{ github.workspace }}/ov_genai CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.tar.gz WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml @@ -262,11 +263,13 @@ jobs: uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} - path: ${{ github.workspace }}/ov_genai + path: ${{ env.CPACK_PATH }} - name: Pack Artifacts run: | - tar -czvf ${CPACK_PACKAGE} ov_genai + pushd ${CPACK_PATH} + tar -czvf ${CPACK_PACKAGE} * + popd - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d90b09b253..7869643a25 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -331,6 +331,7 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: + CPACK_PATH: ${{ github.workspace }}/ov_genai CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.zip WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml @@ -340,11 +341,13 @@ jobs: uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} - path: ov_genai + path: ${{ env.CPACK_PATH }} - name: Pack Artifacts run: | - tar -czvf ${CPACK_PACKAGE} ov_genai + pushd ${CPACK_PATH} + tar -czvf ${CPACK_PACKAGE} * + popd - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 From f02dc0c690ba73b3323af50e0d30d8438e7e1102 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Sun, 23 Mar 2025 20:47:37 +0100 Subject: [PATCH 11/17] Use separate artifacts folder structure --- .github/workflows/linux.yml | 5 +++-- .github/workflows/windows.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 994c42b6d3..1ca0727ecd 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -112,7 +112,7 @@ jobs: - name: Generate product manifest id: create_manifest - uses: openvinotoolkit/openvino/.github/actions/create_manifest@master + uses: openvinotoolkit/openvino/.github/actions/create_manifest@refs/pull/29635/head with: repos: | ${{ env.SRC_DIR }} @@ -281,7 +281,7 @@ jobs: - name: Store ${{ matrix.build_type }} artifacts to a shared drive id: store_artifacts if: ${{ always() }} - uses: openvinotoolkit/openvino/.github/actions/store_artifacts@master + uses: openvinotoolkit/openvino/.github/actions/store_artifacts@refs/pull/29635/head with: artifacts: | ${{ env.CPACK_PACKAGE }} @@ -289,6 +289,7 @@ jobs: ${{ env.MANIFEST_PATH }} storage_dir: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }} storage_root: ${{ env.ARTIFACTS_SHARE }} + product_name: ${{ github.event.repository.name }} genai_build_samples: name: Build Samples - ${{ matrix.build-type }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7869643a25..1dedb64c4f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -90,7 +90,7 @@ jobs: - name: Generate product manifest id: create_manifest - uses: openvinotoolkit/openvino/.github/actions/create_manifest@master + uses: openvinotoolkit/openvino/.github/actions/create_manifest@refs/pull/29635/head with: repos: | ${{ env.SRC_DIR }} @@ -359,7 +359,7 @@ jobs: - name: Store ${{ matrix.build_type }} artifacts to a shared drive id: store_artifacts if: ${{ always() }} - uses: openvinotoolkit/openvino/.github/actions/store_artifacts@master + uses: openvinotoolkit/openvino/.github/actions/store_artifacts@refs/pull/29635/head with: artifacts: | ${{ env.CPACK_PACKAGE }} @@ -367,6 +367,7 @@ jobs: ${{ env.MANIFEST_PATH }} storage_dir: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }} storage_root: ${{ env.ARTIFACTS_SHARE }} + product_name: ${{ github.event.repository.name }} genai_build_samples: name: Build Samples - ${{ matrix.build-type }} From ebdd5eec68e5bae925e635a13f82528e6359b6df Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Mon, 24 Mar 2025 15:15:17 +0100 Subject: [PATCH 12/17] Add extracting cpack archive on Windows --- .github/workflows/windows.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1dedb64c4f..367448e290 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -400,6 +400,9 @@ jobs: path: ${{ env.OV_INSTALL_DIR }} merge-multiple: true + - name: Extract Artifacts + run: Expand-Archive -Path ${{ env.OV_INSTALL_DIR }}/${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}.zip -DestinationPath ${{ env.OV_INSTALL_DIR }} + - name: Build Samples (Release) if: ${{ 'Release' == matrix.build-type }} run: | @@ -589,6 +592,9 @@ jobs: path: ${{ env.INSTALL_DIR }} merge-multiple: true + - name: Extract Artifacts + run: Expand-Archive -Path ${{ env.INSTALL_DIR }}/${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}.zip -DestinationPath ${{ env.INSTALL_DIR }} + - name: Download GenAI JS Bildings Artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: @@ -671,7 +677,10 @@ jobs: pattern: "{${{ needs.openvino_download.outputs.ov_artifact_name }},genai_cpack_${{ matrix.build-type }},genai_tools_${{ matrix.build-type }},genai_tests_${{ matrix.build-type }},genai_wheels}" path: ${{ env.INSTALL_DIR }} merge-multiple: true - + + - name: Extract Artifacts + run: Expand-Archive -Path ${{ env.INSTALL_DIR }}/${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}.zip -DestinationPath ${{ env.INSTALL_DIR }} + - name: Setup Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0 with: From 2df629e7ebf83b5a8f36d01289b4c1ec66326652 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Mon, 24 Mar 2025 16:49:43 +0100 Subject: [PATCH 13/17] Remove extra steps --- .github/workflows/windows.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 367448e290..1febd41e7a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -331,7 +331,6 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: - CPACK_PATH: ${{ github.workspace }}/ov_genai CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.zip WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml @@ -341,13 +340,7 @@ jobs: uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: ${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}_${{ matrix.build-type }} - path: ${{ env.CPACK_PATH }} - - - name: Pack Artifacts - run: | - pushd ${CPACK_PATH} - tar -czvf ${CPACK_PACKAGE} * - popd + path: ${{ github.workspace }} - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 From 25cdae746dcc1e999dc5f098a8ba88e81bc9ff47 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Mon, 24 Mar 2025 18:12:50 +0100 Subject: [PATCH 14/17] Fix archive name --- .github/workflows/windows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1febd41e7a..1a07114b92 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -331,7 +331,6 @@ jobs: - /mount:/mount - ${{ github.workspace }}:${{ github.workspace }} env: - CPACK_PACKAGE: ${{ github.workspace }}/ov_genai.zip WHEEL_PACKAGE: ${{ github.workspace }}/wheels MANIFEST_PATH: ${{ github.workspace }}/manifest.yml @@ -355,7 +354,7 @@ jobs: uses: openvinotoolkit/openvino/.github/actions/store_artifacts@refs/pull/29635/head with: artifacts: | - ${{ env.CPACK_PACKAGE }} + ${{ github.workspace }}/${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}.zip ${{ env.WHEEL_PACKAGE }} ${{ env.MANIFEST_PATH }} storage_dir: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build-type }} From 88ecd0ca316331bffbde36009897042843bf0f6e Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Tue, 25 Mar 2025 16:49:49 +0100 Subject: [PATCH 15/17] Update .github/workflows/linux.yml Co-authored-by: Mikhail Ryzhov --- .github/workflows/linux.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ce5f2ab906..9916af4bde 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -266,10 +266,8 @@ jobs: path: ${{ env.CPACK_PATH }} - name: Pack Artifacts - run: | - pushd ${CPACK_PATH} - tar -czvf ${CPACK_PACKAGE} * - popd + run: tar -czvf ${{ env.CPACK_PACKAGE }} * + working-directory: ${{ env.CPACK_PATH }} - name: Download manifest and wheels uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 From 52b2a9ec562013957c408f0f241991c1e83b77b8 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Tue, 25 Mar 2025 17:01:31 +0100 Subject: [PATCH 16/17] Use action from master --- .github/workflows/linux.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9916af4bde..d1a809aaed 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -112,7 +112,7 @@ jobs: - name: Generate product manifest id: create_manifest - uses: openvinotoolkit/openvino/.github/actions/create_manifest@refs/pull/29635/head + uses: openvinotoolkit/openvino/.github/actions/create_manifest@master with: repos: | ${{ env.SRC_DIR }} @@ -279,7 +279,7 @@ jobs: - name: Store ${{ matrix.build_type }} artifacts to a shared drive id: store_artifacts if: ${{ always() }} - uses: openvinotoolkit/openvino/.github/actions/store_artifacts@refs/pull/29635/head + uses: openvinotoolkit/openvino/.github/actions/store_artifacts@master with: artifacts: | ${{ env.CPACK_PACKAGE }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1a07114b92..ba5deb40f3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -90,7 +90,7 @@ jobs: - name: Generate product manifest id: create_manifest - uses: openvinotoolkit/openvino/.github/actions/create_manifest@refs/pull/29635/head + uses: openvinotoolkit/openvino/.github/actions/create_manifest@master with: repos: | ${{ env.SRC_DIR }} @@ -351,7 +351,7 @@ jobs: - name: Store ${{ matrix.build_type }} artifacts to a shared drive id: store_artifacts if: ${{ always() }} - uses: openvinotoolkit/openvino/.github/actions/store_artifacts@refs/pull/29635/head + uses: openvinotoolkit/openvino/.github/actions/store_artifacts@master with: artifacts: | ${{ github.workspace }}/${{ env.GENAI_ARCHIVE_ARTIFACT_BASE_NAME }}.zip From da1858d8ffa9541655d9358f3c39f907f53c9e01 Mon Sep 17 00:00:00 2001 From: Alina Kladieva Date: Tue, 25 Mar 2025 17:02:00 +0100 Subject: [PATCH 17/17] Update .github/workflows/linux.yml Co-authored-by: Mikhail Ryzhov --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d1a809aaed..bc0ae64f1a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -246,7 +246,7 @@ jobs: defaults: run: shell: bash - runs-on: aks-linux-2-cores-8gb + runs-on: aks-linux-medium container: image: openvinogithubactions.azurecr.io/library/python:3.12-slim volumes: