Skip to content

Compilation with src and bin tokenizers, genai and oponvino. #3657

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

Open
wants to merge 48 commits into
base: main
Choose a base branch
from
Open

Compilation with src and bin tokenizers, genai and oponvino. #3657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
edf7431
Linux compiles with binary
rasapala Sep 17, 2025
664ee82
Fix redhat
rasapala Sep 17, 2025
db69ba4
Shared flag
rasapala Sep 17, 2025
7af85c2
fix sdl
rasapala Sep 18, 2025
3945a97
Fix sdl
rasapala Sep 18, 2025
0a29876
Fix windows build
rasapala Sep 18, 2025
0b2d025
Genai from source
rasapala Sep 18, 2025
8362d22
Add deps
rasapala Sep 18, 2025
0b1aada
Fix dockerfile
rasapala Sep 18, 2025
b7f82f4
Fix include
rasapala Sep 18, 2025
7c974fd
Fix spell and if
rasapala Sep 18, 2025
1ba6ec8
Spell2
rasapala Sep 18, 2025
28f77cd
Add tokenizers flag
rasapala Sep 18, 2025
5c7bfdc
Merge branch 'main' into CVS-173265_genai_build
rasapala Sep 19, 2025
8ce18c7
Add tokenizers back
rasapala Sep 19, 2025
00baf0c
Fix sdl
rasapala Sep 19, 2025
510edcf
Fix tokenizers
rasapala Sep 22, 2025
6555d76
Merge branch 'main' into CVS-173265_genai_build
rasapala Sep 23, 2025
c9d60d0
Add test env
rasapala Sep 23, 2025
a150397
Merge branch 'main' into CVS-173265_genai_build
rasapala Sep 24, 2025
58c1fda
Merge branch 'main' into CVS-173265_genai_build
rasapala Sep 25, 2025
b846935
Merge branch 'main' into CVS-173265_genai_build
rasapala Sep 25, 2025
983ab94
Fix redhat
rasapala Sep 26, 2025
8fb5571
Fix dockerfile
rasapala Sep 26, 2025
39cc8ef
Add windows build from source
rasapala Sep 29, 2025
d4c1573
Test source
rasapala Sep 29, 2025
e9c5b6c
Fix workspace changes
rasapala Sep 30, 2025
d122b9a
Fix test and ov_bin=0
rasapala Sep 30, 2025
4a423d3
Style
rasapala Sep 30, 2025
86ed5f2
test ubuntu with bin on
rasapala Oct 1, 2025
83b15cd
Fix test
rasapala Oct 1, 2025
8febedb
Remove tokenizer from linking
rasapala Oct 2, 2025
51de4e6
Merge branch 'main' into CVS-173265_genai_build
rasapala Oct 2, 2025
a0d714a
SEt default build from bin windows
rasapala Oct 2, 2025
392049a
Cleanup and test bin=1 redhat
rasapala Oct 2, 2025
f05db8b
Fix create package
rasapala Oct 2, 2025
070ae9e
Redhat from sources
rasapala Oct 2, 2025
71d07a4
Merge remote-tracking branch 'origin/CVS-173265_genai_build' into CVS…
rasapala Oct 2, 2025
39fa049
Fix makefile ovveride
rasapala Oct 2, 2025
fdcbbaf
Fix lib
rasapala Oct 2, 2025
e59b295
Fix libs and python
rasapala Oct 3, 2025
7d6a395
Fix flags
rasapala Oct 6, 2025
d7afaac
Code review
rasapala Oct 6, 2025
55983ca
Fix package
rasapala Oct 6, 2025
06ae2d0
Fix docker
rasapala Oct 6, 2025
f9cf03f
Fix docker 2
rasapala Oct 6, 2025
ccaff32
Fix docker
rasapala Oct 6, 2025
568cee3
Fix create
rasapala Oct 6, 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
5 changes: 1 addition & 4 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ build --define=MEDIAPIPE_DISABLE_GPU=1
build --define=MEDIAPIPE_DISABLE=0
build --define=CLOUD_DISABLE=0
build --define=PYTHON_DISABLE=0
build --define=USE_DROGON=1 # 0=legacy net_http, available only on linux

# Sets the default Apple platform to macOS.
build --apple_platform_type=macos
Expand Down Expand Up @@ -91,7 +92,6 @@ build:linux --host_cxxopt=-std=c++17
build:linux --action_env PYTHON_BIN_PATH="/usr/bin/python3"
build:linux --define PYTHON_BIN_PATH=/usr/bin/python3

