Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix L0_onnx_execution_provider #284

Merged
merged 4 commits into from
Nov 16, 2024
Merged

fix: Fix L0_onnx_execution_provider #284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98c37f2
Rollback to ORT 1.19.2
mc-nv Nov 15, 2024
c3dbf49
Revert changes in ORT file
mc-nv Nov 15, 2024
57afb48
fix dockerfile
mc-nv Nov 15, 2024
067dab1
pre-commit fix
yinggeh Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions tools/gen_ort_dockerfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,16 @@ def dockerfile_for_linux(output_file):
&& apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* \\
&& cmake --version

RUN python3 -m pip install psutil

"""
if FLAGS.enable_gpu:
df += """
# Allow configure to pick up cuDNN where it expects it.
# (Note: $CUDNN_VERSION is defined by base image)
RUN _CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2) && \
mkdir -p /usr/local/cudnn-$_CUDNN_VERSION/cuda/include && \
ln -s /usr/include/cudnn.h /usr/local/cudnn-$_CUDNN_VERSION/cuda/include/cudnn.h && \
mkdir -p /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64 && \
ln -s /etc/alternatives/libcudnn_so /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64/libcudnn.so
"""

if FLAGS.ort_openvino is not None:
Expand Down Expand Up @@ -387,7 +395,7 @@ def dockerfile_for_linux(output_file):
"""
df += """
RUN cd /opt/onnxruntime/lib && \
for i in `find . -mindepth 1 -maxdepth 1 -type f -name '*\\.so*'`; do \
for i in `find . -mindepth 1 -maxdepth 1 -type f -name '*\.so*'`; do \
patchelf --set-rpath '$ORIGIN' $i; \
done

Expand Down Expand Up @@ -468,7 +476,7 @@ def dockerfile_for_windows(output_file):

df += """
WORKDIR /workspace/onnxruntime
ARG VS_DEVCMD_BAT="\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat"
ARG VS_DEVCMD_BAT="\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
RUN powershell Set-Content 'build.bat' -value 'call %VS_DEVCMD_BAT%',(Get-Content 'build.bat')
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 {}
""".format(
Expand Down Expand Up @@ -551,8 +559,12 @@ def preprocess_gpu_flags():
FLAGS.tensorrt_home = "/tensorrt"
else:
if "CUDNN_VERSION" in os.environ:
version = None
m = re.match(r"([0-9]\.[0-9])\.[0-9]\.[0-9]", os.environ["CUDNN_VERSION"])
if m:
version = m.group(1)
if FLAGS.cudnn_home is None:
FLAGS.cudnn_home = "/usr"
FLAGS.cudnn_home = "/usr/local/cudnn-{}/cuda".format(version)

if FLAGS.cuda_home is None:
FLAGS.cuda_home = "/usr/local/cuda"
Expand Down Expand Up @@ -650,4 +662,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)
Loading