From 93c52577509067215fc62973dcf97822c89f6eeb Mon Sep 17 00:00:00 2001 From: pvijayakrish Date: Fri, 18 Oct 2024 16:22:39 -0700 Subject: [PATCH 1/4] Update OPENVINO_VERSION_MAP --- tools/gen_ort_dockerfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index c320f60..c4bdb68 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -52,6 +52,10 @@ "2024.1", # OpenVINO short version "2024.1.0.15008.f4afc983258", # OpenVINO version with build number ), + "2024.4.0": ( + "2024.4", # OpenVINO short version + "2024.4.0.16579.c3152d32c9c", # OpenVINO version with build number + ), } From 6d96de4e98730c1fa5c50c4a2dac9ece2a330d96 Mon Sep 17 00:00:00 2001 From: pvijayakrish Date: Mon, 21 Oct 2024 11:36:01 -0700 Subject: [PATCH 2/4] DEBUG --- tools/gen_ort_dockerfile.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index c4bdb68..1a31838 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -358,6 +358,10 @@ def dockerfile_for_linux(output_file): RUN cp /workspace/onnxruntime/include/onnxruntime/core/providers/openvino/openvino_provider_factory.h \ /opt/onnxruntime/include +RUN ls -l /usr/lib/x86_64-linux-gnu/ +RUN ls -l /usr/lib/x86_64-linux-gnu/ | grep libtbb + + RUN cp /workspace/build/${ONNXRUNTIME_BUILD_CONFIG}/libonnxruntime_providers_openvino.so \ /opt/onnxruntime/lib && \ cp ${INTEL_OPENVINO_DIR}/runtime/lib/intel64/libopenvino.so.${ONNXRUNTIME_OPENVINO_VERSION} \ @@ -370,7 +374,7 @@ def dockerfile_for_linux(output_file): /opt/onnxruntime/lib && \ cp ${INTEL_OPENVINO_DIR}/runtime/lib/intel64/libopenvino_onnx_frontend.so.${ONNXRUNTIME_OPENVINO_VERSION} \ /opt/onnxruntime/lib && \ - cp /usr/lib/x86_64-linux-gnu/libtbb.so.12 /opt/onnxruntime/lib + cp /usr/lib/x86_64-linux-gnu/libtbb.so.* /opt/onnxruntime/lib RUN OV_SHORT_VERSION=`echo ${ONNXRUNTIME_OPENVINO_VERSION} | awk '{ split($0,a,"."); print substr(a[1],3) a[2] a[3] }'` && \ (cd /opt/onnxruntime/lib && \ @@ -661,4 +665,4 @@ def preprocess_gpu_flags(): FLAGS.ort_openvino = None dockerfile_for_windows(FLAGS.output) else: - dockerfile_for_linux(FLAGS.output) + dockerfile_for_linux(FLAGS.output) \ No newline at end of file From 6fa6250e930c95c5deb66996125574c539ba7b36 Mon Sep 17 00:00:00 2001 From: pvijayakrish Date: Mon, 21 Oct 2024 14:03:27 -0700 Subject: [PATCH 3/4] install libtbb --- tools/gen_ort_dockerfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index 1a31838..05af946 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -358,10 +358,10 @@ def dockerfile_for_linux(output_file): RUN cp /workspace/onnxruntime/include/onnxruntime/core/providers/openvino/openvino_provider_factory.h \ /opt/onnxruntime/include +RUN apt-get update && apt-get install -y --no-install-recommends libtbb2 RUN ls -l /usr/lib/x86_64-linux-gnu/ RUN ls -l /usr/lib/x86_64-linux-gnu/ | grep libtbb - RUN cp /workspace/build/${ONNXRUNTIME_BUILD_CONFIG}/libonnxruntime_providers_openvino.so \ /opt/onnxruntime/lib && \ cp ${INTEL_OPENVINO_DIR}/runtime/lib/intel64/libopenvino.so.${ONNXRUNTIME_OPENVINO_VERSION} \ From 23b83850155e1bf2f4320052f543c4f02c856f6c Mon Sep 17 00:00:00 2001 From: pvijayakrish Date: Mon, 21 Oct 2024 17:26:06 -0700 Subject: [PATCH 4/4] Upgrade Openvino version and revert debug changes --- tools/gen_ort_dockerfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index 05af946..1eee9f9 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -358,9 +358,7 @@ def dockerfile_for_linux(output_file): RUN cp /workspace/onnxruntime/include/onnxruntime/core/providers/openvino/openvino_provider_factory.h \ /opt/onnxruntime/include -RUN apt-get update && apt-get install -y --no-install-recommends libtbb2 -RUN ls -l /usr/lib/x86_64-linux-gnu/ -RUN ls -l /usr/lib/x86_64-linux-gnu/ | grep libtbb +RUN apt-get update && apt-get install -y --no-install-recommends libtbb2 RUN cp /workspace/build/${ONNXRUNTIME_BUILD_CONFIG}/libonnxruntime_providers_openvino.so \ /opt/onnxruntime/lib && \