From cc719b0fd8589e67c3c993be8b9819ec103493e7 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 13 Sep 2024 13:08:46 +0400 Subject: [PATCH 1/3] Enable multinomial_causal_lm python samples tests in debug mode for linux and mac --- .github/workflows/linux.yml | 1 - .github/workflows/mac.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c36b6c05f..7cc27b7cd 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -373,7 +373,6 @@ jobs: timeout 25s ${{ github.workspace }}/s\ pace/samples_bin/greedy_causal_lm ./TinyLlama-1.1B-Chat-v1.0/ "" - name: Test python samples (multinomial_causal_lm) - if: ${{ 'Release' == matrix.build-type }} # Python bindings can be built in Release only run: | source ${OV_INSTALL_DIR}/setupvars.sh timeout 25s ${OV_INSTALL_DIR}/samples/python/multinomial_causal_lm/multinomial_causal_lm.py ./TinyLlama-1.1B-Chat-v1.0/ 0 diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index ccc351369..13037f4bd 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -319,7 +319,6 @@ jobs: timeout 25s ${{ github.workspace }}/s\ pace/samples_bin/greedy_causal_lm ./TinyLlama-1.1B-Chat-v1.0/ "" - name: Test python samples (multinomial_causal_lm) - if: ${{ 'Release' == matrix.build-type }} # Python bindings can be built in Release only run: | source ${OV_INSTALL_DIR}/setupvars.sh timeout 25s ${OV_INSTALL_DIR}/samples/python/multinomial_causal_lm/multinomial_causal_lm.py ./TinyLlama-1.1B-Chat-v1.0/ 0 From 6a76c254afa5e6531e4533671981ff2ebc20aee5 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 13 Sep 2024 13:09:46 +0400 Subject: [PATCH 2/3] Build and run samples with cmd for genai_package windows tests --- .github/workflows/windows.yml | 36 ++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6d17844eb..3a8eefcbd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -295,45 +295,51 @@ jobs: uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - name: Build genai libs + shell: cmd run: | - . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1" - cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/ - cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j + call "${{ env.OV_INSTALL_DIR }}\setupvars.bat" + cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S .\ -B .\build + cmake --build .\build --config ${{ matrix.build-type }} --target package -j - name: Build and Install dependencies + shell: cmd run: | - . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1" - python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --find-links ${env:OV_INSTALL_DIR}/tools - python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt --find-links ${env:OV_INSTALL_DIR}/tools + call "${{ env.OV_INSTALL_DIR }}\setupvars.bat" + python -m pip install .\thirdparty\openvino_tokenizers\[transformers] --find-links ${env:OV_INSTALL_DIR}\tools + python -m pip install --upgrade-strategy eager -r .\samples\requirements.txt --find-links ${env:OV_INSTALL_DIR}\tools optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0 - name: Install samples + shell: cmd run: | - . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1" - cmake --install ./build/ --config ${{ matrix.build-type }} --prefix ${{ env.OV_INSTALL_DIR }} + call "${{ env.OV_INSTALL_DIR }}\setupvars.bat" + cmake --install .\build\ --config ${{ matrix.build-type }} --prefix ${{ env.OV_INSTALL_DIR }} - name: Build samples (Release) if: ${{ 'Release' == matrix.build-type }} # build_samples enforces Release build + shell: cmd run: | - & ${{ env.OV_INSTALL_DIR }}\samples\cpp\build_samples.ps1 -i ${{ github.workspace }}/samples_install + call ${{ env.OV_INSTALL_DIR }}\samples\cpp\build_samples_msvc.bat -i ${{ github.workspace }}\samples_install - name: Build samples (Debug) if: ${{ 'Release' != matrix.build-type }} + shell: cmd run: | - . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1" - cmake -DCMAKE_BUILD_TYPE= -S ./ov/samples/cpp/ -B "samples build" + call "${{ env.OV_INSTALL_DIR }}\setupvars.bat" + cmake -DCMAKE_BUILD_TYPE= -S .\ov\samples\cpp\ -B "samples build" cmake --build "samples build" --config ${{ matrix.build-type }} -j cmake --install "samples build" --config ${{ matrix.build-type }} --component samples_bin --prefix samples_install - name: Test C++ samples (greedy_causal_lm) + shell: cmd run: | - . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1" - Start-Process -FilePath "${{ github.workspace }}/samples_install/samples_bin/greedy_causal_lm.exe" -ArgumentList "TinyLlama-1.1B-Chat-v1.0 ''" + call "${{ env.OV_INSTALL_DIR }}\setupvars.bat" + start "" "${{ github.workspace }}\samples_install\samples_bin\greedy_causal_lm.exe" "TinyLlama-1.1B-Chat-v1.0" "" - name: Test python samples (multinomial_causal_lm) - if: ${{ 'Release' == matrix.build-type }} # Python bindings can be built in Release only + shell: cmd run: | - . "${{ env.OV_INSTALL_DIR }}/setupvars.ps1" + call "${{ env.OV_INSTALL_DIR }}\setupvars.bat" python ${{ env.OV_INSTALL_DIR }}\samples\python\multinomial_causal_lm\multinomial_causal_lm.py TinyLlama-1.1B-Chat-v1.0 0 Overall_Status: From 029e0188f0fc3627749e83d01cea03b42ceb11d6 Mon Sep 17 00:00:00 2001 From: yatarkan Date: Fri, 13 Sep 2024 13:11:23 +0400 Subject: [PATCH 3/3] Bump tokenizers submodule to latest master --- thirdparty/openvino_tokenizers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/openvino_tokenizers b/thirdparty/openvino_tokenizers index b6c36a302..56a4a5972 160000 --- a/thirdparty/openvino_tokenizers +++ b/thirdparty/openvino_tokenizers @@ -1 +1 @@ -Subproject commit b6c36a302696329f008e4425c9d98c4e00194a24 +Subproject commit 56a4a59724008b48c68b9fd8be3035585a2ca831