Merge remote-tracking branch 'origin/main' into multipart-rb

Author: dkalinowski

.bazelrc

@@ -223,10 +223,10 @@ build:windows --host_linkopt=/OPT:REF
 build:windows --linkopt=/OPT:ICF
 build:windows --host_linkopt=/OPT:ICF
 
-build:windows --action_env PYTHON_BIN_PATH="C:/opt/Python311/python.exe"
-build:windows --action_env PYTHON_LIB_PATH="C:/opt/Python311/lib/site-packages"
-build:windows --repo_env PYTHON_BIN_PATH=C:/opt/Python311/python.exe
-build:windows --python_path="C:/opt/Python311/python.exe"
+build:windows --action_env PYTHON_BIN_PATH="C:/opt/Python312/python.exe"
+build:windows --action_env PYTHON_LIB_PATH="C:/opt/Python312/lib/site-packages"
+build:windows --repo_env PYTHON_BIN_PATH=C:/opt/Python312/python.exe
+build:windows --python_path="C:/opt/Python312/python.exe"
 build:windows:opt --copt=/arch:AVX
 build:windows:opt --host_copt=/arch:AVX
 build:windows --define=override_eigen_strong_inline=true
@@ -248,7 +248,7 @@ build:windows --define=MEDIAPIPE_DISABLE=0
 build:windows --action_env OpenVINO_DIR="c:/opt/openvino/runtime/cmake"
 build:windows --action_env OpenCV_DIR="c:/opt/opencv"
 
-build:windows --repo_env=HERMETIC_PYTHON_VERSION=3.11
+build:windows --repo_env=HERMETIC_PYTHON_VERSION=3.12
 build:windows --define=USE_DROGON=1
 build:windows --define=GENAI_USE_BINARY=1
 
@@ -261,6 +261,7 @@ test:linux --test_env LD_LIBRARY_PATH=/opt/opencv/lib/:/opt/intel/openvino/runti
 # genai hardcodes path during build time so without this so is not visible
 test:linux --test_env OPENVINO_TOKENIZERS_PATH_GENAI=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
 test:linux --test_env PYTHONPATH=/opt/intel/openvino/python:/ovms/bazel-bin/src/python/binding
+test:linux --test_env no_proxy=localhost
 
 # Bazelrc imports ############################################################################################################################
 # file below should contain sth like

Dockerfile.redhat

@@ -118,6 +118,10 @@ RUN dnf install -y https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os
             libicu-devel && \
             dnf clean all
 
+WORKDIR /lfs
+RUN wget -q --content-disposition "https://packagecloud.io/github/git-lfs/packages/el/9/git-lfs-3.6.1-1.el9.x86_64.rpm/download.rpm?distro_version_id=240"
+RUN dnf install -y git-lfs-3.6.1-1.el9.x86_64.rpm && dnf clean all
+
 RUN python3 --version && python3 -m pip install numpy==1.21.0 --no-cache-dir
 
 ARG INSTALL_DRIVER_VERSION="23.22.26516"

Dockerfile.ubuntu

@@ -44,7 +44,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
             patch \
             pkg-config \
             wget \
-            zlib1g-dev && \
+            zlib1g-dev \
+            git-lfs && \
             update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 && \
             update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 && \
             apt-get clean && \

WORKSPACE

@@ -472,6 +472,10 @@ aws_sdk_cpp()
 load("@//third_party/llm_engine:llm_engine.bzl", "llm_engine")
 llm_engine()
 
+### Libgit2
+load("@//third_party/libgt2:libgt2_engine.bzl", "libgt2_engine")
+libgt2_engine()
+
 load("@//third_party/drogon:drogon.bzl", "drogon_cpp")
 drogon_cpp()
 

ci/build_test_OnCommit.groovy

