Skip to content

Commit 48f3794

Browse files
mc-nvpvijayakrishnv-kmcgill53
authored
Update default branch post 25.01 (#296)
* Update CUDA archs in ORT (#291) * Update CUDA archs in ORT * Update CUDA archs in ORT and fixing typo * Update cudnn home * Version upgrade for openvino updated from 24.12 * Update CUDNN_home for v9.7.0 * Update the home path * Update path * Update CUDNN home * Remove comments * Update the supported igpu NVCC * Update the supported igpu and dgpu NVCC * Upadate default branch post 24.12 (#290) * Update README and versions for 2.53.0 / 24.12 (#288) * Update 'gen_ort_dockerfile.py' fil to meet changes in ONNX Runtime 1.20.x * remove psutils * Update reformating * restore description * Update OpenVINO to 2024.5 (#287) * Update 'gen_ort_dockerfile.py' fil to meet changes in ONNX Runtime 1.20.x * remove psutils * Add OpenVINO version * Fix pre-commit issues * Extract archive in different location (#289) * Extract archive in different location * Revert "Extract archive in different location" This reverts commit e57256a. * Update installation instructions * Reapply "Extract archive in different location" This reverts commit 59e24e4. * Rolling back changes cherry picked from 24.12 * Rolling back changes cherry picked from 24.12: fixing spaces --------- Co-authored-by: Misha Chornyi <[email protected]> * Downgrade patchelf version from 0.18.0 to 0.17.2 (#295) Downgrade patchelf version from 0.18.0 to 0.17.2 due to patchelf regression Patchelf shipped a regression in 0.18.0 and has since yanked the pypi release pointing to 0.17.2 as the most recent version. However, 0.18.0 is still the version shipped in both the apt and yum repositories, thus we must use pip to install the version we want. See mayeut/patchelf-pypi#87 --------- Co-authored-by: Pavithra Vijayakrishnan <[email protected]> Co-authored-by: Kyle McGill <[email protected]>
1 parent 0b4f3f0 commit 48f3794

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

cmake/download_onnxruntime.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ if(DEFINED TRITON_ONNXRUNTIME_PACKAGE_URL)
2828

2929
endif(NOT DOWNLOAD_RESULT EQUAL 0)
3030

31-
endif(DEFINED TRITON_ONNXRUNTIME_PACKAGE_URL)
31+
endif(DEFINED TRITON_ONNXRUNTIME_PACKAGE_URL)
32+

tools/gen_ort_dockerfile.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ def dockerfile_for_linux(output_file):
123123
zip \
124124
ca-certificates \
125125
curl \
126-
patchelf \
127126
python3-pip \
128127
git \
129128
gnupg \
130129
gnupg1 \
131130
openssl-devel
132131
132+
RUN pip3 install patchelf==0.17.2
133133
"""
134134
else:
135135
df += """
@@ -143,13 +143,14 @@ def dockerfile_for_linux(output_file):
143143
curl \
144144
libcurl4-openssl-dev \
145145
libssl-dev \
146-
patchelf \
147146
python3-dev \
148147
python3-pip \
149148
git \
150149
gnupg \
151150
gnupg1
152151
152+
RUN pip3 install patchelf==0.17.2
153+
153154
# Install dependencies from
154155
# onnxruntime/dockerfiles/scripts/install_common_deps.sh.
155156
RUN apt update -q=2 \\
@@ -256,7 +257,7 @@ def dockerfile_for_linux(output_file):
256257
if FLAGS.cudnn_home is not None:
257258
ep_flags += ' --cudnn_home "{}"'.format(FLAGS.cudnn_home)
258259
elif target_platform() == "igpu":
259-
ep_flags += ' --cudnn_home "/usr/lib/aarch64-linux-gnu"'
260+
ep_flags += ' --cudnn_home "/usr/include"'
260261
if FLAGS.ort_tensorrt:
261262
ep_flags += " --use_tensorrt"
262263
if FLAGS.ort_version >= "1.12.1":
@@ -275,9 +276,9 @@ def dockerfile_for_linux(output_file):
275276
ep_flags += (
276277
" --skip_tests --cmake_extra_defines 'onnxruntime_BUILD_UNIT_TESTS=OFF'"
277278
)
278-
cuda_archs = "53;62;72;87"
279+
cuda_archs = "87;101"
279280
else:
280-
cuda_archs = "75;80;86;90"
281+
cuda_archs = "75;80;86;89;90;100;120"
281282

282283
df += """
283284
WORKDIR /workspace/onnxruntime
@@ -472,7 +473,7 @@ def dockerfile_for_windows(output_file):
472473
WORKDIR /workspace/onnxruntime
473474
ARG VS_DEVCMD_BAT="\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat"
474475
RUN powershell Set-Content 'build.bat' -value 'call %VS_DEVCMD_BAT%',(Get-Content 'build.bat')
475-
RUN build.bat --cmake_generator "Visual Studio 17 2022" --config Release --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=75;80;86;90" --skip_submodule_sync --parallel --build_shared_lib --compile_no_warning_as_error --skip_tests --update --build --build_dir /workspace/build {}
476+
RUN build.bat --cmake_generator "Visual Studio 17 2022" --config Release --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=75;80;86;90;100;120" --skip_submodule_sync --parallel --build_shared_lib --compile_no_warning_as_error --skip_tests --update --build --build_dir /workspace/build {}
476477
""".format(
477478
ep_flags
478479
)

0 commit comments

Comments
 (0)