diff --git a/Makefile b/Makefile index a2a5c65eaf..5bb00537c2 100644 --- a/Makefile +++ b/Makefile @@ -74,9 +74,9 @@ FUZZER_BUILD ?= 0 # NOTE: when changing any value below, you'll need to adjust WORKSPACE file by hand: # - uncomment source build section, comment binary section # - adjust binary version path - version variable is not passed to WORKSPACE file! -OV_SOURCE_BRANCH ?= cc73719a2c667106c454f3abe663e312832365f1 # master 2025-07-29 +OV_SOURCE_BRANCH ?= c619ac6a5960d3edddcebcfc9b80d9f112d76b4f # master 2025-08-09 OV_CONTRIB_BRANCH ?= c39462ca8d7c550266dc70cdbfbe4fc8c5be0677 # master / 2024-10-31 -OV_TOKENIZERS_BRANCH ?= d9a2bb05e750f1c628ada5ed81457f880719fd73 # master 2025-07-25 +OV_TOKENIZERS_BRANCH ?= a2c94833148c4c6a3d14223f9a666d361dab5b43 # master 2025-08-01 OV_SOURCE_ORG ?= openvinotoolkit OV_CONTRIB_ORG ?= openvinotoolkit @@ -161,11 +161,11 @@ ifeq ($(findstring ubuntu,$(BASE_OS)),ubuntu) ifeq ($(BASE_OS_TAG),24.04) OS=ubuntu24 INSTALL_DRIVER_VERSION ?= "24.52.32224" - DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.3.0-19616-cc73719a2c6/openvino_toolkit_ubuntu24_2025.3.0.dev20250729_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.3.0-19757-b3c74fae04a/openvino_toolkit_ubuntu24_2025.3.0.dev20250812_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.3.0-19616-cc73719a2c6/openvino_toolkit_ubuntu22_2025.3.0.dev20250729_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.3.0-19757-b3c74fae04a/openvino_toolkit_ubuntu22_2025.3.0.dev20250812_x86_64.tgz endif endif ifeq ($(BASE_OS),redhat) @@ -174,7 +174,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.3.0-19616-cc73719a2c6/openvino_toolkit_rhel8_2025.3.0.dev20250729_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.3.0-19757-b3c74fae04a/openvino_toolkit_rhel8_2025.3.0.dev20250812_x86_64.tgz INSTALL_DRIVER_VERSION ?= "24.52.32224" endif diff --git a/WORKSPACE b/WORKSPACE index 5f3e717a3f..77a20cd94a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -424,6 +424,7 @@ http_archive( "@mediapipe//third_party:org_tensorflow_custom_ops.diff", "@mediapipe//third_party:org_tensorflow_objc_build_fixes.diff", "tf_2.18_logging.patch", + "tf_nsync_chrono.patch", ], patch_args = [ "-p1", diff --git a/ci/lib_search.py b/ci/lib_search.py index 9db3f4c722..fd810da8b1 100644 --- a/ci/lib_search.py +++ b/ci/lib_search.py @@ -122,6 +122,7 @@ def check_dir(start_dir): 'upb_warning_turn_off.patch', 'partial_2.18.patch', 'tf_2.18_logging.patch', + 'tf_nsync_chrono.patch', 'vehicle_images.txt', 'bazel_rules_apple.patch', "go.sum", @@ -227,6 +228,7 @@ def check_func(start_dir): 'tftext.patch', 'partial_2.18.patch', 'tf_2.18_logging.patch', + 'tf_nsync_chrono.patch', 'zlib.LICENSE.txt', 'bazel_rules_apple.patch', 'yarn.lock', diff --git a/common_settings.bzl b/common_settings.bzl index 2d6477185f..d0248e0616 100644 --- a/common_settings.bzl +++ b/common_settings.bzl @@ -187,6 +187,8 @@ WINDOWS_COMMON_STATIC_LIBS_COPTS = [ "/GS", "/DYNAMICBASE", "/Qspectre", + "/wd4305", # abseil after switch to build tools 22 + "/wd4324", # genai after switch to build tools 22 "/wd4068", "/wd4458", "/wd4100", diff --git a/demos/common/export_models/requirements.txt b/demos/common/export_models/requirements.txt index a5dde79fe4..e6a946329d 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 -openvino-tokenizers<=2025.3.0.0.dev20250729 -openvino<=2025.3.0.dev20250729 +openvino-tokenizers<=2025.3.0.0.dev20250812 +openvino<=2025.3.0.dev20250812 nncf>=2.11.0 sentence_transformers sentencepiece==0.2.0 diff --git a/external/cb.patch b/external/cb.patch deleted file mode 100644 index 78e571c183..0000000000 --- a/external/cb.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ee1cb70f..0555500c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,15 +88,15 @@ endif() - - add_subdirectory(thirdparty) - add_subdirectory(src) --if(EXISTS "${OpenVINOGenAI_SOURCE_DIR}/samples" AND ENABLE_SAMPLES) -- add_subdirectory(samples) --endif() --if(EXISTS "${OpenVINOGenAI_SOURCE_DIR}/tools/continuous_batching") -- add_subdirectory(tools/continuous_batching) --endif() --if(EXISTS "${OpenVINOGenAI_SOURCE_DIR}/tests/cpp") -- add_subdirectory(tests/cpp) --endif() -+#if(EXISTS "${OpenVINOGenAI_SOURCE_DIR}/samples" AND ENABLE_SAMPLES) -+# add_subdirectory(samples) -+#endif() -+#if(EXISTS "${OpenVINOGenAI_SOURCE_DIR}/tools/continuous_batching") -+# add_subdirectory(tools/continuous_batching) -+#endif() -+#if(EXISTS "${OpenVINOGenAI_SOURCE_DIR}/tests/cpp") -+# add_subdirectory(tests/cpp) -+#endif() - - install(FILES LICENSE DESTINATION docs/licensing COMPONENT licensing_genai RENAME LICENSE-GENAI) - install(FILES third-party-programs.txt DESTINATION docs/licensing COMPONENT licensing_genai RENAME third-party-programs-genai.txt) - diff --git a/external/tf_nsync_chrono.patch b/external/tf_nsync_chrono.patch new file mode 100644 index 0000000000..43671fc5e6 --- /dev/null +++ b/external/tf_nsync_chrono.patch @@ -0,0 +1,31 @@ +diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl +index be83c971749..bd80e19896e 100644 +--- a/tensorflow/workspace2.bzl ++++ b/tensorflow/workspace2.bzl +@@ -396,7 +396,7 @@ def _tf_repositories(): + + tf_http_archive( + name = "nsync", +- patch_file = ["//third_party:nsync.patch"], ++ patch_file = ["//third_party:nsync.patch", "//third_party:nsync_chrono.patch"], + sha256 = "1d63e967973733d2c97e841e3c05fac4d3fa299f01d14c86f2695594c7a4a2ec", + strip_prefix = "nsync-1.29.2", + system_build_file = "//third_party/systemlibs:nsync.BUILD", +diff --git a/third_party/nsync_chrono.patch b/third_party/nsync_chrono.patch +new file mode 100644 +index 00000000000..7f0f8539727 +--- /dev/null ++++ b/third_party/nsync_chrono.patch +@@ -0,0 +1,12 @@ ++diff --git a/platform/c++11/platform.h b/platform/c++11/platform.h ++index 2c80e0b..4fbc6d0 100644 ++--- a/platform/c++11/platform.h +++++ b/platform/c++11/platform.h ++@@ -28,6 +28,7 @@ ++ ++ #include ++ #include +++#include ++ ++ #include "nsync_cpp.h" ++ diff --git a/src/test/llm/llmnode_test.cpp b/src/test/llm/llmnode_test.cpp index 509c0cdce3..31001851c0 100644 --- a/src/test/llm/llmnode_test.cpp +++ b/src/test/llm/llmnode_test.cpp @@ -2680,7 +2680,8 @@ TEST_P(LLMHttpParametersValidationTest, missingContentInMessage) { #endif if (params.modelName.find("vlm") != std::string::npos) { - genAiTemplateParsing = true; // VLM models always use GenAI template parsing + ASSERT_EQ(status.getCode(), ovms::StatusCode::OK); // GenAI accepts such messages, so we expect a successful response + return; } if (genAiTemplateParsing) { @@ -3189,9 +3190,15 @@ TEST_P(LLMHttpParametersValidationTest, MessagesWithOnlyRole) { } )"; - ASSERT_EQ( - handler->dispatchToProcessor(endpointChatCompletions, requestBody, &response, comp, responseComponents, writer, multiPartParser), - ovms::StatusCode::MEDIAPIPE_EXECUTION_ERROR); + if (params.modelName.find("vlm") != std::string::npos) { + ASSERT_EQ( + handler->dispatchToProcessor(endpointChatCompletions, requestBody, &response, comp, responseComponents, writer, multiPartParser), + ovms::StatusCode::OK); // GenAI supports such messages + } else { + ASSERT_EQ( + handler->dispatchToProcessor(endpointChatCompletions, requestBody, &response, comp, responseComponents, writer, multiPartParser), + ovms::StatusCode::MEDIAPIPE_EXECUTION_ERROR); + } } TEST_P(LLMHttpParametersValidationTest, SpeculativeDecodingNoSDSpecificParametersProvided) { diff --git a/third_party/llm_engine/llm_engine.bzl b/third_party/llm_engine/llm_engine.bzl index e27214bdfc..c997156810 100644 --- a/third_party/llm_engine/llm_engine.bzl +++ b/third_party/llm_engine/llm_engine.bzl @@ -24,12 +24,11 @@ def llm_engine(): new_git_repository( name = "llm_engine", remote = "https://github.com/openvinotoolkit/openvino.genai", - commit = "31b2c55dadcbfb1e4413eeb32c355c81e5bd436a", # master 2025-07-29 + commit = "d6b2e816ba8edc52f3f4ac459240f664df67c1b8", # master 2025-08-13 build_file = "@_llm_engine//:BUILD", init_submodules = True, recursive_init_submodules = True, patch_args = ["-p1"], - patches = ["cb.patch"], ) # when using local repository manually run: git submodule update --recursive #native.new_local_repository( @@ -66,6 +65,9 @@ def _impl(repository_ctx): "WIN32": "True", "X86_64": "True", "BUILD_TOKENIZERS": "OFF", + "ENABLE_SAMPLES": "OFF", + "ENABLE_TOOLS": "OFF", + "ENABLE_TESTS": "OFF", "ENABLE_XGRAMMAR": "ON", """ jobs_param = "\"-j 8\"" # on Windows we do not need to specify number of jobs, it's set to all available cores number @@ -82,6 +84,9 @@ def _impl(repository_ctx): "CMAKE_ARCHIVE_OUTPUT_DIRECTORY": "lib", "ENABLE_SYSTEM_ICU": "True", "BUILD_TOKENIZERS": "OFF", + "ENABLE_SAMPLES": "OFF", + "ENABLE_TOOLS": "OFF", + "ENABLE_TESTS": "OFF", "ENABLE_XGRAMMAR": "ON", """ jobs_param = "\"-j 8\"" # on Linux we need to specify jobs number, by default it's set to 1 diff --git a/windows_build.bat b/windows_build.bat index ab6671d423..2d58dceaba 100644 --- a/windows_build.bat +++ b/windows_build.bat @@ -56,18 +56,12 @@ set "setPythonPath=%cd%\bazel-out\x64_windows-opt\bin\src\python\binding" set "BAZEL_SH=C:\opt\msys64\usr\bin\bash.exe" :: Bazel compilation settings -set VS_2019_PRO="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional" set VS_2022_BT="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools" -IF /I EXIST %VS_2019_PRO% goto :msvc_pro IF /I EXIST %VS_2022_BT% goto :msvc_bt ELSE goto :msvc_error :msvc_error echo [ERROR] Required MSVC compiler not installed goto :exit_build_error -:msvc_pro -echo [INFO] Using MSVC %VS_2019_PRO% -set BAZEL_VS=%VS_2019_PRO% -goto :msvc_end :msvc_bt echo [INFO] Using MSVC %VS_2022_BT% set BAZEL_VS=%VS_2022_BT% @@ -75,7 +69,7 @@ set BAZEL_VS=%VS_2022_BT% :: Bazel compilation settings end :msvc_end set "BAZEL_VC=%BAZEL_VS:"=%\VC" -set "BAZEL_VC_FULL_VERSION=14.29.30133" +set "BAZEL_VC_FULL_VERSION=14.44.35207" :: Set proper PATH environment variable: Remove other python paths and add c:\opt with bazel to PATH set "PATH=%setPath%" diff --git a/windows_install_build_dependencies.bat b/windows_install_build_dependencies.bat index b5e1634101..a528173514 100644 --- a/windows_install_build_dependencies.bat +++ b/windows_install_build_dependencies.bat @@ -45,22 +45,15 @@ set "PYTHONHOME=C:\opt\Python312" set "PATH=%setPath%" :: Bazel compilation settings -set VS_2019_PRO="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional" set VS_2022_BT="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools" -IF /I EXIST %VS_2019_PRO% goto :msvc_pro IF /I EXIST %VS_2022_BT% goto :msvc_bt ELSE goto :msvc_error :msvc_error echo [ERROR] Required MSVC compiler not installed goto :exit_build_error -:msvc_pro -echo [INFO] Using MSVC %VS_2019_PRO% -set BAZEL_VS=%VS_2019_PRO% -goto :msvc_end :msvc_bt echo [INFO] Using MSVC %VS_2022_BT% set BAZEL_VS=%VS_2022_BT% -:msvc_end ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::: Check directories @@ -137,14 +130,14 @@ IF /I EXIST %bash_path% ( ) ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -::::::::::::::::::::::: Install in c:\PR-XXXX\ section started - once per build, reinstalled only with expunge clean :::::::::::::::::::::::::::::::::: +::::::::::::::::::::::: Install in c:\PR-XXXX\ section started - once per build, reinstalled only with expunge clean :::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::: 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.3.0.0.dev20250729/openvino_genai_windows_2025.3.0.0.dev20250729_x86_64.zip" + set "GENAI_PACKAGE_URL=https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/nightly/2025.3.0.0.dev20250812/openvino_genai_windows_2025.3.0.0.dev20250812_x86_64.zip" ) :: Extract genai_ver from GENAI_PACKAGE_URL (filename) diff --git a/windows_setupvars.bat b/windows_setupvars.bat index 6552e66c5b..3312f1f03a 100644 --- a/windows_setupvars.bat +++ b/windows_setupvars.bat @@ -20,26 +20,19 @@ set "setPythonPath=%cd%\bazel-out\x64_windows-opt\bin\src\python\binding" set "BAZEL_SH=C:\opt\msys64\usr\bin\bash.exe" :: Bazel compilation settings -set VS_2019_PRO="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional" set VS_2022_BT="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools" -IF /I EXIST %VS_2019_PRO% goto :msvc_pro IF /I EXIST %VS_2022_BT% goto :msvc_bt ELSE goto :msvc_error :msvc_error echo [ERROR] Required MSVC compiler not installed goto :exit_build_error -:msvc_pro -echo [INFO] Using MSVC %VS_2019_PRO% -set BAZEL_VS=%VS_2019_PRO% -goto :msvc_end :msvc_bt echo [INFO] Using MSVC %VS_2022_BT% set BAZEL_VS=%VS_2022_BT% :: Bazel compilation settings end -:msvc_end set "BAZEL_VC=%BAZEL_VS:"=%\VC" -set "BAZEL_VC_FULL_VERSION=14.29.30133" +set "BAZEL_VC_FULL_VERSION=14.44.35207" :: Set proper PATH environment variable: Remove other python paths and add c:\opt with bazel to PATH set "PATH=%setPath%" diff --git a/windows_test.bat b/windows_test.bat index 86965edf24..270c502d57 100644 --- a/windows_test.bat +++ b/windows_test.bat @@ -45,25 +45,18 @@ set "setPythonPath=%cd%\bazel-out\x64_windows-opt\bin\src\python\binding" set "BAZEL_SH=C:\opt\msys64\usr\bin\bash.exe" :: Bazel compilation settings -set VS_2019_PRO="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional" set VS_2022_BT="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools" -IF /I EXIST %VS_2019_PRO% goto :msvc_pro IF /I EXIST %VS_2022_BT% goto :msvc_bt ELSE goto :msvc_error :msvc_error echo [ERROR] Required MSVC compiler not installed goto :exit_build_error -:msvc_pro -echo [INFO] Using MSVC %VS_2019_PRO% -set BAZEL_VS=%VS_2019_PRO% -goto :msvc_end :msvc_bt echo [INFO] Using MSVC %VS_2022_BT% set BAZEL_VS=%VS_2022_BT% :: Bazel compilation settings end -:msvc_end set "BAZEL_VC=%BAZEL_VS:"=%\VC" -set "BAZEL_VC_FULL_VERSION=14.29.30133" +set "BAZEL_VC_FULL_VERSION=14.44.35207" :: Set proper PATH environment variable: Remove other python paths and add c:\opt with bazel to PATH set "PATH=%setPath%"