@@ -10,6 +10,9 @@ pipeline {
     agent {
       label 'ovmsbuilder'
     }
+    options {
+      timeout(time: 4, unit: 'HOURS')
+    }
     stages {
         stage('Configure') {
           steps {
@@ -45,6 +48,9 @@ pipeline {
           }
         }
         stage('Style, SDL and clean') {
+          options {
+            timeout(time: 20, unit: 'MINUTES')
+          }
           parallel {
             stage('Style check') {
               agent {
@@ -74,6 +80,9 @@ pipeline {
           }
         }
         stage('Build') {
+          options {
+            timeout(time: 4, unit: 'HOURS')
+          }
           parallel {
             stage("Build linux") {
               agent {
@@ -82,6 +91,7 @@ pipeline {
               when { expression { image_build_needed == "true" } }
                 steps {
                       sh "echo build --remote_cache=${env.OVMS_BAZEL_REMOTE_CACHE_URL} > .user.bazelrc"
+                      sh "echo test:linux --test_env https_proxy=${env.HTTPS_PROXY} >> .user.bazelrc"
                       sh "make ovms_builder_image RUN_TESTS=0 OPTIMIZE_BUILDING_TESTS=1 OV_USE_BINARY=1 BASE_OS=redhat OVMS_CPP_IMAGE_TAG=${shortCommit} BUILD_IMAGE=openvino/model_server-build:${shortCommit}"
                     }
             }
@@ -115,6 +125,9 @@ pipeline {
         }
         stage("Release image and tests in parallel") {
           when { expression { image_build_needed == "true" } }
+          options {
+            timeout(time: 120, unit: 'MINUTES')
+          }
           parallel {
             stage("Run unit tests") {
               agent {

create_package.sh

@@ -37,11 +37,12 @@ if [ -f /ovms_release/lib/libopenvino_genai_c.so ]; then cd /ovms_release/lib/ ;
 rm -rf \
 	/ovms_release/lib/libssl.so \
 	/ovms_release/lib/libexternal_Szlib_Slibzlib.so \
-	/ovms_release/lib/py_openvino_genai.cpython-312-x86_64-linux-gnu.so \
+	/ovms_release/lib/py_openvino_genai.cpython-*-x86_64-linux-gnu.so \
 	/ovms_release/lib/libinference_calculator_cc_proto.so \
 	/ovms_release/lib/libzlib.so \
-	/ovms_release/lib/libface_detection_cc_proto.so.so \
-	/ovms_release/lib/_crypt.cpython-312-x86_64-linux-gnu.so \
+	/ovms_release/lib/libface_detection_cc_proto.so \
+	/ovms_release/lib/_crypt.cpython-*-x86_64-linux-gnu.so \
+	/ovms_release/lib/_testclinic.cpython-*-x86_64-linux-gnu.so \
 	/ovms_release/lib/libface_detection_options_registry.so \
 	/ovms_release/lib/libinference_calculator_options_registry.so
 
@@ -84,6 +85,8 @@ patchelf --debug --set-rpath '$ORIGIN' /ovms_release/lib/libopenvino.so
 patchelf --debug --set-rpath '$ORIGIN' /ovms_release/lib/lib*plugin.so
 if [ -f  /ovms_release/lib/libopenvino_nvidia_gpu_plugin.so ] && [ "$BASE_OS" != "redhat" ]; then patchelf  --replace-needed libcutensor.so.1 /usr/lib/x86_64-linux-gnu/libcutensor/11/libcutensor.so.1 /ovms_release/lib/libopenvino_nvidia_gpu_plugin.so ; fi
 
+cp -P /usr/bin/git-lfs .
+
 cd /ovms
 cp -v /ovms/release_files/LICENSE /ovms_release/
 cp -v /ovms/release_files/metadata.json /ovms_release/

demos/c_api_minimal_app/README.md

@@ -92,7 +92,7 @@ run `make` command in ovms git main directory.
 ```bash
 git clone https://github.com/openvinotoolkit/model_server.git
 cd model_server
-make
+make BASE_OS=ubuntu24
 ```
 
 And then execute the alternative make target: