Skip to content

Commit 216e5fc

Browse files
authored
Switch to nightly OV on main (#3427)
1 parent 690638c commit 216e5fc

File tree

12 files changed

+84
-91
lines changed

12 files changed

+84
-91
lines changed

Dockerfile.redhat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ RUN if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
243243
mkdir -p /opt/intel/openvino/python/openvino_tokenizers/lib ; \
244244
cp -r python/* /opt/intel/openvino/python/ ; \
245245
cp build/python/* /opt/intel/openvino/python/openvino_tokenizers/ ; \
246-
mkdir -p /opt/intel/openvino/python/openvino_tokenizers-2025.2.dist-info ; \
247-
echo $'Metadata-Version: 1.0\nName: openvino-tokenizers\nVersion: 2025.2\nRequires-Python: >=3.9\nRequires-Dist: openvino~=2025.2.0' > /opt/intel/openvino/python/openvino_tokenizers-2025.2.dist-info/METADATA ; \
246+
mkdir -p /opt/intel/openvino/python/openvino_tokenizers-2025.3.dist-info ; \
247+
echo $'Metadata-Version: 1.0\nName: openvino-tokenizers\nVersion: 2025.3\nRequires-Python: >=3.9\nRequires-Dist: openvino~=2025.3.0' > /opt/intel/openvino/python/openvino_tokenizers-2025.3.dist-info/METADATA ; \
248248
ln -s /ovms/lib/libopenvino_tokenizers.so /opt/intel/openvino/python/openvino_tokenizers/lib/libopenvino_tokenizers.so ; fi
249249

250250
# Build OpenVINO Model Server
@@ -284,8 +284,8 @@ WORKDIR /ovms/src/example/SampleCpuExtension/
284284
RUN make
285285

286286
RUN if ! [[ $debug_bazel_flags == *"py_off"* ]]; then true ; else exit 0 ; fi ; \
287-
mkdir -p /opt/intel/openvino/python/openvino-2025.2.dist-info && \
288-
echo $'Metadata-Version: 1.0\nName: openvino\nVersion: 2025.2' > /opt/intel/openvino/python/openvino-2025.2.dist-info/METADATA
287+
mkdir -p /opt/intel/openvino/python/openvino-2025.3.dist-info && \
288+
echo $'Metadata-Version: 1.0\nName: openvino\nVersion: 2025.3' > /opt/intel/openvino/python/openvino-2025.3.dist-info/METADATA
289289
ENV PYTHONPATH=/opt/intel/openvino/python:/ovms/bazel-bin/src/python/binding
290290

291291
WORKDIR /ovms

Dockerfile.ubuntu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ RUN if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
224224
mkdir -p /opt/intel/openvino/python/openvino_tokenizers/lib ; \
225225
cp -r python/* /opt/intel/openvino/python/ ; \
226226
cp build/python/* /opt/intel/openvino/python/openvino_tokenizers/ ; \
227-
mkdir -p /opt/intel/openvino/python/openvino_tokenizers-2025.2.dist-info ; \
228-
echo $'Metadata-Version: 1.0\nName: openvino-tokenizers\nVersion: 2025.2\nRequires-Python: >=3.9\nRequires-Dist: openvino~=2025.2.0' > /opt/intel/openvino/python/openvino_tokenizers-2025.2.dist-info/METADATA ; \
227+
mkdir -p /opt/intel/openvino/python/openvino_tokenizers-2025.3.dist-info ; \
228+
echo $'Metadata-Version: 1.0\nName: openvino-tokenizers\nVersion: 2025.3\nRequires-Python: >=3.9\nRequires-Dist: openvino~=2025.3.0' > /opt/intel/openvino/python/openvino_tokenizers-2025.3.dist-info/METADATA ; \
229229
ln -s /ovms/lib/libopenvino_tokenizers.so /opt/intel/openvino/python/openvino_tokenizers/lib/libopenvino_tokenizers.so ; fi
230230

231231
ARG ov_tokenizers_branch=master
@@ -285,8 +285,8 @@ WORKDIR /ovms/src/example/SampleCpuExtension/
285285
RUN make && cp libcustom_relu_cpu_extension.so /opt
286286

287287
RUN if ! [[ $debug_bazel_flags == *"py_off"* ]]; then true ; else exit 0 ; fi ; \
288-
mkdir -p /opt/intel/openvino/python/openvino-2025.2.dist-info && \
289-
echo $'Metadata-Version: 1.0\nName: openvino\nVersion: 2025.2' > /opt/intel/openvino/python/openvino-2025.2.dist-info/METADATA
288+
mkdir -p /opt/intel/openvino/python/openvino-2025.3.dist-info && \
289+
echo $'Metadata-Version: 1.0\nName: openvino\nVersion: 2025.3' > /opt/intel/openvino/python/openvino-2025.3.dist-info/METADATA
290290

291291
WORKDIR /ovms
292292

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ FUZZER_BUILD ?= 0
7474
# NOTE: when changing any value below, you'll need to adjust WORKSPACE file by hand:
7575
# - uncomment source build section, comment binary section
7676
# - adjust binary version path - version variable is not passed to WORKSPACE file!
77-
OV_SOURCE_BRANCH ?= c01cd93e24d1cd78bfbb401eed51c08fb93e0816 # releases/2025/2 RC4
77+
OV_SOURCE_BRANCH ?= 3b7248ef6de0a6960a7cc3ec5866bab0ee187f23 # master 2025-07-16
7878
OV_CONTRIB_BRANCH ?= c39462ca8d7c550266dc70cdbfbe4fc8c5be0677 # master / 2024-10-31
79-
OV_TOKENIZERS_BRANCH ?= 85be884a69f10270703f81f970a5ee596a4c8df7 # releases/2025/2 RC4
79+
OV_TOKENIZERS_BRANCH ?= ad1d5550bb726aeb296c4bd964f477ffd9b77247 # master 2025-05-26
8080

8181
OV_SOURCE_ORG ?= openvinotoolkit
8282
OV_CONTRIB_ORG ?= openvinotoolkit
@@ -161,11 +161,11 @@ ifeq ($(findstring ubuntu,$(BASE_OS)),ubuntu)
161161
ifeq ($(BASE_OS_TAG),24.04)
162162
OS=ubuntu24
163163
INSTALL_DRIVER_VERSION ?= "24.52.32224"
164-
DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/2025.2/linux/openvino_toolkit_ubuntu24_2025.2.0.19140.c01cd93e24d_x86_64.tgz
164+
DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.3.0-19515-3b7248ef6de/openvino_toolkit_ubuntu24_2025.3.0.dev20250716_x86_64.tgz
165165
else ifeq ($(BASE_OS_TAG),22.04)
166166
OS=ubuntu22
167167
INSTALL_DRIVER_VERSION ?= "24.39.31294"
168-
DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/2025.2/linux/openvino_toolkit_ubuntu22_2025.2.0.19140.c01cd93e24d_x86_64.tgz
168+
DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.3.0-19515-3b7248ef6de/openvino_toolkit_ubuntu22_2025.3.0.dev20250716_x86_64.tgz
169169
endif
170170
endif
171171
ifeq ($(BASE_OS),redhat)
@@ -174,7 +174,7 @@ ifeq ($(BASE_OS),redhat)
174174
BASE_IMAGE ?= registry.access.redhat.com/ubi9/ubi:$(BASE_OS_TAG_REDHAT)
175175
BASE_IMAGE_RELEASE=registry.access.redhat.com/ubi9/ubi-minimal:$(BASE_OS_TAG_REDHAT)
176176
DIST_OS=redhat
177-
DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/2025.2/linux/openvino_toolkit_rhel8_2025.2.0.19140.c01cd93e24d_x86_64.tgz
177+
DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.3.0-19515-3b7248ef6de/openvino_toolkit_rhel8_2025.3.0.dev20250716_x86_64.tgz
178178
INSTALL_DRIVER_VERSION ?= "24.52.32224"
179179
endif
180180

create_package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cd /ovms_release/lib/ ; rm -f libcurl.so*
2929
cd /ovms_release/lib/ ; rm -f libazurestorage.so.* ; ln -s libazurestorage.so libazurestorage.so.7 ;ln -s libazurestorage.so libazurestorage.so.7.5
3030
cd /ovms_release/lib/ ; rm -f libcpprest.so.2.10 ; ln -s libcpprest.so libcpprest.so.2.10
3131

32-
if [ -f /ovms_release/lib/libopenvino_genai.so ]; then cd /ovms_release/lib/ ; rm -f libopenvino_genai.so.* ; ln -s libopenvino_genai.so libopenvino_genai.so.2520 ; ln -s libopenvino_genai.so.2025.2.0.0 libopenvino_genai.so.2520 ; fi
32+
if [ -f /ovms_release/lib/libopenvino_genai.so ]; then cd /ovms_release/lib/ ; rm -f libopenvino_genai.so.* ; ln -s libopenvino_genai.so libopenvino_genai.so.2530 ; ln -s libopenvino_genai.so.2025.3.0.0 libopenvino_genai.so.2530 ; fi
3333
if [ -f /ovms_release/lib/libopenvino_genai_c.so ]; then cd /ovms_release/lib/ ; rm -f libopenvino_genai_c.so* ; fi
3434

3535
# Remove GPU plugin for CPU images?

demos/common/export_models/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--pre
55
optimum-intel@git+https://github.com/huggingface/optimum-intel.git@3b2cffb40c3de6bd3bf90c1e8a98d902e87db80d
66
openvino-tokenizers==2025.2.0.0rc3
7-
openvino==2025.2.0rc3
7+
openvino<=2025.3.0.dev20250716
88
nncf>=2.11.0
99
sentence_transformers
1010
sentencepiece==0.2.0

demos/python_demos/clip_image_classification/download_model_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--extra-index-url "https://download.pytorch.org/whl/cpu"
22
--extra-index-url "https://storage.openvinotoolkit.org/simple/wheels/nightly"
33
--pre
4-
openvino==2025.2.*
4+
openvino==2025.3.*
55
numpy<2.0
66
transformers<4.52
77
pillow==10.3.0

tests/file_lists/lib_files.txt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,38 @@ libopencv_videoio.so.410->libopencv_videoio.so.4.10.0
3838
libopencv_ximgproc.so->libopencv_ximgproc.so.410
3939
libopencv_ximgproc.so.4.10.0
4040
libopencv_ximgproc.so.410->libopencv_ximgproc.so.4.10.0
41-
libopenvino.so->libopenvino.so.2520
42-
libopenvino.so.2025.2.0
43-
libopenvino.so.2520->libopenvino.so.2025.2.0
41+
libopenvino.so->libopenvino.so.2530
42+
libopenvino.so.2025.3.0
43+
libopenvino.so.2530->libopenvino.so.2025.3.0
4444
libopenvino_auto_batch_plugin.so
4545
libopenvino_auto_plugin.so
46-
libopenvino_c.so->libopenvino_c.so.2520
47-
libopenvino_c.so.2025.2.0
48-
libopenvino_c.so.2520->libopenvino_c.so.2025.2.0
46+
libopenvino_c.so->libopenvino_c.so.2530
47+
libopenvino_c.so.2025.3.0
48+
libopenvino_c.so.2530->libopenvino_c.so.2025.3.0
4949
libopenvino_hetero_plugin.so
5050
libopenvino_intel_cpu_plugin.so
5151
libopenvino_intel_gpu_plugin.so
5252
libopenvino_intel_npu_plugin.so
53-
libopenvino_ir_frontend.so.2025.2.0
54-
libopenvino_ir_frontend.so.2520->libopenvino_ir_frontend.so.2025.2.0
55-
libopenvino_jax_frontend.so->libopenvino_jax_frontend.so.2520
56-
libopenvino_jax_frontend.so.2025.2.0
57-
libopenvino_jax_frontend.so.2520->libopenvino_jax_frontend.so.2025.2.0
58-
libopenvino_onnx_frontend.so->libopenvino_onnx_frontend.so.2520
59-
libopenvino_onnx_frontend.so.2025.2.0
60-
libopenvino_onnx_frontend.so.2520->libopenvino_onnx_frontend.so.2025.2.0
61-
libopenvino_paddle_frontend.so->libopenvino_paddle_frontend.so.2520
62-
libopenvino_paddle_frontend.so.2025.2.0
63-
libopenvino_paddle_frontend.so.2520->libopenvino_paddle_frontend.so.2025.2.0
64-
libopenvino_pytorch_frontend.so->libopenvino_pytorch_frontend.so.2520
65-
libopenvino_pytorch_frontend.so.2025.2.0
66-
libopenvino_pytorch_frontend.so.2520->libopenvino_pytorch_frontend.so.2025.2.0
67-
libopenvino_tensorflow_frontend.so->libopenvino_tensorflow_frontend.so.2520
68-
libopenvino_tensorflow_frontend.so.2025.2.0
69-
libopenvino_tensorflow_frontend.so.2520->libopenvino_tensorflow_frontend.so.2025.2.0
70-
libopenvino_tensorflow_lite_frontend.so->libopenvino_tensorflow_lite_frontend.so.2520
71-
libopenvino_tensorflow_lite_frontend.so.2025.2.0
72-
libopenvino_tensorflow_lite_frontend.so.2520->libopenvino_tensorflow_lite_frontend.so.2025.2.0
53+
libopenvino_ir_frontend.so.2025.3.0
54+
libopenvino_ir_frontend.so.2530->libopenvino_ir_frontend.so.2025.3.0
55+
libopenvino_jax_frontend.so->libopenvino_jax_frontend.so.2530
56+
libopenvino_jax_frontend.so.2025.3.0
57+
libopenvino_jax_frontend.so.2530->libopenvino_jax_frontend.so.2025.3.0
58+
libopenvino_onnx_frontend.so->libopenvino_onnx_frontend.so.2530
59+
libopenvino_onnx_frontend.so.2025.3.0
60+
libopenvino_onnx_frontend.so.2530->libopenvino_onnx_frontend.so.2025.3.0
61+
libopenvino_paddle_frontend.so->libopenvino_paddle_frontend.so.2530
62+
libopenvino_paddle_frontend.so.2025.3.0
63+
libopenvino_paddle_frontend.so.2530->libopenvino_paddle_frontend.so.2025.3.0
64+
libopenvino_pytorch_frontend.so->libopenvino_pytorch_frontend.so.2530
65+
libopenvino_pytorch_frontend.so.2025.3.0
66+
libopenvino_pytorch_frontend.so.2530->libopenvino_pytorch_frontend.so.2025.3.0
67+
libopenvino_tensorflow_frontend.so->libopenvino_tensorflow_frontend.so.2530
68+
libopenvino_tensorflow_frontend.so.2025.3.0
69+
libopenvino_tensorflow_frontend.so.2530->libopenvino_tensorflow_frontend.so.2025.3.0
70+
libopenvino_tensorflow_lite_frontend.so->libopenvino_tensorflow_lite_frontend.so.2530
71+
libopenvino_tensorflow_lite_frontend.so.2025.3.0
72+
libopenvino_tensorflow_lite_frontend.so.2530->libopenvino_tensorflow_lite_frontend.so.2025.3.0
7373
libopenvino_tokenizers.so
7474
libtbb.so->libtbb.so.12
7575
libtbb.so.12->libtbb.so.12.13

tests/file_lists/lib_files_python.txt

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,40 +38,40 @@ libopencv_videoio.so.410->libopencv_videoio.so.4.10.0
3838
libopencv_ximgproc.so->libopencv_ximgproc.so.410
3939
libopencv_ximgproc.so.4.10.0
4040
libopencv_ximgproc.so.410->libopencv_ximgproc.so.4.10.0
41-
libopenvino.so->libopenvino.so.2520
42-
libopenvino.so.2025.2.0
43-
libopenvino.so.2520->libopenvino.so.2025.2.0
41+
libopenvino.so->libopenvino.so.2530
42+
libopenvino.so.2025.3.0
43+
libopenvino.so.2530->libopenvino.so.2025.3.0
4444
libopenvino_auto_batch_plugin.so
4545
libopenvino_auto_plugin.so
46-
libopenvino_c.so->libopenvino_c.so.2520
47-
libopenvino_c.so.2025.2.0
48-
libopenvino_c.so.2520->libopenvino_c.so.2025.2.0
46+
libopenvino_c.so->libopenvino_c.so.2530
47+
libopenvino_c.so.2025.3.0
48+
libopenvino_c.so.2530->libopenvino_c.so.2025.3.0
4949
libopenvino_genai.so
50-
libopenvino_genai.so.2520->libopenvino_genai.so
50+
libopenvino_genai.so.2530->libopenvino_genai.so
5151
libopenvino_hetero_plugin.so
5252
libopenvino_intel_cpu_plugin.so
5353
libopenvino_intel_gpu_plugin.so
5454
libopenvino_intel_npu_plugin.so
55-
libopenvino_ir_frontend.so.2025.2.0
56-
libopenvino_ir_frontend.so.2520->libopenvino_ir_frontend.so.2025.2.0
57-
libopenvino_jax_frontend.so->libopenvino_jax_frontend.so.2520
58-
libopenvino_jax_frontend.so.2025.2.0
59-
libopenvino_jax_frontend.so.2520->libopenvino_jax_frontend.so.2025.2.0
60-
libopenvino_onnx_frontend.so->libopenvino_onnx_frontend.so.2520
61-
libopenvino_onnx_frontend.so.2025.2.0
62-
libopenvino_onnx_frontend.so.2520->libopenvino_onnx_frontend.so.2025.2.0
63-
libopenvino_paddle_frontend.so->libopenvino_paddle_frontend.so.2520
64-
libopenvino_paddle_frontend.so.2025.2.0
65-
libopenvino_paddle_frontend.so.2520->libopenvino_paddle_frontend.so.2025.2.0
66-
libopenvino_pytorch_frontend.so->libopenvino_pytorch_frontend.so.2520
67-
libopenvino_pytorch_frontend.so.2025.2.0
68-
libopenvino_pytorch_frontend.so.2520->libopenvino_pytorch_frontend.so.2025.2.0
69-
libopenvino_tensorflow_frontend.so->libopenvino_tensorflow_frontend.so.2520
70-
libopenvino_tensorflow_frontend.so.2025.2.0
71-
libopenvino_tensorflow_frontend.so.2520->libopenvino_tensorflow_frontend.so.2025.2.0
72-
libopenvino_tensorflow_lite_frontend.so->libopenvino_tensorflow_lite_frontend.so.2520
73-
libopenvino_tensorflow_lite_frontend.so.2025.2.0
74-
libopenvino_tensorflow_lite_frontend.so.2520->libopenvino_tensorflow_lite_frontend.so.2025.2.0
55+
libopenvino_ir_frontend.so.2025.3.0
56+
libopenvino_ir_frontend.so.2530->libopenvino_ir_frontend.so.2025.3.0
57+
libopenvino_jax_frontend.so->libopenvino_jax_frontend.so.2530
58+
libopenvino_jax_frontend.so.2025.3.0
59+
libopenvino_jax_frontend.so.2530->libopenvino_jax_frontend.so.2025.3.0
60+
libopenvino_onnx_frontend.so->libopenvino_onnx_frontend.so.2530
61+
libopenvino_onnx_frontend.so.2025.3.0
62+
libopenvino_onnx_frontend.so.2530->libopenvino_onnx_frontend.so.2025.3.0
63+
libopenvino_paddle_frontend.so->libopenvino_paddle_frontend.so.2530
64+
libopenvino_paddle_frontend.so.2025.3.0
65+
libopenvino_paddle_frontend.so.2530->libopenvino_paddle_frontend.so.2025.3.0
66+
libopenvino_pytorch_frontend.so->libopenvino_pytorch_frontend.so.2530
67+
libopenvino_pytorch_frontend.so.2025.3.0
68+
libopenvino_pytorch_frontend.so.2530->libopenvino_pytorch_frontend.so.2025.3.0
69+
libopenvino_tensorflow_frontend.so->libopenvino_tensorflow_frontend.so.2530
70+
libopenvino_tensorflow_frontend.so.2025.3.0
71+
libopenvino_tensorflow_frontend.so.2530->libopenvino_tensorflow_frontend.so.2025.3.0
72+
libopenvino_tensorflow_lite_frontend.so->libopenvino_tensorflow_lite_frontend.so.2530
73+
libopenvino_tensorflow_lite_frontend.so.2025.3.0
74+
libopenvino_tensorflow_lite_frontend.so.2530->libopenvino_tensorflow_lite_frontend.so.2025.3.0
7575
libopenvino_tokenizers.so
7676
libtbb.so->libtbb.so.12
7777
libtbb.so.12->libtbb.so.12.13

third_party/llm_engine/llm_engine.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def llm_engine():
2424
new_git_repository(
2525
name = "llm_engine",
2626
remote = "https://github.com/openvinotoolkit/openvino.genai",
27-
commit = "01f0fe1eded5934871fef866ed217a60fa2c6049", # releases/2025/2 RC3
27+
commit = "21693ffbe0f62467435e3eb15cd03b723f365d21", # master 2025-07-15
2828
build_file = "@_llm_engine//:BUILD",
2929
init_submodules = True,
3030
recursive_init_submodules = True,
@@ -73,7 +73,7 @@ def _impl(repository_ctx):
7373
out_dll_dir_win = ""
7474
out_lib_dir = "out_lib_dir = \"runtime/lib/intel64\""
7575
out_static = ""
76-
out_libs = "out_shared_libs = [\"{lib_name}.so.2520\"],".format(lib_name=lib_name)
76+
out_libs = "out_shared_libs = [\"{lib_name}.so.2530\"],".format(lib_name=lib_name)
7777
cache_entries = """
7878
"BUILD_SHARED_LIBS": "OFF",
7979
"CMAKE_POSITION_INDEPENDENT_CODE": "ON",

0 commit comments

Comments
 (0)