build:linux --define=USE_DROGON=1 # 0=legacy net_http, available only on linux
# Security options ######################################################################################################
# TODO: Add equivalent windows flag
build:linux --cxxopt=-fno-strict-overflow
Expand Down Expand Up @@ -232,7 +232,6 @@ build:windows --deleted_packages=tensorflow/core/tfrt/stubs,tensorflow/compiler/

# Windows build ssl headers for GRPC workaround
build:windows --override_repository="boringssl=C:\\opt\\boringSSL-SwiftPM"

#Add this parameter for windows local builds, its added on jenkins via windows_build.bat. Must be short path on C:\ for mediapipe to compile
#startup --output_user_root=C:/b_tmp

Expand All @@ -246,8 +245,6 @@ build:windows --action_env OpenVINO_DIR="c:/opt/openvino/runtime/cmake"
build:windows --action_env OpenCV_DIR="c:/opt/opencv_4.12.0"

build:windows --repo_env=HERMETIC_PYTHON_VERSION=3.12
build:windows --define=USE_DROGON=1
build:windows --define=GENAI_USE_BINARY=1

build:win_mp_on_py_on --config=windows
build:win_mp_on_py_on --define=MEDIAPIPE_DISABLE=0
Expand Down
48 changes: 30 additions & 18 deletions Dockerfile.redhat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ RUN dnf install -y https://github.com/linux-test-project/lcov/releases/download
ENV TF_SYSTEM_LIBS="curl"
ENV TEST_LOG="/root/.cache/bazel/_bazel_root/bc57d4817a53cab8c785464da57d1983/execroot/ovms/bazel-out/test.log"
ARG ov_source_branch=c01cd93e24d1cd78bfbb401eed51c08fb93e0816
ARG ov_contrib_branch=master
ARG ov_source_org=openvinotoolkit
ARG ov_contrib_org=openvinotoolkit
ARG ov_use_binary=0
Expand Down Expand Up @@ -199,9 +198,9 @@ WORKDIR $TEMP_DIR
RUN if [ "$ov_use_binary" = "1" ] && [ "$DLDT_PACKAGE_URL" != "" ]; then true ; else exit 0 ; fi ; \
wget -nv $DLDT_PACKAGE_URL && \
mkdir /opt/intel && \
tar -zxf ./*openvino_toolkit*.tgz -C /opt/intel && \
ln -s /opt/intel/*openvino_toolkit* /opt/intel/openvino && \
ln -s /opt/intel/*openvino_toolkit* /opt/intel/openvino_2025
tar -zxf ./*openvino_genai*.tar.gz -C /opt/intel && \
ln -s /opt/intel/*openvino_genai* /opt/intel/openvino && \
ln -s /opt/intel/*openvino_genai* /opt/intel/openvino_2025

# install sample apps including benchmark_app
# hadolint ignore=DL3041
Expand All @@ -214,17 +213,17 @@ RUN if [ -f /opt/intel/openvino/samples/cpp/build_samples.sh ]; then /opt/intel
ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
ENV OPENVINO_TOKENIZERS_PATH_GENAI=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/openvino/runtime/lib/intel64/:/opt/opencv/lib/:/opt/intel/openvino/runtime/3rdparty/tbb/lib/
WORKDIR /openvino_tokenizers/

WORKDIR /openvino_tokenizers/
ARG ov_tokenizers_branch=85be884a69f10270703f81f970a5ee596a4c8df7
ARG SDL_OPS="-fpic -O2 -U_FORTIFY_SOURCE -fstack-protector -fno-omit-frame-pointer -D_FORTIFY_SOURCE=1 -fno-strict-overflow -Wall -Wno-unknown-pragmas -Wno-error=sign-compare -fno-delete-null-pointer-checks -fwrapv -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security"
ARG ov_tokenizers_org=openvinotoolkit
ARG SDL_OPS="-fpic -O2 -U_FORTIFY_SOURCE -fstack-protector -fno-omit-frame-pointer -D_FORTIFY_SOURCE=1 -fno-strict-overflow -Wall -Wno-unknown-pragmas -Wno-error=sign-compare -fno-delete-null-pointer-checks -fwrapv -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security -s -D_GLIBCXX_USE_CXX11_ABI=1 -Wno-error=deprecated-declarations -Wuninitialized"
# hadolint ignore=DL3003
RUN git clone https://github.com/openvinotoolkit/openvino_tokenizers.git /openvino_tokenizers && cd /openvino_tokenizers && git checkout $ov_tokenizers_branch && git submodule update --init --recursive
RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE="${VERBOSE_LOGS}" -DCMAKE_CXX_FLAGS=" ${SDL_OPS} ${LTO_CXX_FLAGS} " -DCMAKE_SHARED_LINKER_FLAGS="${LTO_LD_FLAGS}" -S ./ -B ./build/ && cmake --build ./build/ --parallel $JOBS && cp /openvino_tokenizers/build/src/lib*.so /opt/intel/openvino/runtime/lib/intel64/

WORKDIR /openvino_tokenizers/
# Install the openvino_tokenizers python bindings and copy to OpenVINO location
RUN if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
RUN if [ "$ov_use_binary" == "0" ]; then true ; else exit 0 ; fi ; \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Idea worth considering:
We could have "build_ov/genai.sh/bat" that will use variables defined in the container (stored in env.txt?).
Then in case of upgrade in OV we wouldn;t have to rebuild build container from scratch - just relaunch this script

git clone https://github.com/$ov_tokenizers_org/openvino_tokenizers.git /openvino_tokenizers && cd /openvino_tokenizers && git checkout $ov_tokenizers_branch && git submodule update --init --recursive ; \
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE="${VERBOSE_LOGS}" -DCMAKE_CXX_FLAGS=" ${SDL_OPS} ${LTO_CXX_FLAGS} " -DCMAKE_SHARED_LINKER_FLAGS="${LTO_LD_FLAGS}" -S ./ -B ./build/ && cmake --build ./build/ --parallel $JOBS && cp /openvino_tokenizers/build/src/lib*.so /opt/intel/openvino/runtime/lib/intel64/ ; \
# Install the openvino_tokenizers python bindings and copy to OpenVINO location
if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
mkdir -p /opt/intel/openvino/python/openvino_tokenizers/lib ; \
cp -r python/* /opt/intel/openvino/python/ ; \
cp build/python/* /opt/intel/openvino/python/openvino_tokenizers/ ; \
Expand All @@ -233,6 +232,17 @@ RUN if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
ln -s /ovms/lib/libopenvino_tokenizers.so /opt/intel/openvino/python/openvino_tokenizers/lib/libopenvino_tokenizers.so ; \
fi

WORKDIR /openvino_genai/
ARG ov_genai_branch=master
ARG ov_genai_org=openvinotoolkit
# hadolint ignore=DL3003
RUN if [ "$ov_use_binary" == "0" ]; then true ; else exit 0 ; fi ; if ! [[ $debug_bazel_flags == *"py_off"* ]]; then true ; else exit 0 ; fi ; \
git clone https://github.com/$ov_genai_org/openvino.genai /openvino_genai && cd /openvino_genai && git checkout $ov_genai_branch && git submodule update --init --recursive ; \
cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS=" ${SDL_OPS} ${LTO_CXX_FLAGS} " -DCMAKE_SHARED_LINKER_FLAGS="${LTO_LD_FLAGS}" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DENABLE_SYSTEM_ICU="True" -DBUILD_TOKENIZERS=OFF -DENABLE_SAMPLES=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_XGRAMMAR=ON -S ./ -B ./build/ ; \
cmake --build ./build/ --parallel $JOBS && cp /openvino_genai/build/openvino_genai/lib*.so* /opt/intel/openvino/runtime/lib/intel64/ ; \
cp -r /openvino_genai/src/cpp/include/* /opt/intel/openvino/runtime/include/ ; \
cp -r /openvino_genai/build/openvino_genai/*py* /opt/intel/openvino/python/

# Build OpenVINO Model Server
WORKDIR /ovms
COPY .bazelrc .user.bazelr[c] .bazelversion WORKSPACE /ovms/
Expand Down Expand Up @@ -274,6 +284,12 @@ RUN if ! [[ $debug_bazel_flags == *"py_off"* ]]; then true ; else exit 0 ; fi ;
echo $'Metadata-Version: 1.0\nName: openvino\nVersion: 2025.4' > /opt/intel/openvino/python/openvino-4.dist-info/METADATA
ENV PYTHONPATH=/opt/intel/openvino/python:/ovms/bazel-bin/src/python/binding

WORKDIR /patchelf
# hadolint ignore=DL3003
RUN wget -q https://github.com/NixOS/patchelf/archive/0.10.tar.gz && \
tar -xf 0.10.tar.gz && cd patchelf-0.10 && \
./bootstrap.sh && ./configure && make && make install

WORKDIR /ovms

ARG PROJECT_VERSION="2025.4.0"
Expand Down Expand Up @@ -321,6 +337,7 @@ FROM $BUILD_IMAGE as capi-build
ARG CAPI_FLAGS="--strip=always --config=mp_off_py_off --//:distro=redhat"
ARG JOBS=40
ARG LTO_ENABLE=OFF
WORKDIR /ovms
RUN bazel build --jobs $JOBS ${CAPI_FLAGS} //src:ovms_shared

# C api app with bazel
Expand All @@ -338,12 +355,7 @@ RUN mkdir -p /ovms_release/lib/ ; find /ovms/bazel-out/k8-*/bin -iname 'libovms_

