From c96340b704aadd7ed4bc2be73212c4393fd7eecf Mon Sep 17 00:00:00 2001 From: Vladimir Zlobin Date: Fri, 17 Jan 2025 14:22:12 +0400 Subject: [PATCH 1/3] Fix links, remind about ABI (#1585) --- samples/cpp/image_generation/README.md | 2 +- samples/cpp/visual_language_chat/README.md | 2 +- samples/cpp/whisper_speech_recognition/README.md | 2 +- src/docs/BUILD.md | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/samples/cpp/image_generation/README.md b/samples/cpp/image_generation/README.md index 3dcb64b97c..4d2b2ef9ff 100644 --- a/samples/cpp/image_generation/README.md +++ b/samples/cpp/image_generation/README.md @@ -28,7 +28,7 @@ Users can change the sample code and play with the following generation paramete The `--upgrade-strategy eager` option is needed to ensure `optimum-intel` is upgraded to the latest version. -It's not required to install [../../export-requirements.txt](../../export requirements.txt) for deployment if the model has already been exported. +It's not required to install [../../export-requirements.txt](../../export-requirements.txt) for deployment if the model has already been exported. ```sh pip install --upgrade-strategy eager -r ../../requirements.txt diff --git a/samples/cpp/visual_language_chat/README.md b/samples/cpp/visual_language_chat/README.md index 73baf0088a..0017bd0b7c 100644 --- a/samples/cpp/visual_language_chat/README.md +++ b/samples/cpp/visual_language_chat/README.md @@ -12,7 +12,7 @@ There are two sample files: The `--upgrade-strategy eager` option is needed to ensure `optimum-intel` is upgraded to the latest version. -It's not required to install [../../export-requirements.txt](../../export requirements.txt) for deployment if the model has already been exported. +It's not required to install [../../export-requirements.txt](../../export-requirements.txt) for deployment if the model has already been exported. ```sh pip install --upgrade-strategy eager -r ../../requirements.txt diff --git a/samples/cpp/whisper_speech_recognition/README.md b/samples/cpp/whisper_speech_recognition/README.md index 2ea3322dee..47650b566c 100644 --- a/samples/cpp/whisper_speech_recognition/README.md +++ b/samples/cpp/whisper_speech_recognition/README.md @@ -6,7 +6,7 @@ This example showcases inference of speech recognition Whisper Models. The appli The `--upgrade-strategy eager` option is needed to ensure `optimum-intel` is upgraded to the latest version. -It's not required to install [../../export-requirements.txt](../../export requirements.txt) for deployment if the model has already been exported. +It's not required to install [../../export-requirements.txt](../../export-requirements.txt) for deployment if the model has already been exported. ```sh pip install --upgrade-strategy eager -r ../../requirements.txt diff --git a/src/docs/BUILD.md b/src/docs/BUILD.md index 77657620a0..bbdd6353b0 100644 --- a/src/docs/BUILD.md +++ b/src/docs/BUILD.md @@ -194,6 +194,8 @@ The path to the openvino install directory is referred as througho python -m pip wheel . -w dist/ --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release ``` +> **NOTE**: You'd need to build ABI compatible OpenVINO and OpenVINO Tokenizers for Ubuntu instead of downloading them from PyPI. See [OpenVINO™ GenAI Dependencies](../README.md#openvino-genai-dependencies) for the explanation. + ### Install OpenVINO GenAI From Source 1. Clone OpenVINO GenAI repository and init submodules: From 963d863b53ca5e9d875e720e13e37016f76c2e2c Mon Sep 17 00:00:00 2001 From: Vladimir Zlobin Date: Fri, 17 Jan 2025 14:22:37 +0400 Subject: [PATCH 2/3] Add nightly to instructions similar to requirements (#1582) --- src/docs/BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/BUILD.md b/src/docs/BUILD.md index bbdd6353b0..4cda924fd2 100644 --- a/src/docs/BUILD.md +++ b/src/docs/BUILD.md @@ -191,7 +191,7 @@ The path to the openvino install directory is referred as througho ``` 4. Build the wheel in the `dist` directory: ```sh - python -m pip wheel . -w dist/ --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release + python -m pip wheel . -w dist/ --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly ``` > **NOTE**: You'd need to build ABI compatible OpenVINO and OpenVINO Tokenizers for Ubuntu instead of downloading them from PyPI. See [OpenVINO™ GenAI Dependencies](../README.md#openvino-genai-dependencies) for the explanation. From 1b3c68de17165c490d937a518295ce672f91a4d1 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 17 Jan 2025 15:51:28 +0400 Subject: [PATCH 3/3] GHA: use nightly from 2025.1.0 (#1577) --- .github/workflows/causal_lm_cpp.yml | 12 +++++++----- .github/workflows/genai-tools.yml | 2 +- .github/workflows/job_vlm_sample_llava.yml | 2 +- .github/workflows/lcm_dreamshaper_cpp.yml | 6 +++--- .github/workflows/linux.yml | 2 +- .github/workflows/stable_diffusion_1_5_cpp.yml | 4 ++-- .github/workflows/windows.yml | 2 +- samples/deployment-requirements.txt | 2 +- samples/export-requirements.txt | 2 +- src/cpp/src/make_tokenizer_stateful.hpp | 4 ++-- thirdparty/openvino_tokenizers | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/causal_lm_cpp.yml b/.github/workflows/causal_lm_cpp.yml index b967ed9e1a..2e0afaa882 100644 --- a/.github/workflows/causal_lm_cpp.yml +++ b/.github/workflows/causal_lm_cpp.yml @@ -16,10 +16,11 @@ concurrency: cancel-in-progress: true env: - l_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17800-91ae987c516/l_openvino_toolkit_ubuntu20_2025.0.0.dev20250109_x86_64.tgz - l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17800-91ae987c516/l_openvino_toolkit_ubuntu22_2025.0.0.dev20250109_x86_64.tgz - m_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17800-91ae987c516/m_openvino_toolkit_macos_12_6_2025.0.0.dev20250109_x86_64.tgz - w_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17800-91ae987c516/w_openvino_toolkit_windows_2025.0.0.dev20250109_x86_64.zip + l_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.1.0-17911-83c047443de/l_openvino_toolkit_ubuntu20_2025.1.0.dev20250116_x86_64.tgz + l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.1.0-17911-83c047443de/l_openvino_toolkit_ubuntu22_2025.1.0.dev20250116_x86_64.tgz + m_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.1.0-17911-83c047443de/m_openvino_toolkit_macos_12_6_2025.1.0.dev20250116_x86_64.tgz + w_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.1.0-17911-83c047443de/w_openvino_toolkit_windows_2025.1.0.dev20250116_x86_64.zip + jobs: cpp-multinomial-greedy_causal_lm-ubuntu: runs-on: ubuntu-20.04-8-cores @@ -463,6 +464,7 @@ jobs: env: PYTHONPATH: "./build/:$PYTHONPATH" LD_LIBRARY_PATH: "./build/openvino_genai/:$LD_LIBRARY_PATH" + cpp-prompt_lookup_decoding_lm-ubuntu: runs-on: ubuntu-20.04-16-cores defaults: @@ -520,6 +522,7 @@ jobs: env: PYTHONPATH: "./build/:$PYTHONPATH" LD_LIBRARY_PATH: "./build/openvino_genai/:$LD_LIBRARY_PATH" + cpp-Phi-1_5: runs-on: ubuntu-20.04-16-cores defaults: @@ -697,7 +700,6 @@ jobs: diff pred2.txt ref.txt echo "Chat sample python" passed - visual_language_chat_sample-ubuntu-minicpm_v2_6: runs-on: ubuntu-22.04-16-cores steps: diff --git a/.github/workflows/genai-tools.yml b/.github/workflows/genai-tools.yml index 3d6041129b..7cf8cb5f7f 100644 --- a/.github/workflows/genai-tools.yml +++ b/.github/workflows/genai-tools.yml @@ -44,7 +44,7 @@ jobs: with: platform: ubuntu22 commit_packages_to_provide: wheels - revision: ed470e7e40129d6b2bf728bc9527316937a69ef7 + revision: latest_available_commit llm_bench: name: 'LLM bench tests' diff --git a/.github/workflows/job_vlm_sample_llava.yml b/.github/workflows/job_vlm_sample_llava.yml index a8a7a19a5b..1fb9cdee98 100644 --- a/.github/workflows/job_vlm_sample_llava.yml +++ b/.github/workflows/job_vlm_sample_llava.yml @@ -11,7 +11,7 @@ on: type: string env: - l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17800-91ae987c516/l_openvino_toolkit_ubuntu22_2025.0.0.dev20250109_x86_64.tgz + l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.1.0-17911-83c047443de/l_openvino_toolkit_ubuntu22_2025.1.0.dev20250116_x86_64.tgz jobs: visual_language_chat_sample-ubuntu-llava: diff --git a/.github/workflows/lcm_dreamshaper_cpp.yml b/.github/workflows/lcm_dreamshaper_cpp.yml index 6129aec624..55e4dc54ad 100644 --- a/.github/workflows/lcm_dreamshaper_cpp.yml +++ b/.github/workflows/lcm_dreamshaper_cpp.yml @@ -18,8 +18,8 @@ concurrency: env: PYTHON_VERSION: '3.9' - LINUX_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17800-91ae987c516/l_openvino_toolkit_ubuntu22_2025.0.0.dev20250109_x86_64.tgz - WINDOWS_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17800-91ae987c516/w_openvino_toolkit_windows_2025.0.0.dev20250109_x86_64.zip + LINUX_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.1.0-17911-83c047443de/l_openvino_toolkit_ubuntu22_2025.1.0.dev20250116_x86_64.tgz + WINDOWS_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.1.0-17911-83c047443de/w_openvino_toolkit_windows_2025.1.0.dev20250116_x86_64.zip OV_INSTALL_DIR: ${{ github.workspace }}/ov jobs: @@ -93,7 +93,7 @@ jobs: ${{ env.build_dir }}/samples/cpp/image_generation/inpainting ./models/lcm_dreamshaper_v7 "cyberpunk cityscape like Tokyo New York with tall buildings at dusk golden hour cinematic lighting" ./image.png ./mask_image.png lcm_dreamshaper_v7_cpp-windows: - runs-on: windows-2019 + runs-on: windows-2022 defaults: run: shell: pwsh diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ddc19f40d8..5fc5568853 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -52,7 +52,7 @@ jobs: with: platform: ubuntu22 commit_packages_to_provide: wheels - revision: ed470e7e40129d6b2bf728bc9527316937a69ef7 + revision: latest_available_commit - name: Clone docker tag from OpenVINO repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/stable_diffusion_1_5_cpp.yml b/.github/workflows/stable_diffusion_1_5_cpp.yml index b4680e579f..e0bf5371b3 100644 --- a/.github/workflows/stable_diffusion_1_5_cpp.yml +++ b/.github/workflows/stable_diffusion_1_5_cpp.yml @@ -45,7 +45,7 @@ jobs: with: platform: ubuntu22 commit_packages_to_provide: wheels - revision: ed470e7e40129d6b2bf728bc9527316937a69ef7 + revision: latest_available_commit openvino_download_windows: name: Download OpenVINO for Windows @@ -71,7 +71,7 @@ jobs: with: platform: windows commit_packages_to_provide: wheels - revision: ed470e7e40129d6b2bf728bc9527316937a69ef7 + revision: latest_available_commit stable_diffusion_1_5_cpp-linux: runs-on: ubuntu-22.04-8-cores diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6b402fe5a1..f3ff07b641 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,7 +17,7 @@ concurrency: env: PYTHON_VERSION: '3.11' - OV_BRANCH: 'ed470e7e40129d6b2bf728bc9527316937a69ef7' + OV_BRANCH: 'master' OV_TARBALL: '' jobs: diff --git a/samples/deployment-requirements.txt b/samples/deployment-requirements.txt index c6ad9eaaa8..312bd79799 100644 --- a/samples/deployment-requirements.txt +++ b/samples/deployment-requirements.txt @@ -1,5 +1,5 @@ --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly -openvino_genai~=2025.0.0.0.dev +openvino_genai~=2025.1.0.0.dev librosa==0.10.2.post1 # For Whisper pillow==11.1.0 # Image processing for VLMs diff --git a/samples/export-requirements.txt b/samples/export-requirements.txt index b7d1502f85..c35c2ca6de 100644 --- a/samples/export-requirements.txt +++ b/samples/export-requirements.txt @@ -1,7 +1,7 @@ --extra-index-url https://download.pytorch.org/whl/cpu --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly -openvino-tokenizers~=2025.0.0.0.dev +openvino-tokenizers~=2025.1.0.0.dev optimum-intel @ git+https://github.com/huggingface/optimum-intel.git numpy<2.0.0; sys_platform == 'darwin' einops==0.8.0 # For Qwen diff --git a/src/cpp/src/make_tokenizer_stateful.hpp b/src/cpp/src/make_tokenizer_stateful.hpp index 1f25d2ad21..9ad06ae07a 100644 --- a/src/cpp/src/make_tokenizer_stateful.hpp +++ b/src/cpp/src/make_tokenizer_stateful.hpp @@ -34,7 +34,7 @@ namespace genai { **/ class MakeCombineSegmentsSatateful : public ov::pass::ModelPass { public: - OPENVINO_RTTI("MakeCombineSegmentsSatateful", "0"); + OPENVINO_MODEL_PASS_RTTI("MakeCombineSegmentsSatateful"); bool run_on_model(const std::shared_ptr& model) override; }; @@ -70,7 +70,7 @@ class MakeCombineSegmentsSatateful : public ov::pass::ModelPass { **/ class MakeVocabDecoderSatateful : public ov::pass::ModelPass { public: - OPENVINO_RTTI("MakeVocabDecoderSatateful", "0"); + OPENVINO_MODEL_PASS_RTTI("MakeVocabDecoderSatateful"); bool run_on_model(const std::shared_ptr& model) override; }; diff --git a/thirdparty/openvino_tokenizers b/thirdparty/openvino_tokenizers index beea534d70..09c7005e0d 160000 --- a/thirdparty/openvino_tokenizers +++ b/thirdparty/openvino_tokenizers @@ -1 +1 @@ -Subproject commit beea534d70ec0e369d2ab27c916bd597a29c8de5 +Subproject commit 09c7005e0da46a50cc86b0e6e4ac9b8663a7af70