From f61f2158f35a791ee542575b194f83d6bbfa7ac6 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 09:43:56 +0100 Subject: [PATCH 01/10] updated upload-artifact version --- .github/workflows/linux.yml | 10 +++++----- .github/workflows/mac.yml | 10 +++++----- .github/workflows/windows.yml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7f821506a..2cd56281f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -136,7 +136,7 @@ jobs: - name: Upload openvino package if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: openvino_package path: ${{ env.BUILD_DIR }}/openvino_package.tar.gz @@ -179,7 +179,7 @@ jobs: cache: 'pip' - name: Download OpenVINO package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_package path: ${{ env.INSTALL_DIR }} @@ -222,7 +222,7 @@ jobs: - name: Upload openvino tokenizers wheel if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: openvino_tokenizers_wheel path: ${{ env.BUILD_DIR }}/*.whl @@ -256,13 +256,13 @@ jobs: cache: 'pip' - name: Download tokenizers package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_tokenizers_wheel path: ${{ env.INSTALL_DIR }}/ov_tokenizers - name: Download OpenVINO package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_package path: ${{ env.INSTALL_DIR }} diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 2b19c87c4..9ec70608b 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -126,7 +126,7 @@ jobs: - name: Upload openvino package if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: openvino_package path: ${{ env.BUILD_DIR }}/openvino_package.tar.gz @@ -169,7 +169,7 @@ jobs: cache: 'pip' - name: Download OpenVINO package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_package path: ${{ env.INSTALL_DIR }} @@ -211,7 +211,7 @@ jobs: - name: Upload openvino tokenizers wheel if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: openvino_tokenizers_wheel path: ${{ env.BUILD_DIR }}/*.whl @@ -245,13 +245,13 @@ jobs: cache: 'pip' - name: Download tokenizers package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_tokenizers_wheel path: ${{ env.INSTALL_DIR }}/ov_tokenizers - name: Download OpenVINO package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_package path: ${{ env.INSTALL_DIR }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index dadc5301c..45d5aa4f3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -133,7 +133,7 @@ jobs: - name: Upload openvino package if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: openvino_package path: ${{ env.BUILD_DIR }}/openvino_package.zip @@ -176,7 +176,7 @@ jobs: cache: 'pip' - name: Download OpenVINO package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_package path: ${{ env.INSTALL_DIR }} @@ -215,7 +215,7 @@ jobs: - name: Upload openvino tokenizers wheel if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: openvino_tokenizers_wheel path: ${{ env.BUILD_DIR }}/*.whl @@ -249,13 +249,13 @@ jobs: cache: 'pip' - name: Download tokenizers package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_tokenizers_wheel path: ${{ env.INSTALL_DIR }}\\ov_tokenizers - name: Download OpenVINO package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: openvino_package path: ${{ env.INSTALL_DIR }} From 935167108b658144202a027d5c2bdbe87825f94e Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 09:48:26 +0100 Subject: [PATCH 02/10] github.run_id --- .github/workflows/linux.yml | 2 +- .github/workflows/mac.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2cd56281f..77457347b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -214,7 +214,7 @@ jobs: CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' CMAKE_GENERATOR: 'Unix Makefiles' - SKBUILD_WHEEL_BUILD_TAG: ${{github.run_attempt}} + SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_id }} # # Upload build artifacts diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 9ec70608b..4f0668259 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -203,7 +203,7 @@ jobs: env: CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' - SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_attempt }} + SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_id }} # # Upload build artifacts diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 45d5aa4f3..79abe8545 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -207,7 +207,7 @@ jobs: env: CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' - SKBUILD_WHEEL_BUILD_TAG: ${{github.run_attempt}} + SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_id }} # # Upload build artifacts From 5b73f545ba9a2da8de6f9f7de428ca59a229ad3f Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 09:50:17 +0100 Subject: [PATCH 03/10] parallel tests --- .github/workflows/linux.yml | 2 +- .github/workflows/mac.yml | 2 +- .github/workflows/windows.yml | 2 +- pyproject.toml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 77457347b..22c0e03be 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -296,5 +296,5 @@ jobs: - name: Tokenizers regression tests run: | - python3 -m pytest tokenizers_test.py + python3 -m pytest -n logical tokenizers_test.py working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests \ No newline at end of file diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 4f0668259..05a5615be 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -280,5 +280,5 @@ jobs: - name: Tokenizers regression tests run: | - python3 -m pytest tokenizers_test.py + python3 -m pytest -n logical tokenizers_test.py working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 79abe8545..c798f6cba 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -281,5 +281,5 @@ jobs: - name: Tokenizers regression tests run: | - python3 -m pytest tokenizers_test.py + python3 -m pytest -n logical tokenizers_test.py working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests diff --git a/pyproject.toml b/pyproject.toml index b03017ded..465a93311 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,7 @@ dev = [ "ruff", "bandit", "pytest", + "pytest-xdist[psutil]" "pytest_harvest", "openvino_tokenizers[transformers, torch]" ] From 67d6870e98fa99902d5ab746ab2585bc5e92e4c1 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 09:57:50 +0100 Subject: [PATCH 04/10] toml syntax --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 465a93311..7571f5c05 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ dev = [ "ruff", "bandit", "pytest", - "pytest-xdist[psutil]" + "pytest-xdist[psutil]", "pytest_harvest", "openvino_tokenizers[transformers, torch]" ] From 01aa2ad3cdd324e1bc0c54b2d805affabed30d41 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 10:00:21 +0100 Subject: [PATCH 05/10] github.run_number --- .github/workflows/linux.yml | 2 +- .github/workflows/mac.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 22c0e03be..fafe48c80 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -214,7 +214,7 @@ jobs: CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' CMAKE_GENERATOR: 'Unix Makefiles' - SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_id }} + SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_number }} # # Upload build artifacts diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 05a5615be..f1c6eb1eb 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -203,7 +203,7 @@ jobs: env: CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' - SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_id }} + SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_number }} # # Upload build artifacts diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c798f6cba..753647ffe 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -207,7 +207,7 @@ jobs: env: CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF' CMAKE_BUILD_PARALLEL_LEVEL: '4' - SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_id }} + SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_number }} # # Upload build artifacts From 10480a049e6872a3216c210c0bae9ac9c5b871e5 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 11:07:44 +0100 Subject: [PATCH 06/10] Update .github/workflows/linux.yml Co-authored-by: Artur Paniukov --- .github/workflows/linux.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fafe48c80..9dbac6d00 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -297,4 +297,5 @@ jobs: - name: Tokenizers regression tests run: | python3 -m pytest -n logical tokenizers_test.py - working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests \ No newline at end of file + working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests + \ No newline at end of file From 3add579e85de833568ac3c91766054605dc6d5ce Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 11:40:03 +0100 Subject: [PATCH 07/10] Revert "toml syntax" This reverts commit 67d6870e98fa99902d5ab746ab2585bc5e92e4c1. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7571f5c05..465a93311 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ dev = [ "ruff", "bandit", "pytest", - "pytest-xdist[psutil]", + "pytest-xdist[psutil]" "pytest_harvest", "openvino_tokenizers[transformers, torch]" ] From 135789d7d309cd39a1b3f033c1a5f9563f7529d4 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 11:40:05 +0100 Subject: [PATCH 08/10] Revert "parallel tests" This reverts commit 5b73f545ba9a2da8de6f9f7de428ca59a229ad3f. --- .github/workflows/linux.yml | 2 +- .github/workflows/mac.yml | 2 +- .github/workflows/windows.yml | 2 +- pyproject.toml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fafe48c80..098c8ab6e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -296,5 +296,5 @@ jobs: - name: Tokenizers regression tests run: | - python3 -m pytest -n logical tokenizers_test.py + python3 -m pytest tokenizers_test.py working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests \ No newline at end of file diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index f1c6eb1eb..23cd3dff5 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -280,5 +280,5 @@ jobs: - name: Tokenizers regression tests run: | - python3 -m pytest -n logical tokenizers_test.py + python3 -m pytest tokenizers_test.py working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 753647ffe..e3babcb84 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -281,5 +281,5 @@ jobs: - name: Tokenizers regression tests run: | - python3 -m pytest -n logical tokenizers_test.py + python3 -m pytest tokenizers_test.py working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests diff --git a/pyproject.toml b/pyproject.toml index 465a93311..b03017ded 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,6 @@ dev = [ "ruff", "bandit", "pytest", - "pytest-xdist[psutil]" "pytest_harvest", "openvino_tokenizers[transformers, torch]" ] From 6f97be496b991e4a385e67e674e509c133c6cefc Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 11:43:35 +0100 Subject: [PATCH 09/10] reduced lin runner --- .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 04c87cd56..97c32294a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -149,7 +149,7 @@ jobs: defaults: run: shell: bash - runs-on: ubuntu-20.04-4-cores + runs-on: ubuntu-20.04 env: OPENVINO_REPO: ${{ github.workspace }}/openvino From 626f962986ada0d64eef2834a2cda3463a0c4f1b Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 8 Feb 2024 11:55:38 +0100 Subject: [PATCH 10/10] revert -n --- .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 97c32294a..f63f06777 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -296,6 +296,6 @@ jobs: - name: Tokenizers regression tests run: | - python3 -m pytest -n logical tokenizers_test.py + python3 -m pytest tokenizers_test.py working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests