From 56a42a2f837ca16e7fd1595015decf1080e993b2 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 14:28:11 +0400 Subject: [PATCH 01/16] Add macos test for genai package workflow --- .github/workflows/genai_package.yml | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 42ef1da02..426e6f998 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -31,6 +31,36 @@ jobs: - run: source ./ov/setupvars.sh && timeout 50s ${{ github.workspace }}/s\ pace/samples_bin/greedy_causal_lm ./TinyLlama-1.1B-Chat-v1.0/ "" if: ${{ 'Release' == matrix.build-type }} + macos_genai_package: + strategy: + matrix: + build-type: [Release, Debug] + runs-on: macos-12 + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: actions/setup-python@v4 + with: + python-version: 3.8 + - run: mkdir ./ov/ + - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/linux/l_openvino_toolkit_ubuntu20_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: sudo ./ov/install_dependencies/install_openvino_dependencies.sh + - run: brew install tbb + - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ + - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j + - run: source ./ov/setupvars.sh && cmake --install ./build/ --config ${{ matrix.build-type }} --prefix ov + - run: ov/samples/cpp/build_samples.sh -i ${{ github.workspace }}/s\ pace + if: ${{ 'Release' == matrix.build-type }} # build_samples enforces Release build + - run: source ./ov/setupvars.sh && python -m pip install --upgrade-strategy eager -r text_generation/causal_lm/cpp/requirements.txt + if: ${{ 'Release' == matrix.build-type }} + - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] + if: ${{ 'Release' == matrix.build-type }} + - run: source ./ov/setupvars.sh && optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0 + if: ${{ 'Release' == matrix.build-type }} + - run: source ./ov/setupvars.sh && timeout 50s ${{ github.workspace }}/s\ pace/samples_bin/greedy_causal_lm ./TinyLlama-1.1B-Chat-v1.0/ "" + if: ${{ 'Release' == matrix.build-type }} + windows_genai_package: strategy: matrix: From 489c78b1f54c70f71e768363a2c831388c39104d Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 14:29:27 +0400 Subject: [PATCH 02/16] Skip other os tests --- .github/workflows/genai_package.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 426e6f998..5b9197d81 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -2,6 +2,8 @@ name: genai_package on: pull_request jobs: ubuntu_genai_package: + # TODO Remove after testing + if: false strategy: matrix: build-type: [Release, Debug] @@ -62,6 +64,8 @@ jobs: if: ${{ 'Release' == matrix.build-type }} windows_genai_package: + # TODO Remove after testing + if: false strategy: matrix: build-type: [Release, Debug] From e47f447b7afd0495aa97a1d0d919f114b2ee65d1 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 14:49:05 +0400 Subject: [PATCH 03/16] Remove dependency installation --- .github/workflows/genai_package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 5b9197d81..9c3dd4954 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -47,8 +47,6 @@ jobs: python-version: 3.8 - run: mkdir ./ov/ - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/linux/l_openvino_toolkit_ubuntu20_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz - - run: sudo ./ov/install_dependencies/install_openvino_dependencies.sh - - run: brew install tbb - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j - run: source ./ov/setupvars.sh && cmake --install ./build/ --config ${{ matrix.build-type }} --prefix ov From f1d10cbaf9a05ef624dd4840bd2d2c8cf2e886d2 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 14:55:20 +0400 Subject: [PATCH 04/16] Add build dependencies --- .github/workflows/genai_package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 9c3dd4954..ff9a6e5df 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -47,6 +47,7 @@ jobs: python-version: 3.8 - run: mkdir ./ov/ - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/linux/l_openvino_toolkit_ubuntu20_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j - run: source ./ov/setupvars.sh && cmake --install ./build/ --config ${{ matrix.build-type }} --prefix ov From e3105b55dce4208ec05b33378ddedd8642504d7f Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 15:02:05 +0400 Subject: [PATCH 05/16] Fix link to archive --- .github/workflows/genai_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index ff9a6e5df..7f83eeac7 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -46,7 +46,7 @@ jobs: with: python-version: 3.8 - run: mkdir ./ov/ - - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/linux/l_openvino_toolkit_ubuntu20_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/macos/m_openvino_toolkit_macos_12_6_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j From fc5ec5f6f8a58cc4233dd9f0860517b4ccf0a24d Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 15:38:38 +0400 Subject: [PATCH 06/16] Skip copying libcore_tokenizers.so for macos --- src/cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 30d95d355..f7391bc39 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -75,7 +75,7 @@ install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION python/openvino_genai/ COMPONENT pygenai_${Python_VERSION_MAJOR}_${Python_VERSION_MINOR}) # Copy libcore_tokenizers.so to build_dir/openvino_tokenizers/src/ -if(NOT MSVC) +if(NOT MSVC AND NOT APPLE) add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_BINARY_DIR}/_deps/fast_tokenizer-src/lib/libcore_tokenizers.so" From f7f1b186ca36544dc482d2c8148795e47d2281c4 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 15:51:06 +0400 Subject: [PATCH 07/16] Remove additional brew packages --- .github/workflows/genai_package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 7f83eeac7..2e00fd12d 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -47,7 +47,6 @@ jobs: python-version: 3.8 - run: mkdir ./ov/ - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/macos/m_openvino_toolkit_macos_12_6_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz - - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j - run: source ./ov/setupvars.sh && cmake --install ./build/ --config ${{ matrix.build-type }} --prefix ov From d2ee3bd1690c43b07cdf76bbe88aa92e5d0cfdbc Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 16:02:47 +0400 Subject: [PATCH 08/16] Revert "Remove additional brew packages" This reverts commit f7f1b186ca36544dc482d2c8148795e47d2281c4. --- .github/workflows/genai_package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 2e00fd12d..7f83eeac7 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -47,6 +47,7 @@ jobs: python-version: 3.8 - run: mkdir ./ov/ - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/macos/m_openvino_toolkit_macos_12_6_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j - run: source ./ov/setupvars.sh && cmake --install ./build/ --config ${{ matrix.build-type }} --prefix ov From 25f636e3c439828e0ee543fb2855077a796ebc0a Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 16:24:05 +0400 Subject: [PATCH 09/16] Add concurrency to genai workflows --- .github/workflows/genai_package.yml | 3 +++ .github/workflows/genai_python_lib.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 7f83eeac7..221286415 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -1,5 +1,8 @@ name: genai_package on: pull_request +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }} + cancel-in-progress: true jobs: ubuntu_genai_package: # TODO Remove after testing diff --git a/.github/workflows/genai_python_lib.yml b/.github/workflows/genai_python_lib.yml index db6bb9fa6..e8026d6eb 100644 --- a/.github/workflows/genai_python_lib.yml +++ b/.github/workflows/genai_python_lib.yml @@ -1,5 +1,8 @@ name: genai_python_lib on: pull_request +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }} + cancel-in-progress: true jobs: ubuntu_genai_python_lib: runs-on: ubuntu-20.04 From 1e10b1fa2f0267e483f31d269d9da41e35d11e0f Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 17:35:43 +0400 Subject: [PATCH 10/16] Add initial job for test on macos --- .github/workflows/genai_python_lib.yml | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/genai_python_lib.yml b/.github/workflows/genai_python_lib.yml index e8026d6eb..8274590ba 100644 --- a/.github/workflows/genai_python_lib.yml +++ b/.github/workflows/genai_python_lib.yml @@ -36,6 +36,37 @@ jobs: done python -m pytest test_generate_api.py + macos_genai_python_lib: + runs-on: macos-12 + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: actions/setup-python@v4 + with: + python-version: 3.8 + - run: mkdir ./ov/ + - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.2.0-15484-4b8641ee3f4/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240523_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: brew install coreutils ninja scons + - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/ + - run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j + # GitHub Actions already provides what is listed in ./requirements-build.txt but the internal + # build system doesn't. Install ./requirements-build.txt to detect possible conflicts. + - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt + - run: PYTHONPATH=./src/python/ python -c "from openvino_genai import LLMPipeline" + - run: source ./ov/setupvars.sh && CMAKE_BUILD_PARALLEL_LEVEL="" python -m pip install --pre . --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly + - run: python -c "from openvino_genai import LLMPipeline" + - name: GenAI Python API tests + run: | + source ./ov/setupvars.sh + cd ./tests/python_tests/ + python -m pip install -r requirements.txt + models=$(python list_test_models.py) + echo "$models" | while read -r model_name model_path; do + optimum-cli export openvino --trust-remote-code --weight-format fp16 --model "$model_name" "$model_path" + done + python -m pytest test_generate_api.py + windows_genai_python_lib: runs-on: windows-latest defaults: From b78ca46bcf2accee451bee079c13c3ece951016d Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 24 May 2024 17:36:19 +0400 Subject: [PATCH 11/16] Unskip ubuntu & windows jobs for genai package workflow --- .github/workflows/genai_package.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 221286415..0865be5ab 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -5,8 +5,6 @@ concurrency: cancel-in-progress: true jobs: ubuntu_genai_package: - # TODO Remove after testing - if: false strategy: matrix: build-type: [Release, Debug] @@ -66,8 +64,6 @@ jobs: if: ${{ 'Release' == matrix.build-type }} windows_genai_package: - # TODO Remove after testing - if: false strategy: matrix: build-type: [Release, Debug] From 4abb766bc8d3b389fb146890b5619812eb2f5f03 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Wed, 29 May 2024 14:27:39 +0400 Subject: [PATCH 12/16] Update links to macos archives --- .github/workflows/genai_package.yml | 2 +- .github/workflows/genai_python_lib.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index c3d3c7198..3092121d5 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -47,7 +47,7 @@ jobs: with: python-version: 3.8 - run: mkdir ./ov/ - - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/macos/m_openvino_toolkit_macos_12_6_2024.1.0.15008.f4afc983258_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2024.2.0rc1/macos/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240524_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j diff --git a/.github/workflows/genai_python_lib.yml b/.github/workflows/genai_python_lib.yml index f6567f211..d1a558ac3 100644 --- a/.github/workflows/genai_python_lib.yml +++ b/.github/workflows/genai_python_lib.yml @@ -49,7 +49,7 @@ jobs: with: python-version: 3.8 - run: mkdir ./ov/ - - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.2.0-15484-4b8641ee3f4/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240523_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2024.2.0rc1/macos/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240524_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j From 2f92eedc651bc0977d4f8259372de9ee42c21780 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Wed, 29 May 2024 15:30:27 +0400 Subject: [PATCH 13/16] Update macos workflows --- .github/workflows/genai_package.yml | 2 +- .github/workflows/genai_python_lib.yml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 3092121d5..05aabfa34 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -56,7 +56,7 @@ jobs: if: ${{ 'Release' == matrix.build-type }} # build_samples enforces Release build - run: source ./ov/setupvars.sh && python -m pip install --upgrade-strategy eager -r text_generation/causal_lm/cpp/requirements.txt if: ${{ 'Release' == matrix.build-type }} - - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] + - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release if: ${{ 'Release' == matrix.build-type }} - run: source ./ov/setupvars.sh && optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0 if: ${{ 'Release' == matrix.build-type }} diff --git a/.github/workflows/genai_python_lib.yml b/.github/workflows/genai_python_lib.yml index d1a558ac3..e6eaf82a5 100644 --- a/.github/workflows/genai_python_lib.yml +++ b/.github/workflows/genai_python_lib.yml @@ -55,20 +55,19 @@ jobs: - run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j # GitHub Actions already provides what is listed in ./requirements-build.txt but the internal # build system doesn't. Install ./requirements-build.txt to detect possible conflicts. - - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt - - run: PYTHONPATH=./src/python/ python -c "from openvino_genai import LLMPipeline" - - run: source ./ov/setupvars.sh && CMAKE_BUILD_PARALLEL_LEVEL="" python -m pip install --pre . --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly + - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose --verbose --verbose + - run: source ./ov/setupvars.sh && PYTHONPATH=./build/ python -c "from openvino_genai import LLMPipeline" + - run: source ./ov/setupvars.sh && python -m pip install . --config-settings=build-dir="build" --verbose --verbose --verbose - run: python -c "from openvino_genai import LLMPipeline" - name: GenAI Python API tests run: | - source ./ov/setupvars.sh cd ./tests/python_tests/ python -m pip install -r requirements.txt models=$(python list_test_models.py) echo "$models" | while read -r model_name model_path; do optimum-cli export openvino --trust-remote-code --weight-format fp16 --model "$model_name" "$model_path" done - python -m pytest test_generate_api.py + GENAI_BUILD_DIR=../../build python -m pytest test_generate_api.py windows_genai_python_lib: runs-on: windows-latest From d6c6ce01ee7309e669f0fdb33edcb5bc9dd291ca Mon Sep 17 00:00:00 2001 From: yatarkan Date: Wed, 29 May 2024 16:15:55 +0400 Subject: [PATCH 14/16] Set cmake generator for macos workflow --- .github/workflows/genai_python_lib.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/genai_python_lib.yml b/.github/workflows/genai_python_lib.yml index e6eaf82a5..1505850fb 100644 --- a/.github/workflows/genai_python_lib.yml +++ b/.github/workflows/genai_python_lib.yml @@ -41,6 +41,8 @@ jobs: macos_genai_python_lib: runs-on: macos-12 + env: + CMAKE_GENERATOR: Unix Makefiles steps: - uses: actions/checkout@v4 with: From af68f15e457db961cc7788238bbd7044b06fe3e0 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 31 May 2024 14:10:27 +0400 Subject: [PATCH 15/16] Keep only one verbose arg --- .github/workflows/genai_python_lib.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/genai_python_lib.yml b/.github/workflows/genai_python_lib.yml index 9afe83edf..213398f64 100644 --- a/.github/workflows/genai_python_lib.yml +++ b/.github/workflows/genai_python_lib.yml @@ -25,9 +25,9 @@ jobs: - run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j # GitHub Actions already provides what is listed in ./requirements-build.txt but the internal # build system doesn't. Install ./requirements-build.txt to detect possible conflicts. - - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose --verbose --verbose + - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose - run: source ./ov/setupvars.sh && PYTHONPATH=./build/ python -c "from openvino_genai import LLMPipeline" - - run: source ./ov/setupvars.sh && python -m pip install . --config-settings=build-dir="build" --verbose --verbose --verbose + - run: source ./ov/setupvars.sh && python -m pip install . --config-settings=build-dir="build" --verbose - run: python -c "from openvino_genai import LLMPipeline" - name: GenAI Python API tests run: | @@ -57,9 +57,9 @@ jobs: - run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j # GitHub Actions already provides what is listed in ./requirements-build.txt but the internal # build system doesn't. Install ./requirements-build.txt to detect possible conflicts. - - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose --verbose --verbose + - run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose - run: source ./ov/setupvars.sh && PYTHONPATH=./build/ python -c "from openvino_genai import LLMPipeline" - - run: source ./ov/setupvars.sh && python -m pip install . --config-settings=build-dir="build" --verbose --verbose --verbose + - run: source ./ov/setupvars.sh && python -m pip install . --config-settings=build-dir="build" --verbose - run: python -c "from openvino_genai import LLMPipeline" - name: GenAI Python API tests run: | @@ -89,8 +89,8 @@ jobs: - run: unzip ov.zip # GitHub Actions already provides what is listed in ./requirements-build.txt but the internal # build system doesn't. Install ./requirements-build.txt to detect possible conflicts. - - run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose --verbose --verbose - - run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python -m pip install . --verbose --verbose --verbose # --verbose is additive, and can be used up to 3 times. + - run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose + - run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python -m pip install . --verbose - run: python -c "from openvino_genai import LLMPipeline" - run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/ - run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && cmake --build ./build/ --config Release -j From 7081282f617b73d1f81f1572862ec36f4ffb8c03 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 31 May 2024 14:49:04 +0400 Subject: [PATCH 16/16] Switch macos archive installation to rc2 --- .github/workflows/genai_package.yml | 2 +- .github/workflows/genai_python_lib.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/genai_package.yml b/.github/workflows/genai_package.yml index 05aabfa34..384ed5643 100644 --- a/.github/workflows/genai_package.yml +++ b/.github/workflows/genai_package.yml @@ -47,7 +47,7 @@ jobs: with: python-version: 3.8 - run: mkdir ./ov/ - - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2024.2.0rc1/macos/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240524_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2024.2.0rc2/macos/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240529_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j diff --git a/.github/workflows/genai_python_lib.yml b/.github/workflows/genai_python_lib.yml index 213398f64..9f8382b2b 100644 --- a/.github/workflows/genai_python_lib.yml +++ b/.github/workflows/genai_python_lib.yml @@ -51,7 +51,7 @@ jobs: with: python-version: 3.8 - run: mkdir ./ov/ - - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2024.2.0rc1/macos/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240524_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz + - run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2024.2.0rc2/macos/m_openvino_toolkit_macos_12_6_2024.2.0.dev20240529_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz - run: brew install coreutils ninja scons - run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/ - run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j