diff --git a/Makefile b/Makefile index a2bd6625c0..de0fba052d 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 ?= 5928ba60fd5f592cbe9397c8a8425c927d78d98d # master 2025-05-03 +OV_SOURCE_BRANCH ?= 87425bc78ca82bee69541e6c35acceb4bfabd31c # releases/2025/2 RC1 OV_CONTRIB_BRANCH ?= c39462ca8d7c550266dc70cdbfbe4fc8c5be0677 # master / 2024-10-31 -OV_TOKENIZERS_BRANCH ?= 979cba29ffc1f99d3c53e28a2c29b750390e59d9 # master 2025-04-25 +OV_TOKENIZERS_BRANCH ?= 130827ab18915d60580c7522fc88990d59ef914f # releases/2025/2 RC1 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.2.0-18918-5928ba60fd5/openvino_toolkit_ubuntu24_2025.2.0.dev20250503_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2025.2.0rc1/openvino_toolkit_ubuntu24_2025.2.0.dev20250522_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.2.0-18918-5928ba60fd5/openvino_toolkit_ubuntu22_2025.2.0.dev20250503_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2025.2.0rc1/openvino_toolkit_ubuntu22_2025.2.0.dev20250522_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.2.0-18918-5928ba60fd5/openvino_toolkit_rhel8_2025.2.0.dev20250503_x86_64.tgz + DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/pre-release/2025.2.0rc1/openvino_toolkit_rhel8_2025.2.0.dev20250522_x86_64.tgz INSTALL_DRIVER_VERSION ?= "24.52.32224" endif diff --git a/src/test/llm/assisted_decoding_test.cpp b/src/test/llm/assisted_decoding_test.cpp index 5ecd43f302..8e0c28b0fa 100644 --- a/src/test/llm/assisted_decoding_test.cpp +++ b/src/test/llm/assisted_decoding_test.cpp @@ -136,6 +136,8 @@ class AssistedDecodingPipelinesHttpTest : public ::testing::Test { } static void TearDownTestSuite() { + llmExecutorWrapper.reset(); + cbPipe.reset(); ovms::Server& server = ovms::Server::instance(); server.setShutdownRequest(1); t->join(); diff --git a/src/test/llm/llmnode_test.cpp b/src/test/llm/llmnode_test.cpp index 7d654b6534..d408001dfd 100644 --- a/src/test/llm/llmnode_test.cpp +++ b/src/test/llm/llmnode_test.cpp @@ -151,6 +151,8 @@ class LLMFlowHttpTest : public ::testing::Test { } static void TearDownTestSuite() { + llmExecutorWrapper.reset(); + cbPipe.reset(); ovms::Server& server = ovms::Server::instance(); server.setShutdownRequest(1); t->join(); diff --git a/src/test/llm/text_streamer_test.cpp b/src/test/llm/text_streamer_test.cpp index 386821f4b3..36995fb7d6 100644 --- a/src/test/llm/text_streamer_test.cpp +++ b/src/test/llm/text_streamer_test.cpp @@ -55,6 +55,8 @@ class TextStreamerTest : public ::testing::Test { streamer = std::make_shared(*tokenizer, callback); } static void TearDownTestSuite() { + streamer.reset(); + tokenizer.reset(); servable.reset(); #if (PYTHON_DISABLE == 0) py::finalize_interpreter(); diff --git a/third_party/llm_engine/llm_engine.bzl b/third_party/llm_engine/llm_engine.bzl index 4c58e1599e..14b16dfe8d 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 = "a8146b175283a979023b47ce6192e71b070bc70f", # master 2025-05-02 + commit = "b7e8993565358a9e2d8f69bc915bfbf8e5ea9ed4", # releases/2025/2 RC1 build_file = "@_llm_engine//:BUILD", init_submodules = True, recursive_init_submodules = True, diff --git a/windows_install_build_dependencies.bat b/windows_install_build_dependencies.bat index c831b5bcea..7e2ef6a059 100644 --- a/windows_install_build_dependencies.bat +++ b/windows_install_build_dependencies.bat @@ -124,9 +124,9 @@ IF /I EXIST %bash_path% ( ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::: GENAI/OPENVINO - reinstalled per build trigger -set "genai_dir=openvino_genai_windows_2025.2.0.0.dev20250503_x86_64" -set "genai_ver=openvino_genai_windows_2025.2.0.0.dev20250503_x86_64.zip" -set "genai_http=https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/nightly/2025.2.0.0.dev20250503/" +set "genai_dir=openvino_genai_windows_2025.2.0.0rc1_x86_64" +set "genai_ver=openvino_genai_windows_2025.2.0.0rc1_x86_64.zip" +set "genai_http=https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/pre-release/2025.2.0.0rc1/" set "genai_zip=%BAZEL_SHORT_PATH%\%genai_ver%" set "genai_workspace=C:\\\\opt\\\\openvino\\\\runtime"