FROM $BUILD_IMAGE as pkg

RUN mkdir /patchelf
WORKDIR /patchelf
# hadolint ignore=DL3003
RUN wget -q https://github.com/NixOS/patchelf/archive/0.10.tar.gz && \
tar -xf 0.10.tar.gz && cd patchelf-0.10 && \
./bootstrap.sh && ./configure && make && make install
COPY --from=build /usr/local/bin/patchelf /usr/local/bin/patchelf

WORKDIR /
ARG BASE_OS=redhat
Expand Down
46 changes: 28 additions & 18 deletions Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ ARG ov_source_org=openvinotoolkit
ARG ov_contrib_org=openvinotoolkit
ARG DLDT_PACKAGE_URL
ARG ov_source_branch=master
ARG ov_contrib_branch=master
ARG CMAKE_BUILD_TYPE=Release

ENV HDDL_INSTALL_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/hddl
Expand Down Expand Up @@ -181,9 +180,9 @@ WORKDIR $TEMP_DIR
RUN if [ "$ov_use_binary" == "1" ] && [ "$DLDT_PACKAGE_URL" != "" ]; then true ; else exit 0 ; fi ; \
wget -nv $DLDT_PACKAGE_URL && \
mkdir /opt/intel && \
tar -zxf ./*openvino_toolkit*.tgz -C /opt/intel && \
ln -s /opt/intel/*openvino_toolkit* /opt/intel/openvino && \
ln -s /opt/intel/*openvino_toolkit* /opt/intel/openvino_2025
tar -zxf ./*openvino_genai*.tar.gz -C /opt/intel && \
ln -s /opt/intel/*openvino_genai* /opt/intel/openvino && \
ln -s /opt/intel/*openvino_genai* /opt/intel/openvino_2025

WORKDIR /
# install sample apps including benchmark_app
Expand All @@ -193,16 +192,15 @@ RUN if [ -f /opt/intel/openvino/samples/cpp/build_samples.sh ]; then /opt/intel
# OpenVINO Tokenizers extension
ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
ENV OPENVINO_TOKENIZERS_PATH_GENAI=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
WORKDIR /openvino_tokenizers/

ARG SDL_OPS="-fpic -O2 -U_FORTIFY_SOURCE -fstack-protector -fno-omit-frame-pointer -D_FORTIFY_SOURCE=1 -fno-strict-overflow -Wall -Wno-unknown-pragmas -Wno-error=sign-compare -fno-delete-null-pointer-checks -fwrapv -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security -s -D_GLIBCXX_USE_CXX11_ABI=1 -Wno-error=deprecated-declarations -Wuninitialized"
ARG ov_tokenizers_branch=master
ARG SDL_OPS="-fpic -O2 -U_FORTIFY_SOURCE -fstack-protector -fno-omit-frame-pointer -D_FORTIFY_SOURCE=1 -fno-strict-overflow -Wall -Wno-unknown-pragmas -Wno-error=sign-compare -fno-delete-null-pointer-checks -fwrapv -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security"
ARG ov_tokenizers_org=openvinotoolkit
# hadolint ignore=DL3003
RUN git clone https://github.com/openvinotoolkit/openvino_tokenizers.git /openvino_tokenizers && cd /openvino_tokenizers && git checkout $ov_tokenizers_branch && git submodule update --init --recursive
RUN cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS="${SDL_OPS}" -S ./ -B ./build/ && cmake --build ./build/ --parallel $JOBS && cp /openvino_tokenizers/build/src/lib*.so /opt/intel/openvino/runtime/lib/intel64/

# Install the openvino_tokenizers python bindings and copy to OpenVINO location
RUN if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
RUN if [ "$ov_use_binary" == "0" ]; then true ; else exit 0 ; fi ; if ! [[ $debug_bazel_flags == *"py_off"* ]]; then true ; else exit 0 ; fi ; \
git clone https://github.com/$ov_tokenizers_org/openvino_tokenizers.git /openvino_tokenizers && cd /openvino_tokenizers && git checkout $ov_tokenizers_branch && git submodule update --init --recursive ; \
cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS="${SDL_OPS}" -S ./ -B ./build/ && cmake --build ./build/ --parallel $JOBS && cp /openvino_tokenizers/build/src/lib*.so /opt/intel/openvino/runtime/lib/intel64/ ; \
if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
mkdir -p /opt/intel/openvino/python/openvino_tokenizers/lib ; \
cp -r python/* /opt/intel/openvino/python/ ; \
cp build/python/* /opt/intel/openvino/python/openvino_tokenizers/ ; \
Expand All @@ -211,6 +209,16 @@ RUN if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
ln -s /ovms/lib/libopenvino_tokenizers.so /opt/intel/openvino/python/openvino_tokenizers/lib/libopenvino_tokenizers.so ; \
fi

ARG ov_genai_branch=master
ARG ov_genai_org=openvinotoolkit
# hadolint ignore=DL3003
RUN if [ "$ov_use_binary" == "0" ]; then true ; else exit 0 ; fi ; if ! [[ $debug_bazel_flags == *"py_off"* ]]; then true ; else exit 0 ; fi ; \
git clone https://github.com/$ov_genai_org/openvino.genai /openvino_genai && cd /openvino_genai && git checkout $ov_genai_branch && git submodule update --init --recursive ; \
cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS="${SDL_OPS}" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DENABLE_SYSTEM_ICU="True" -DBUILD_TOKENIZERS=OFF -DENABLE_SAMPLES=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_XGRAMMAR=ON -S ./ -B ./build/ ; \
cmake --build ./build/ --parallel $JOBS && cp /openvino_genai/build/openvino_genai/lib*.so* /opt/intel/openvino/runtime/lib/intel64/ ; \
cp -r /openvino_genai/src/cpp/include/* /opt/intel/openvino/runtime/include/ ; \
cp -r /openvino_genai/build/openvino_genai/*py* /opt/intel/openvino/python/

# Add Nvidia dev tool if needed
RUN apt-get update ; \
apt-get install -y --no-install-recommends opencl-clhpp-headers opencl-c-headers intel-opencl-icd && \
Expand Down Expand Up @@ -279,6 +287,13 @@ RUN bash -c "sed -i -e 's|REPLACE_PROJECT_VERSION|${PROJECT_VERSION}|g' /ovms/sr

WORKDIR /usr/lib/x86_64-linux-gnu/
RUN ln -s libOpenCL.so.1 libOpenCL.so

WORKDIR /patchelf
# hadolint ignore=DL3003
RUN wget -q https://github.com/NixOS/patchelf/archive/0.10.tar.gz && \
tar -xf 0.10.tar.gz && cd patchelf-0.10 && \
./bootstrap.sh && ./configure && make && make install

WORKDIR /ovms
# Test Coverage
COPY ci/check_coverage.bat /ovms/
Expand Down Expand Up @@ -308,7 +323,6 @@ COPY client /client
RUN python3 -c "import json; m={'PROJECT_VERSION':'${PROJECT_VERSION}','OPENVINO backend':'$(/ovms/bazel-bin/src/ovms --version | grep backend | cut -d' ' -f3)', \
'BAZEL_BUILD_FLAGS':'${debug_bazel_flags}${minitrace_flags}','BASE_IMAGE':'${BASE_IMAGE}' }; \
print(json.dumps(m,indent=4))" > /ovms/release_files/metadata.json

# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #

FROM $BUILD_IMAGE as capi-build
Expand All @@ -318,6 +332,7 @@ SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
ARG CAPI_FLAGS="--strip=always --config mp_off_py_off --//:distro=ubuntu"
ARG JOBS=40
ARG FUZZER_BUILD=0
WORKDIR /ovms
RUN bazel build --jobs=$JOBS ${CAPI_FLAGS} //src:ovms_shared

# C-API benchmark app
Expand All @@ -339,12 +354,7 @@ RUN mkdir -p /ovms_release/lib/ ; find /ovms/bazel-out/k8-*/bin -iname 'libovms_

