From edc9179749a3b642784fd5bf6565e13ecc6fc960 Mon Sep 17 00:00:00 2001 From: Egor Tiuvaev Date: Wed, 14 Aug 2024 13:43:41 +0200 Subject: [PATCH] Add 2023.3 release --- refactor/configs/base/ubuntu18.json | 58 +++++++++++++++++++ refactor/configs/base/ubuntu20.json | 3 +- refactor/configs/base/ubuntu22.json | 3 +- refactor/configs/base/ubuntu24.json | 3 +- .../configs/releases/2023.3/ubuntu18.json | 16 +++++ .../configs/releases/2023.3/ubuntu20.json | 16 +++++ .../configs/releases/2023.3/ubuntu22.json | 16 +++++ .../configs/releases/2024.1/ubuntu20.json | 16 +++++ .../configs/releases/2024.1/ubuntu22.json | 18 ++++++ .../{2024.2.0 => 2024.2}/ubuntu20.json | 0 .../{2024.2.0 => 2024.2}/ubuntu22.json | 0 .../{2024.3.0 => 2024.3}/ubuntu20.json | 0 .../{2024.3.0 => 2024.3}/ubuntu22.json | 0 .../templates/Dockerfile_2024_deb_default.j2 | 2 +- refactor/tests/local_library_loadable.sh | 2 +- 15 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 refactor/configs/base/ubuntu18.json create mode 100644 refactor/configs/releases/2023.3/ubuntu18.json create mode 100644 refactor/configs/releases/2023.3/ubuntu20.json create mode 100644 refactor/configs/releases/2023.3/ubuntu22.json create mode 100644 refactor/configs/releases/2024.1/ubuntu20.json create mode 100644 refactor/configs/releases/2024.1/ubuntu22.json rename refactor/configs/releases/{2024.2.0 => 2024.2}/ubuntu20.json (100%) rename refactor/configs/releases/{2024.2.0 => 2024.2}/ubuntu22.json (100%) rename refactor/configs/releases/{2024.3.0 => 2024.3}/ubuntu20.json (100%) rename refactor/configs/releases/{2024.3.0 => 2024.3}/ubuntu22.json (100%) diff --git a/refactor/configs/base/ubuntu18.json b/refactor/configs/base/ubuntu18.json new file mode 100644 index 00000000..e6530be4 --- /dev/null +++ b/refactor/configs/base/ubuntu18.json @@ -0,0 +1,58 @@ +{ + "_based_on": "ubuntu", + "base_image": "ubuntu:18.04", + "os_id": "ubuntu18", + "os_codename": "bionic", + "components": { + "base": { + "requires": [ + "libtbb" + ] + }, + "libtbb": { + "apt": [ + "libtbb2" + ] + }, + "python": { + "apt": [ + "python3.8", + "libpython3.8-dev", + "python3-venv", + "python3.8-venv", + "python3-pip" + ], + "command": "python3.8" + }, + "intel-opencl-icd": { + "apt": [ + "https://github.com/intel/compute-runtime/releases/download/21.38.21026/intel-opencl_21.38.21026_amd64.deb", + "https://github.com/intel/compute-runtime/releases/download/21.38.21026/intel-ocloc_21.38.21026_amd64.deb" + ], + "requires": [ + "compute-runtime" + ] + }, + "level-zero": { + "apt": [ + "https://github.com/oneapi-src/level-zero/releases/download/v1.9.9/level-zero_1.9.9+u18.04_amd64.deb" + ] + }, + "intel-level-zero-gpu": { + "apt": [ + "https://github.com/intel/compute-runtime/releases/download/21.38.21026/intel-level-zero-gpu_1.2.21026_amd64.deb" + ], + "requires": [ + "compute-runtime", + "level-zero" + ] + }, + "compute-runtime": { + "apt": [ + "https://github.com/intel/compute-runtime/releases/download/21.38.21026/intel-gmmlib_21.2.1_amd64.deb", + "https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.8708/intel-igc-core_1.0.8708_amd64.deb", + "https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.8708/intel-igc-opencl_1.0.8708_amd64.deb" + ] + } + } +} \ No newline at end of file diff --git a/refactor/configs/base/ubuntu20.json b/refactor/configs/base/ubuntu20.json index 51c65d0f..f4d4aa31 100644 --- a/refactor/configs/base/ubuntu20.json +++ b/refactor/configs/base/ubuntu20.json @@ -22,7 +22,8 @@ "https://github.com/intel/compute-runtime/releases/download/22.37.24175/intel-level-zero-gpu_1.3.24175_amd64.deb" ], "requires": [ - "compute-runtime" + "compute-runtime", + "level-zero" ] }, "compute-runtime": { diff --git a/refactor/configs/base/ubuntu22.json b/refactor/configs/base/ubuntu22.json index 36d6f166..eef3b607 100644 --- a/refactor/configs/base/ubuntu22.json +++ b/refactor/configs/base/ubuntu22.json @@ -22,7 +22,8 @@ "https://github.com/intel/compute-runtime/releases/download/24.22.29735.20/intel-level-zero-gpu_1.3.29735.20_amd64.deb" ], "requires": [ - "compute-runtime" + "compute-runtime", + "level-zero" ] }, "intel-level-zero-npu": { diff --git a/refactor/configs/base/ubuntu24.json b/refactor/configs/base/ubuntu24.json index 694e00fe..113e3e0f 100644 --- a/refactor/configs/base/ubuntu24.json +++ b/refactor/configs/base/ubuntu24.json @@ -22,7 +22,8 @@ "https://github.com/intel/compute-runtime/releases/download/24.22.29735.20/intel-level-zero-gpu_1.3.29735.20_amd64.deb" ], "requires": [ - "compute-runtime" + "compute-runtime", + "level-zero" ] }, "intel-level-zero-npu": { diff --git a/refactor/configs/releases/2023.3/ubuntu18.json b/refactor/configs/releases/2023.3/ubuntu18.json new file mode 100644 index 00000000..ccfd5687 --- /dev/null +++ b/refactor/configs/releases/2023.3/ubuntu18.json @@ -0,0 +1,16 @@ +{ + "_based_on": "ubuntu18", + "_template": "Dockerfile_2024_deb_default.j2", + "package": { + "url": "https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/linux/l_openvino_toolkit_ubuntu18_2023.3.0.13775.ceeafaf64f3_x86_64.tgz", + "version": "2023.3.0" + }, + "presets": { + "runtime": [ + "preset_runtime" + ], + "dev": [ + "preset_dev" + ] + } +} diff --git a/refactor/configs/releases/2023.3/ubuntu20.json b/refactor/configs/releases/2023.3/ubuntu20.json new file mode 100644 index 00000000..23d1a9ab --- /dev/null +++ b/refactor/configs/releases/2023.3/ubuntu20.json @@ -0,0 +1,16 @@ +{ + "_based_on": "ubuntu20", + "_template": "Dockerfile_2024_deb_default.j2", + "package": { + "url": "https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/linux/l_openvino_toolkit_ubuntu20_2023.3.0.13775.ceeafaf64f3_x86_64.tgz", + "version": "2023.3.0" + }, + "presets": { + "runtime": [ + "preset_runtime" + ], + "dev": [ + "preset_dev" + ] + } +} diff --git a/refactor/configs/releases/2023.3/ubuntu22.json b/refactor/configs/releases/2023.3/ubuntu22.json new file mode 100644 index 00000000..a807ebf7 --- /dev/null +++ b/refactor/configs/releases/2023.3/ubuntu22.json @@ -0,0 +1,16 @@ +{ + "_based_on": "ubuntu22", + "_template": "Dockerfile_2024_deb_default.j2", + "package": { + "url": "https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/linux/l_openvino_toolkit_ubuntu22_2023.3.0.13775.ceeafaf64f3_x86_64.tgz", + "version": "2023.3.0" + }, + "presets": { + "runtime": [ + "preset_runtime" + ], + "dev": [ + "preset_dev" + ] + } +} diff --git a/refactor/configs/releases/2024.1/ubuntu20.json b/refactor/configs/releases/2024.1/ubuntu20.json new file mode 100644 index 00000000..4b228c7e --- /dev/null +++ b/refactor/configs/releases/2024.1/ubuntu20.json @@ -0,0 +1,16 @@ +{ + "_based_on": "ubuntu20", + "_template": "Dockerfile_2024_deb_default.j2", + "package": { + "url": "https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/linux/l_openvino_toolkit_ubuntu20_2024.1.0.15008.f4afc983258_x86_64.tgz", + "version": "2024.1.0" + }, + "presets": { + "runtime": [ + "preset_runtime" + ], + "dev": [ + "preset_dev" + ] + } +} diff --git a/refactor/configs/releases/2024.1/ubuntu22.json b/refactor/configs/releases/2024.1/ubuntu22.json new file mode 100644 index 00000000..26aa2449 --- /dev/null +++ b/refactor/configs/releases/2024.1/ubuntu22.json @@ -0,0 +1,18 @@ +{ + "_based_on": "ubuntu22", + "_template": "Dockerfile_2024_deb_default.j2", + "package": { + "url": "https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/linux/l_openvino_toolkit_ubuntu22_2024.1.0.15008.f4afc983258_x86_64.tgz", + "version": "2024.1.0" + }, + "presets": { + "runtime": [ + "preset_runtime", + "device_npu" + ], + "dev": [ + "preset_dev", + "device_npu" + ] + } +} diff --git a/refactor/configs/releases/2024.2.0/ubuntu20.json b/refactor/configs/releases/2024.2/ubuntu20.json similarity index 100% rename from refactor/configs/releases/2024.2.0/ubuntu20.json rename to refactor/configs/releases/2024.2/ubuntu20.json diff --git a/refactor/configs/releases/2024.2.0/ubuntu22.json b/refactor/configs/releases/2024.2/ubuntu22.json similarity index 100% rename from refactor/configs/releases/2024.2.0/ubuntu22.json rename to refactor/configs/releases/2024.2/ubuntu22.json diff --git a/refactor/configs/releases/2024.3.0/ubuntu20.json b/refactor/configs/releases/2024.3/ubuntu20.json similarity index 100% rename from refactor/configs/releases/2024.3.0/ubuntu20.json rename to refactor/configs/releases/2024.3/ubuntu20.json diff --git a/refactor/configs/releases/2024.3.0/ubuntu22.json b/refactor/configs/releases/2024.3/ubuntu22.json similarity index 100% rename from refactor/configs/releases/2024.3.0/ubuntu22.json rename to refactor/configs/releases/2024.3/ubuntu22.json diff --git a/refactor/templates/Dockerfile_2024_deb_default.j2 b/refactor/templates/Dockerfile_2024_deb_default.j2 index a2070175..da1bb23a 100644 --- a/refactor/templates/Dockerfile_2024_deb_default.j2 +++ b/refactor/templates/Dockerfile_2024_deb_default.j2 @@ -64,7 +64,7 @@ WORKDIR ${INTEL_OPENVINO_DIR} {% if components.python.enable -%} # Python setup -RUN python3 -m venv $VIRTUAL_ENV +RUN {{ components.python.command or "python3" }} -m venv $VIRTUAL_ENV ENV PATH=$VIRTUAL_ENV/bin:$PATH {%- set pyver = (package.wheels.version or package.version) %} diff --git a/refactor/tests/local_library_loadable.sh b/refactor/tests/local_library_loadable.sh index e1dae477..89ccf858 100755 --- a/refactor/tests/local_library_loadable.sh +++ b/refactor/tests/local_library_loadable.sh @@ -1,3 +1,3 @@ #!/bin/bash -ldd -u $(find -name $1) >/dev/null +ldd $(find -name $1) | grep "not found" && exit 1 || exit 0