Merge branch 'master' into deprecate_openvino_code_completion

Author: gblong1

.github/workflows/linux.yml

@@ -1,4 +1,4 @@
-name: Linux (Ubuntu 20.04, Python 3.11)
+name: Linux (Ubuntu 22.04, Python 3.11)
 on:
   workflow_dispatch:
   pull_request:
@@ -25,9 +25,9 @@ jobs:
     defaults:
       run:
         shell: bash
-    runs-on: ubuntu-20.04-16-cores
+    runs-on: ubuntu-22.04-16-cores
     container:
-      image: ubuntu:20.04
+      image: ubuntu:22.04
     env:
       DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
       CMAKE_BUILD_TYPE: 'Release'
@@ -214,9 +214,9 @@ jobs:
     defaults:
       run:
         shell: bash
-    runs-on: ubuntu-20.04-16-cores
+    runs-on: ubuntu-22.04-16-cores
     container:
-      image: nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04
+      image: nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu22.04
     env:
       CMAKE_BUILD_TYPE: 'Release'
       CMAKE_GENERATOR: 'Ninja Multi-Config'
@@ -298,20 +298,21 @@ jobs:
 
       - name: Install CUDA
         run: |
-          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
-          mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
+          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin
+          mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600
 
-          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
-          add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
+          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
+          add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /"
           apt update
           apt install -y --allow-downgrades --allow-change-held-packages \
+            linux-headers-5.15.0-25-generic \
             libcudnn8=8.9.4.*-1+cuda11.8 \
             libcudnn8-dev=8.9.4.*-1+cuda11.8 \
             libcudnn8-samples=8.9.4.*-1+cuda11.8 \
             cuda-runtime-11-8 \
             cuda-11-8 \
-            libcutensor1=1.6.1.5-1 \
-            libcutensor-dev=1.6.1.5-1 \
+            libcutensor1=1.7.0.1-1 \
+            libcutensor-dev=1.7.0.1-1 \
             cuda-drivers=520.61.05-1
 
       #

.github/workflows/ollama_openvino_build_and_test.yml

@@ -9,8 +9,8 @@ on:
 permissions: read-all
 
 jobs:
-  test_ubuntu20:
-    runs-on: ubuntu-20.04
+  test_ubuntu22:
+    runs-on: ubuntu-22.04
     steps:
       - name: Download repo
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

modules/nvidia_plugin/README.md

@@ -48,7 +48,7 @@ Afterwards plugin build procedure is as following:
 
 1. Clone `openvino_contrib` repository:
 ```bash
-git clone --recurse-submodules --single-branch --branch=2022.3.0 https://github.com/openvinotoolkit/openvino_contrib.git
+git clone --recurse-submodules --single-branch --branch=2024.1.0 https://github.com/openvinotoolkit/openvino_contrib.git
 ```
 2. Go to plugin directory:
 ```bash
@@ -60,7 +60,7 @@ mkdir build && cd build
 ```
 4. Build plugin
 
-    First of all, switch OpenVINO™ to tag _2022.3.0_ and then build it according the instruction [How to build](https://github.com/openvinotoolkit/openvino/wiki#how-to-build)
+    First of all, switch OpenVINO™ to tag _2024.1.0_ and then build it according the instruction [How to build](https://github.com/openvinotoolkit/openvino/wiki#how-to-build)
 
     Then build CUDA Plugin with one of 2 options:
 - Using `build.sh`
@@ -97,7 +97,7 @@ If python available the CUDA Plugin could be compiled with setup.py script as fo
 
 1. Clone `openvino_contrib` repository:
 ```bash
-git clone --recurse-submodules --single-branch --branch=2022.3.0 https://github.com/openvinotoolkit/openvino_contrib.git
+git clone --recurse-submodules --single-branch --branch=2024.1.0 https://github.com/openvinotoolkit/openvino_contrib.git
 ```
 2. Go to plugin directory:
 ```bash

modules/nvidia_plugin/build.sh

@@ -39,6 +39,7 @@ fi
 cd "${OPENVINO_BUILD_PATH}"
 cmake "${OPENVINO_HOME}" \
       -DENABLE_NVIDIA=ON \
+      -DENABLE_PLUGINS_XML=ON \
       -DENABLE_TESTS="${ENABLE_TESTS}" \
       -DBUILD_arm_plugin=OFF \
       -DBUILD_java_api=OFF \

…plugin/wheel/openvino_nvidia/__init__.py …eel/packages/openvino_nvidia/__init__.pymodules/nvidia_plugin/wheel/openvino_nvidia/__init__.py renamed to modules/nvidia_plugin/wheel/packages/openvino_nvidia/__init__.py modules/nvidia_plugin/wheel/openvino_nvidia/__init__.py renamed to modules/nvidia_plugin/wheel/packages/openvino_nvidia/__init__.py

@@ -36,4 +36,4 @@ def _register_nvidia_plugin():
 
 _register_nvidia_plugin()
 
-__version__ = "2022.3.0"
+__version__ = "2024.1.0"

modules/nvidia_plugin/wheel/requirements.txt

@@ -1 +1 @@
-openvino==2022.3.0
+openvino==2024.1.0