FROM build as pkg

RUN mkdir /patchelf
WORKDIR /patchelf
# hadolint ignore=DL3003
RUN wget -q https://github.com/NixOS/patchelf/archive/0.10.tar.gz && \
tar -xf 0.10.tar.gz && cd patchelf-0.10 && \
./bootstrap.sh && ./configure && make && make install
COPY --from=build /usr/local/bin/patchelf /usr/local/bin/patchelf

WORKDIR /
ARG BASE_OS=ubuntu
Expand Down
22 changes: 15 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,17 @@ FUZZER_BUILD ?= 0
# - 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_GENAI_BRANCH ?= 845ba50e83e3f2f436d3794044a87f767f76bfd7 # master 2025/09/23

OV_SOURCE_ORG ?= openvinotoolkit
OV_CONTRIB_ORG ?= openvinotoolkit
OV_GENAI_ORG ?= openvinotoolkit
OV_TOKENIZERS_ORG ?= openvinotoolkit

TEST_LLM_PATH ?= "src/test/llm_testing"
GPU_MODEL_PATH ?= "/tmp/face_detection_adas"

OV_USE_BINARY ?= 1
APT_OV_PACKAGE ?= openvino-2022.1.0
# opt, dbg:
BAZEL_BUILD_TYPE ?= opt
Expand Down Expand Up @@ -135,8 +136,13 @@ endif

ifeq ($(findstring ubuntu,$(BASE_OS)),ubuntu)
TARGET_DISTRO_PARAMS = " --//:distro=ubuntu"
OV_USE_BINARY ?= 1
else ifeq ($(findstring redhat,$(BASE_OS)),redhat)
TARGET_DISTRO_PARAMS = " --//:distro=redhat"
OV_USE_BINARY ?= 0
ifeq ($(OV_USE_BINARY),1)
$(error OV_USE_BINARY = 1 not supported on RHEL OS)
endif
else
$(error BASE_OS must be either ubuntu or redhat)
endif
Expand All @@ -162,11 +168,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_genai/packages/nightly/2025.4.0.0.dev20250923/openvino_genai_ubuntu24_2025.4.0.0.dev20250923_x86_64.tar.gz
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_genai/packages/nightly/2025.4.0.0.dev20250923/openvino_genai_ubuntu22_2025.4.0.0.dev20250923_x86_64.tar.gz
endif
endif
ifeq ($(BASE_OS),redhat)
Expand All @@ -175,7 +181,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_genai/packages/nightly/2025.4.0.0.dev20250923/openvino_genai_rhel8_2025.4.0.0.dev20250923_x86_64.tar.gz
INSTALL_DRIVER_VERSION ?= "24.52.32224"
endif

