From 79f62503d824957f39381a841efaf79e02ae18c0 Mon Sep 17 00:00:00 2001 From: Misha Chornyi <99709299+mc-nv@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:00:15 -0700 Subject: [PATCH 1/3] Enable support for TensoRT 10.5 (#274) * Enable support for TensoRT 10.5 * Revert linux changes --- tools/gen_ort_dockerfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index a9cd7b6..c320f60 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -441,7 +441,9 @@ def dockerfile_for_windows(output_file): ARG ONNXRUNTIME_VERSION ARG ONNXRUNTIME_REPO RUN git clone -b rel-%ONNXRUNTIME_VERSION% --recursive %ONNXRUNTIME_REPO% onnxruntime && \ - (cd onnxruntime && git submodule update --init --recursive) + cd onnxruntime && git submodule update --init --recursive && \ + git config --global user.email "you@example.com" && git config --global user.name "Your Name" && \ + git cherry-pick 709368ea1443dc1ff68dece31d692ad065fb94d4 """ if FLAGS.onnx_tensorrt_tag != "": From c89a48d5dc645c63f13fc50534842817ea08c6b8 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:18:18 -0700 Subject: [PATCH 2/3] 24.10 Upgrade openvino version (#278) * Update OPENVINO_VERSION_MAP and install libtbb. Upgrade Openvino version and revert debug changes --- tools/gen_ort_dockerfile.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index c320f60..1eee9f9 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 + ), } @@ -354,6 +358,8 @@ 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 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} \ @@ -366,7 +372,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 && \ @@ -657,4 +663,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 f98426fbabcb3b97f7518b3c2b404e241fc72eee Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:08:44 -0700 Subject: [PATCH 3/3] Update tools/gen_ort_dockerfile.py Co-authored-by: Misha Chornyi <99709299+mc-nv@users.noreply.github.com> --- 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 1eee9f9..2e8271e 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -447,9 +447,7 @@ def dockerfile_for_windows(output_file): ARG ONNXRUNTIME_VERSION ARG ONNXRUNTIME_REPO RUN git clone -b rel-%ONNXRUNTIME_VERSION% --recursive %ONNXRUNTIME_REPO% onnxruntime && \ - cd onnxruntime && git submodule update --init --recursive && \ - git config --global user.email "you@example.com" && git config --global user.name "Your Name" && \ - git cherry-pick 709368ea1443dc1ff68dece31d692ad065fb94d4 + cd onnxruntime && git submodule update --init --recursive """ if FLAGS.onnx_tensorrt_tag != "":