Skip to content

Update ov 10.07.2025 #3695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2025
+13 −17
Merged

Update ov 10.07.2025 #3695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af2f95a
Update ov 07
rasapala Oct 10, 2025
b085a27
Update llm engine
rasapala Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -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)\
Expand All @@ -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)\
Expand Down
4 changes: 2 additions & 2 deletions demos/common/export_models/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/llm/visual_language_model/continuous_batching/servable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ absl::Status VisualLanguageModelServable::prepareInputs(std::shared_ptr<GenAiSer
// Validate chat history for restricted tags
for (const auto& historyEntry : chatHistory) {
for (const auto& [_, content] : historyEntry) {
if (content.find("<ov_genai_image_") != std::string::npos) {
if (content.as<std::string>().find("<ov_genai_image_") != std::string::npos) {
return absl::InvalidArgumentError("Message contains restricted <ov_genai_image> tag");
}
}
Expand All @@ -86,7 +86,7 @@ absl::Status VisualLanguageModelServable::prepareInputs(std::shared_ptr<GenAiSer
vlmExecutionContext->inputImages.push_back(imageTensor);
}
for (const auto& [chatTurnIndex, imageTagString] : imageTags) {
chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"];
chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"].as<std::string>();
}
constexpr bool add_generation_prompt = true; // confirm it should be hardcoded
vlmExecutionContext->inputText = properties->tokenizer.apply_chat_template(chatHistory, add_generation_prompt);
Expand Down
4 changes: 2 additions & 2 deletions src/llm/visual_language_model/legacy/servable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ absl::Status VisualLanguageModelLegacyServable::prepareInputs(std::shared_ptr<Ge
// Validate chat history for restricted tags
for (const auto& historyEntry : chatHistory) {
for (const auto& [_, content] : historyEntry) {
if (content.find("<ov_genai_image_") != std::string::npos) {
if (content.as<std::string>().find("<ov_genai_image_") != std::string::npos) {
Copy link
Collaborator

@atobiszei atobiszei Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't there a chance in as<> to throw here/

Copy link
Collaborator Author

@rasapala rasapala Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested

return absl::InvalidArgumentError("Message contains restricted <ov_genai_image> tag");
}
}
Expand All @@ -238,7 +238,7 @@ absl::Status VisualLanguageModelLegacyServable::prepareInputs(std::shared_ptr<Ge
vlmExecutionContext->inputImages.push_back(imageTensor);
}
for (const auto& [chatTurnIndex, imageTagString] : imageTags) {
chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"];
chatHistory[chatTurnIndex]["content"] = imageTagString + chatHistory[chatTurnIndex]["content"].as<std::string>();
}
constexpr bool add_generation_prompt = true; // confirm it should be hardcoded
vlmExecutionContext->inputText = properties->tokenizer.apply_chat_template(chatHistory, add_generation_prompt);
Expand Down
2 changes: 1 addition & 1 deletion third_party/llm_engine/llm_engine.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion windows_install_build_dependencies.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down