Skip to content

Commit d646603

Browse files
mc-nvnv-anantsyinggeh
authored
Update main branch post 24.11 (#286)
* Enable support for Ubuntu 24.04 (#283) * Build Updates for Ubuntu24.04 (#282) * update cmake version * update versions for u24 * add compile_no_warning_as_error flag * remove libtbb copy * remove werror * add back libtbb * remove pip flag * add pip flag env var * Revert "add back libtbb" This reverts commit 26649c2. * include patch version in cmake install * Update python version * Restore installation of the missed package * Fix cudnn location --------- Co-authored-by: Anant Sharma <anants@nvidia.com> * fix: Fix L0_onnx_execution_provider (#284) * Rollback to ORT 1.19.2 * Revert changes in ORT file * fix dockerfile * pre-commit fix --------- Co-authored-by: Misha Chornyi <mchornyi@nvidia.com> --------- Co-authored-by: Anant Sharma <anants@nvidia.com> Co-authored-by: Yingge He <157551214+yinggeh@users.noreply.github.com>
1 parent bc4a7cb commit d646603

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ target_compile_features(triton-onnxruntime-backend PRIVATE cxx_std_${TRITON_MIN_
236236
target_compile_options(
237237
triton-onnxruntime-backend PRIVATE
238238
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
239-
-Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Werror>
239+
-Wall -Wextra -Wno-unused-parameter -Wno-type-limits>
240240
$<$<CXX_COMPILER_ID:MSVC>:/Wall /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor>
241241
)
242242

tools/gen_ort_dockerfile.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def dockerfile_for_linux(output_file):
9494
df += """
9595
# Ensure apt-get won't prompt for selecting options
9696
ENV DEBIAN_FRONTEND=noninteractive
97+
ENV PIP_BREAK_SYSTEM_PACKAGES=1
9798
9899
# The Onnx Runtime dockerfile is the collection of steps in
99100
# https://github.com/microsoft/onnxruntime/tree/master/dockerfiles
@@ -153,7 +154,7 @@ def dockerfile_for_linux(output_file):
153154
&& . /etc/os-release \\
154155
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \\
155156
&& apt-get update -q=2 \\
156-
&& apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7* \\
157+
&& apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* \\
157158
&& cmake --version
158159
159160
"""
@@ -185,10 +186,10 @@ def dockerfile_for_linux(output_file):
185186
df += """
186187
# Step 1: Download and install core components
187188
# Ref: https://docs.openvino.ai/2024/get-started/install-openvino/install-openvino-archive-linux.html#step-1-download-and-install-the-openvino-core-components
188-
RUN curl -L https://storage.openvinotoolkit.org/repositories/openvino/packages/${OPENVINO_SHORT_VERSION}/linux/l_openvino_toolkit_ubuntu22_${OPENVINO_VERSION_WITH_BUILD_NUMBER}_x86_64.tgz --output openvino_${ONNXRUNTIME_OPENVINO_VERSION}.tgz && \
189+
RUN curl -L https://storage.openvinotoolkit.org/repositories/openvino/packages/${OPENVINO_SHORT_VERSION}/linux/l_openvino_toolkit_ubuntu24_${OPENVINO_VERSION_WITH_BUILD_NUMBER}_x86_64.tgz --output openvino_${ONNXRUNTIME_OPENVINO_VERSION}.tgz && \
189190
tar -xf openvino_${ONNXRUNTIME_OPENVINO_VERSION}.tgz && \
190191
mkdir -p ${INTEL_OPENVINO_DIR} && \
191-
mv l_openvino_toolkit_ubuntu22_${OPENVINO_VERSION_WITH_BUILD_NUMBER}_x86_64/* ${INTEL_OPENVINO_DIR} && \
192+
mv l_openvino_toolkit_ubuntu24_${OPENVINO_VERSION_WITH_BUILD_NUMBER}_x86_64/* ${INTEL_OPENVINO_DIR} && \
192193
rm openvino_${ONNXRUNTIME_OPENVINO_VERSION}.tgz && \
193194
(cd ${INTEL_OPENVINO_DIR}/install_dependencies && \
194195
./install_openvino_dependencies.sh -y) && \
@@ -197,9 +198,9 @@ def dockerfile_for_linux(output_file):
197198
# Step 2: Configure the environment
198199
# Ref: https://docs.openvino.ai/2024/get-started/install-openvino/install-openvino-archive-linux.html#step-2-configure-the-environment
199200
ENV OpenVINO_DIR=$INTEL_OPENVINO_DIR/runtime/cmake
200-
ENV LD_LIBRARY_PATH $INTEL_OPENVINO_DIR/runtime/lib/intel64:$LD_LIBRARY_PATH
201+
ENV LD_LIBRARY_PATH=$INTEL_OPENVINO_DIR/runtime/lib/intel64:$LD_LIBRARY_PATH
201202
ENV PKG_CONFIG_PATH=$INTEL_OPENVINO_DIR/runtime/lib/intel64/pkgconfig
202-
ENV PYTHONPATH $INTEL_OPENVINO_DIR/python/python3.10:$INTEL_OPENVINO_DIR/python/python3:$PYTHONPATH
203+
ENV PYTHONPATH=$INTEL_OPENVINO_DIR/python/python3.12:$INTEL_OPENVINO_DIR/python/python3:$PYTHONPATH
203204
"""
204205

205206
## TEMPORARY: Using the tensorrt-8.0 branch until ORT 1.9 release to enable ORT backend with TRT 8.0 support.
@@ -287,7 +288,7 @@ def dockerfile_for_linux(output_file):
287288
df += """
288289
WORKDIR /workspace/onnxruntime
289290
ARG COMMON_BUILD_ARGS="--config ${{ONNXRUNTIME_BUILD_CONFIG}} --skip_submodule_sync --parallel --build_shared_lib \
290-
--build_dir /workspace/build --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES='{}' "
291+
--compile_no_warning_as_error --build_dir /workspace/build --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES='{}' "
291292
""".format(
292293
cuda_archs
293294
)
@@ -358,7 +359,7 @@ def dockerfile_for_linux(output_file):
358359
RUN cp /workspace/onnxruntime/include/onnxruntime/core/providers/openvino/openvino_provider_factory.h \
359360
/opt/onnxruntime/include
360361
361-
RUN apt-get update && apt-get install -y --no-install-recommends libtbb2
362+
RUN apt-get update && apt-get install -y --no-install-recommends libtbb12
362363
363364
RUN cp /workspace/build/${ONNXRUNTIME_BUILD_CONFIG}/libonnxruntime_providers_openvino.so \
364365
/opt/onnxruntime/lib && \

0 commit comments

Comments
 (0)