Expand Down Expand Up @@ -212,7 +218,11 @@ 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_genai_org=$(OV_GENAI_ORG)\
--build-arg ov_tokenizers_org=$(OV_TOKENIZERS_ORG)\
--build-arg ov_contrib_org=$(OV_CONTRIB_ORG)\
--build-arg ov_tokenizers_branch=$(OV_TOKENIZERS_BRANCH)\
--build-arg ov_genai_branch=$(OV_GENAI_BRANCH)\
--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,8 +236,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)\
--build-arg RELEASE_BASE_IMAGE=$(BASE_IMAGE_RELEASE)\
Expand Down
4 changes: 0 additions & 4 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,6 @@ rules_pkg_dependencies()
load("@ovms//third_party/aws-sdk-cpp:aws-sdk-cpp.bzl", "aws_sdk_cpp")
aws_sdk_cpp()

### OpenVINO GenAI
Copy link
Collaborator

Choose a reason for hiding this comment

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

Since we remove this we need synchronize this with Mediapipe repository update

load("@ovms//third_party/llm_engine:llm_engine.bzl", "llm_engine")
llm_engine()

### Libgit2
load("@ovms//third_party/libgit2:libgit2_engine.bzl", "libgit2_engine")
libgit2_engine()
Expand Down
Loading