From af2f95a9393a9e967d25e7bccd8a4e60aa893e40 Mon Sep 17 00:00:00 2001 From: rasapala Date: Fri, 10 Oct 2025 10:50:44 +0200 Subject: [PATCH 1/2] Update ov 07 --- Makefile | 14 +++++--------- demos/common/export_models/requirements.txt | 4 ++-- .../continuous_batching/servable.cpp | 4 ++-- src/llm/visual_language_model/legacy/servable.cpp | 4 ++-- windows_install_build_dependencies.bat | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index c70fb37f4e..3f8fb4af6c 100644 --- a/Makefile +++ b/Makefile @@ -75,12 +75,10 @@ FUZZER_BUILD ?= 0 # - uncomment source build section, comment binary section # - adjust binary version path - version variable is not passed to WORKSPACE file! -OV_SOURCE_BRANCH ?= 4a90bedcdd64dc4d6fee54cf03de6c5617b35a48 # master 2025/09/23 -OV_CONTRIB_BRANCH ?= c39462ca8d7c550266dc70cdbfbe4fc8c5be0677 # master / 2024-10-31 -OV_TOKENIZERS_BRANCH ?= bd47b33bcae913c59dcbe7e67ff52dbdf826ac32 # master 2025/09/18 +OV_SOURCE_BRANCH ?= 80e587bccec151a9acb0bc73fb96d007daa56e82 # master 2025/10/07 +OV_TOKENIZERS_BRANCH ?= 760f9140ab1fd330d62ec171673ca0705abe6aa0 # master 2025/10/07 OV_SOURCE_ORG ?= openvinotoolkit -OV_CONTRIB_ORG ?= openvinotoolkit TEST_LLM_PATH ?= "src/test/llm_testing" GPU_MODEL_PATH ?= "/tmp/face_detection_adas" @@ -162,11 +160,11 @@ ifeq ($(findstring ubuntu,$(BASE_OS)),ubuntu) ifeq ($(BASE_OS_TAG),24.04) OS=ubuntu24 INSTALL_DRIVER_VERSION ?= "25.35.35096" - DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.4.0-20052-4a90bedcdd6/openvino_toolkit_ubuntu24_2025.4.0.dev20250923_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.4.0-20120-80e587bccec/openvino_toolkit_ubuntu22_2025.4.0.dev20251007_x86_64.tgz else ifeq ($(BASE_OS_TAG),22.04) OS=ubuntu22 INSTALL_DRIVER_VERSION ?= "24.39.31294" - DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.4.0-20052-4a90bedcdd6/openvino_toolkit_ubuntu22_2025.4.0.dev20250923_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.4.0-20120-80e587bccec/openvino_toolkit_ubuntu24_2025.4.0.dev20251007_x86_64.tgz endif endif ifeq ($(BASE_OS),redhat) @@ -175,7 +173,7 @@ ifeq ($(BASE_OS),redhat) BASE_IMAGE ?= registry.access.redhat.com/ubi9/ubi:$(BASE_OS_TAG_REDHAT) BASE_IMAGE_RELEASE=registry.access.redhat.com/ubi9/ubi-minimal:$(BASE_OS_TAG_REDHAT) DIST_OS=redhat - DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.4.0-20052-4a90bedcdd6/openvino_toolkit_rhel8_2025.4.0.dev20250923_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.4.0-20120-80e587bccec/openvino_toolkit_rhel8_2025.4.0.dev20251007_x86_64.tgz INSTALL_DRIVER_VERSION ?= "24.52.32224" endif @@ -212,7 +210,6 @@ BUILD_ARGS = --build-arg http_proxy=$(HTTP_PROXY)\ --build-arg no_proxy=$(NO_PROXY)\ --build-arg ov_source_branch=$(OV_SOURCE_BRANCH)\ --build-arg ov_source_org=$(OV_SOURCE_ORG)\ - --build-arg ov_contrib_org=$(OV_CONTRIB_ORG)\ --build-arg ov_use_binary=$(OV_USE_BINARY)\ --build-arg DLDT_PACKAGE_URL=$(DLDT_PACKAGE_URL)\ --build-arg CHECK_COVERAGE=$(CHECK_COVERAGE)\ @@ -226,7 +223,6 @@ BUILD_ARGS = --build-arg http_proxy=$(HTTP_PROXY)\ --build-arg PROJECT_VERSION=$(PROJECT_VERSION)\ --build-arg BASE_IMAGE=$(BASE_IMAGE)\ --build-arg BASE_OS=$(BASE_OS)\ - --build-arg ov_contrib_branch=$(OV_CONTRIB_BRANCH)\ --build-arg ov_tokenizers_branch=$(OV_TOKENIZERS_BRANCH)\ --build-arg INSTALL_RPMS_FROM_URL=$(INSTALL_RPMS_FROM_URL)\ --build-arg INSTALL_DRIVER_VERSION=$(INSTALL_DRIVER_VERSION)\ diff --git a/demos/common/export_models/requirements.txt b/demos/common/export_models/requirements.txt index 80023c8504..e90af614fa 100644 --- a/demos/common/export_models/requirements.txt +++ b/demos/common/export_models/requirements.txt @@ -3,8 +3,8 @@ --extra-index-url "https://storage.openvinotoolkit.org/simple/wheels/pre-release" --pre optimum-intel@git+https://github.com/huggingface/optimum-intel.git -openvino-tokenizers==2025.4.0.0.dev20250923 -openvino==2025.4.0.dev20250923 +openvino-tokenizers==2025.4.0.0.dev20251007 +openvino==2025.4.0.dev20251007 nncf>=2.11.0 sentence_transformers sentencepiece==0.2.0 diff --git a/src/llm/visual_language_model/continuous_batching/servable.cpp b/src/llm/visual_language_model/continuous_batching/servable.cpp index c76b1d28f9..b4f3ca644a 100644 --- a/src/llm/visual_language_model/continuous_batching/servable.cpp +++ b/src/llm/visual_language_model/continuous_batching/servable.cpp @@ -70,7 +70,7 @@ absl::Status VisualLanguageModelServable::prepareInputs(std::shared_ptr().find(" tag"); } } @@ -86,7 +86,7 @@ absl::Status VisualLanguageModelServable::prepareInputs(std::shared_ptrinputImages.push_back(imageTensor); } for (const auto& [chatTurnIndex, imageTagString] : imageTags) { - chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"]; + chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"].as(); } constexpr bool add_generation_prompt = true; // confirm it should be hardcoded vlmExecutionContext->inputText = properties->tokenizer.apply_chat_template(chatHistory, add_generation_prompt); diff --git a/src/llm/visual_language_model/legacy/servable.cpp b/src/llm/visual_language_model/legacy/servable.cpp index 78e2f0d7a1..2a332c4fe7 100644 --- a/src/llm/visual_language_model/legacy/servable.cpp +++ b/src/llm/visual_language_model/legacy/servable.cpp @@ -222,7 +222,7 @@ absl::Status VisualLanguageModelLegacyServable::prepareInputs(std::shared_ptr().find(" tag"); } } @@ -238,7 +238,7 @@ absl::Status VisualLanguageModelLegacyServable::prepareInputs(std::shared_ptrinputImages.push_back(imageTensor); } for (const auto& [chatTurnIndex, imageTagString] : imageTags) { - chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"]; + chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"].as(); } constexpr bool add_generation_prompt = true; // confirm it should be hardcoded vlmExecutionContext->inputText = properties->tokenizer.apply_chat_template(chatHistory, add_generation_prompt); diff --git a/windows_install_build_dependencies.bat b/windows_install_build_dependencies.bat index 76bc2e9de3..105bc2cede 100644 --- a/windows_install_build_dependencies.bat +++ b/windows_install_build_dependencies.bat @@ -137,7 +137,7 @@ IF /I EXIST %bash_path% ( ::::::::::::::::::::::: GENAI/OPENVINO - reinstalled per build trigger :: Set default GENAI_PACKAGE_URL if not set if "%GENAI_PACKAGE_URL%"=="" ( - set "GENAI_PACKAGE_URL=https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/nightly/2025.4.0.0.dev20250923/openvino_genai_windows_2025.4.0.0.dev20250923_x86_64.zip" + set "GENAI_PACKAGE_URL=https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/nightly/2025.4.0.0.dev20251007/openvino_genai_windows_2025.4.0.0.dev20251007_x86_64.zip" ) :: Extract genai_ver from GENAI_PACKAGE_URL (filename) From b085a27598aa7221f29c904aa67f3fd76add673b Mon Sep 17 00:00:00 2001 From: rasapala Date: Fri, 10 Oct 2025 11:33:11 +0200 Subject: [PATCH 2/2] Update llm engine --- third_party/llm_engine/llm_engine.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/llm_engine/llm_engine.bzl b/third_party/llm_engine/llm_engine.bzl index cd6a93960d..d8a9063f8e 100644 --- a/third_party/llm_engine/llm_engine.bzl +++ b/third_party/llm_engine/llm_engine.bzl @@ -24,7 +24,7 @@ def llm_engine(): new_git_repository( name = "llm_engine", remote = "https://github.com/openvinotoolkit/openvino.genai", - commit = "8e86a984f7ab14579a6ab7c58258abdbababa38b", # master 2025-09-23 Increase GGUF timeouts (#2756) + commit = "5ee23bb370dae67d58318bc60b9123a1eb27bb41", # master 2025-10-07 Safe VLM JSON config parsing with `read_json_param()` (#2785) build_file = "@_llm_engine//:BUILD", init_submodules = True, recursive_init_submodules = True,