From ec06da74689cdc0c636d834dba7da3f7b20285a8 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Thu, 5 Jun 2025 17:14:54 -0700 Subject: [PATCH 1/3] Include missed commit --- tools/gen_ort_dockerfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index 160c4ff..6353da6 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -275,8 +275,9 @@ def dockerfile_for_linux(output_file): ARG ONNXRUNTIME_REPO ARG ONNXRUNTIME_BUILD_CONFIG -RUN git clone -b rel-${ONNXRUNTIME_VERSION} --recursive ${ONNXRUNTIME_REPO} onnxruntime && \ - (cd onnxruntime && git submodule update --init --recursive) +RUN git clone -b rel-${ONNXRUNTIME_VERSION} --recursive ${ONNXRUNTIME_REPO} onnxruntime \\ + && cd onnxruntime \\ + && git cherry-pick 9dad9af9f9b48c05814d0c2d067d0565e8da6ce8 """ if FLAGS.onnx_tensorrt_tag != "": From 122eb3b3d939d25316f0f029ee141ae48f3765d2 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Mon, 9 Jun 2025 10:12:10 -0700 Subject: [PATCH 2/3] Adding required changes to the build. --- 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 6353da6..0ab656b 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -277,7 +277,7 @@ def dockerfile_for_linux(output_file): RUN git clone -b rel-${ONNXRUNTIME_VERSION} --recursive ${ONNXRUNTIME_REPO} onnxruntime \\ && cd onnxruntime \\ - && git cherry-pick 9dad9af9f9b48c05814d0c2d067d0565e8da6ce8 + && git cherry-pick -n 9dad9af9f9b48c05814d0c2d067d0565e8da6ce8 """ if FLAGS.onnx_tensorrt_tag != "": From 87e97026620e586b2e2422b1c137e278a50c9c5a Mon Sep 17 00:00:00 2001 From: Misha Chornyi <99709299+mc-nv@users.noreply.github.com> Date: Wed, 11 Jun 2025 10:49:39 -0700 Subject: [PATCH 3/3] Update tools/gen_ort_dockerfile.py Co-authored-by: Yingge He <157551214+yinggeh@users.noreply.github.com> --- tools/gen_ort_dockerfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py index 0ab656b..33845cb 100755 --- a/tools/gen_ort_dockerfile.py +++ b/tools/gen_ort_dockerfile.py @@ -275,6 +275,7 @@ def dockerfile_for_linux(output_file): ARG ONNXRUNTIME_REPO ARG ONNXRUNTIME_BUILD_CONFIG +# Cherry-pick commit: https://github.com/microsoft/onnxruntime/commit/9dad9af9f9b48c05814d0c2d067d0565e8da6ce8 RUN git clone -b rel-${ONNXRUNTIME_VERSION} --recursive ${ONNXRUNTIME_REPO} onnxruntime \\ && cd onnxruntime \\ && git cherry-pick -n 9dad9af9f9b48c05814d0c2d067d0565e8da6ce8