mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-05-14 20:48:00 +00:00
Update C++ dependencies (#21410)
1. Update google benchmark from 1.8.3 to 1.8.5 2. Update google test from commit in main branch to tag 1.15.0 3. Update pybind11 from 2.12.0 to 2.13.1 4. Update pytorch cpuinfo to include the support for Arm Neoverse V2, Cortex X4, A720 and A520. 5. Update re2 from 2024-05-01 to 2024-07-02 6. Update cmake to 3.30.1 7. Update Linux docker images 8. Fix a warning in test/perftest/ort_test_session.cc:826:37: error: implicit conversion loses integer precision: 'streamoff' (aka 'long long') to 'const std::streamsize' (aka 'const long') [-Werror,-Wshorten-64-to-32]
This commit is contained in:
parent
0f1f3b7705
commit
f70215d4e6
27 changed files with 136 additions and 86 deletions
|
|
@ -116,7 +116,7 @@
|
|||
"component": {
|
||||
"type": "git",
|
||||
"git": {
|
||||
"commitHash": "344117638c8ff7e239044fd0fa7085839fc03021",
|
||||
"commitHash": "a6ad7fbbdc2e14fab82bb8a6d27760d700198cbf",
|
||||
"repositoryUrl": "https://github.com/google/benchmark.git"
|
||||
},
|
||||
"comments": "google_benchmark"
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
"component": {
|
||||
"type": "git",
|
||||
"git": {
|
||||
"commitHash": "530d5c8c84abd2a46f38583ee817743c9b3a42b4",
|
||||
"commitHash": "e39786088138f2749d64e9e90e0f9902daa77c40",
|
||||
"repositoryUrl": "https://github.com/google/googletest.git"
|
||||
},
|
||||
"comments": "googletest"
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
"component": {
|
||||
"type": "git",
|
||||
"git": {
|
||||
"commitHash": "3e9dfa2866941655c56877882565e7577de6fc7b",
|
||||
"commitHash": "941f45bcb51457884fa1afd6e24a67377d70f75c",
|
||||
"repositoryUrl": "https://github.com/pybind/pybind11.git"
|
||||
},
|
||||
"comments": "pybind11"
|
||||
|
|
@ -266,7 +266,7 @@
|
|||
"component": {
|
||||
"type": "git",
|
||||
"git": {
|
||||
"commitHash": "959002f82d7962a473d8bf301845f2af720e0aa4",
|
||||
"commitHash": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f",
|
||||
"repositoryUrl": "https://github.com/pytorch/cpuinfo.git"
|
||||
},
|
||||
"comments": "pytorch_cpuinfo"
|
||||
|
|
@ -276,7 +276,7 @@
|
|||
"component": {
|
||||
"type": "git",
|
||||
"git": {
|
||||
"commitHash": "2b354c6ad0d0479dcff68dab23fb0d1143a482c2",
|
||||
"commitHash": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
|
||||
"repositoryUrl": "https://github.com/google/re2.git"
|
||||
},
|
||||
"comments": "re2"
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ eigen;https://gitlab.com/libeigen/eigen/-/archive/e7248b26a1ed53fa030c5c459f7ea0
|
|||
flatbuffers;https://github.com/google/flatbuffers/archive/refs/tags/v23.5.26.zip;59422c3b5e573dd192fead2834d25951f1c1670c
|
||||
fp16;https://github.com/Maratyszcza/FP16/archive/0a92994d729ff76a58f692d3028ca1b64b145d91.zip;b985f6985a05a1c03ff1bb71190f66d8f98a1494
|
||||
fxdiv;https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip;a5658f4036402dbca7cebee32be57fb8149811e1
|
||||
google_benchmark;https://github.com/google/benchmark/archive/refs/tags/v1.8.3.zip;bf9870756ee3f8d2d3b346b24ee3600a41c74d3d
|
||||
google_benchmark;https://github.com/google/benchmark/archive/refs/tags/v1.8.5.zip;cd47d3d272faf353600c8cc2fdec2b52d6f69177
|
||||
google_nsync;https://github.com/google/nsync/archive/refs/tags/1.26.0.zip;5e7c00ef6bf5b787386fc040067903ec774e2752
|
||||
googletest;https://github.com/google/googletest/archive/530d5c8c84abd2a46f38583ee817743c9b3a42b4.zip;5e3a61db2aa975cfd0f97ba92c818744e7fa7034
|
||||
googletest;https://github.com/google/googletest/archive/refs/tags/v1.15.0.zip;9d2d0af8d77ac726ea55d44a8fa727ec98311349
|
||||
googlexnnpack;https://github.com/google/XNNPACK/archive/0da379fc4808f9601faef392352018c741c0f297.zip;663883491e380b628e0a5b162b5f2658032fae73
|
||||
json;https://github.com/nlohmann/json/archive/refs/tags/v3.10.5.zip;f257f8dc27c5b8c085dc887b40cddd18ae1f725c
|
||||
microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf368104cd22a87b4dd0c80228919bb2df3e2a14
|
||||
|
|
@ -48,9 +48,9 @@ protoc_linux_aarch64;https://github.com/protocolbuffers/protobuf/releases/downlo
|
|||
protoc_mac_universal;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-osx-universal_binary.zip;23710c3d1c2036d8d65a6a22234372fa2d7af9ef
|
||||
psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.zip;1f5454b01f06f9656b77e4a5e2e31d7422487013
|
||||
pthreadpool;https://github.com/Maratyszcza/pthreadpool/archive/4fe0e1e183925bf8cfa6aae24237e724a96479b8.zip;07a0aa91dd9bf86f31b95497e00f31d8a261a4bd
|
||||
pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.12.0.zip;8482f57ed55c7b100672815a311d5450858723fb
|
||||
pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/959002f82d7962a473d8bf301845f2af720e0aa4.zip;85da3caa60eb2b148613b443fbc2bfdc30689965
|
||||
re2;https://github.com/google/re2/archive/refs/tags/2024-05-01.tar.gz;206cfee5ee0b4c6844680ba66275e9e8faa77405
|
||||
pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.13.1.zip;9255d5c8568debcc329dd42ed8f410ee139ac7b1
|
||||
pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/ca678952a9a8eaa6de112d154e8e104b22f9ab3f.zip;138bf57d2a110935330d1048dce6d7b82d17d377
|
||||
re2;https://github.com/google/re2/archive/refs/tags/2024-07-02.zip;646e1728269cde7fcef990bf4a8e87b047882e88
|
||||
safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252040ff6cb9f1fd18575b32fa8fb5928daac
|
||||
tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381
|
||||
cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.5.0.zip;ae038931b9fc2c416c17d9cda91d9706b343f56d
|
||||
|
|
|
|||
120
cmake/external/abseil-cpp.cmake
vendored
120
cmake/external/abseil-cpp.cmake
vendored
|
|
@ -50,46 +50,96 @@ endif()
|
|||
# TODO: since multiple ORT's dependencies depend on Abseil, the list below would vary from version to version.
|
||||
# We'd better to not manually manage the list.
|
||||
set(ABSEIL_LIBS
|
||||
absl::city
|
||||
absl::absl_log
|
||||
absl::log_internal_log_impl
|
||||
absl::log_internal_strip
|
||||
absl::log_internal_message
|
||||
absl::log_internal_format
|
||||
absl::synchronization
|
||||
absl::str_format
|
||||
absl::flags
|
||||
absl::flat_hash_map
|
||||
absl::flat_hash_set
|
||||
absl::log_internal_globals
|
||||
absl::kernel_timeout_internal
|
||||
absl::str_format_internal
|
||||
absl::hash
|
||||
absl::inlined_vector
|
||||
absl::low_level_hash
|
||||
absl::log_internal_append_truncated
|
||||
absl::absl_vlog_is_on
|
||||
absl::flags_commandlineflag
|
||||
absl::time
|
||||
absl::symbolize
|
||||
absl::graphcycles_internal
|
||||
absl::log_internal_conditions
|
||||
absl::strings
|
||||
absl::malloc_internal
|
||||
absl::demangle_internal
|
||||
absl::optional
|
||||
absl::stacktrace
|
||||
absl::base
|
||||
absl::demangle_rust
|
||||
absl::bad_optional_access
|
||||
absl::strings_internal
|
||||
absl::debugging_internal
|
||||
absl::int128
|
||||
absl::spinlock_wait
|
||||
absl::decode_rust_punycode
|
||||
absl::raw_logging_internal
|
||||
absl::flat_hash_set
|
||||
absl::flat_hash_map
|
||||
absl::node_hash_map
|
||||
absl::node_hash_set
|
||||
absl::optional
|
||||
absl::raw_hash_set
|
||||
absl::raw_logging_internal
|
||||
absl::str_format
|
||||
absl::str_format_internal
|
||||
absl::bits
|
||||
absl::fixed_array
|
||||
absl::numeric_representation
|
||||
absl::utility
|
||||
absl::type_traits
|
||||
absl::string_view
|
||||
absl::core_headers
|
||||
absl::compare
|
||||
absl::base_internal
|
||||
absl::nullability
|
||||
absl::span
|
||||
absl::config
|
||||
absl::synchronization
|
||||
absl::base
|
||||
absl::civil_time
|
||||
absl::debugging_internal
|
||||
absl::demangle_internal
|
||||
absl::graphcycles_internal
|
||||
absl::int128
|
||||
absl::kernel_timeout_internal
|
||||
absl::bounded_utf8_length_sequence
|
||||
absl::log_severity
|
||||
absl::malloc_internal
|
||||
absl::spinlock_wait
|
||||
absl::stacktrace
|
||||
absl::type_traits
|
||||
absl::atomic_hook
|
||||
absl::bits
|
||||
absl::flags_commandlineflag_internal
|
||||
absl::hash_container_defaults
|
||||
absl::numeric_representation
|
||||
absl::node_slot_policy
|
||||
absl::core_headers
|
||||
absl::dynamic_annotations
|
||||
absl::utf8_for_code_point
|
||||
absl::errno_saver
|
||||
absl::absl_check
|
||||
absl::hash_function_defaults
|
||||
absl::function_ref
|
||||
absl::city
|
||||
absl::low_level_hash
|
||||
absl::fixed_array
|
||||
absl::variant
|
||||
absl::meta
|
||||
absl::log_internal_voidify
|
||||
absl::log_sink
|
||||
absl::log_internal_log_sink_set
|
||||
absl::log_sink_registry
|
||||
absl::log_entry
|
||||
absl::log_globals
|
||||
absl::log_internal_nullguard
|
||||
absl::examine_stack
|
||||
absl::inlined_vector
|
||||
absl::log_internal_proto
|
||||
absl::strerror
|
||||
absl::log_internal_config
|
||||
absl::raw_hash_map
|
||||
absl::raw_hash_set
|
||||
absl::container_memory
|
||||
absl::algorithm_container
|
||||
absl::span
|
||||
absl::log_internal_nullstream
|
||||
absl::vlog_config_internal
|
||||
absl::flags_reflection
|
||||
absl::flags_internal
|
||||
absl::flags_config
|
||||
absl::fast_type_id
|
||||
absl::utility
|
||||
absl::time_zone
|
||||
absl::civil_time
|
||||
absl::string_view
|
||||
absl::strings
|
||||
absl::strings_internal
|
||||
absl::symbolize
|
||||
absl::throw_delegate
|
||||
absl::time
|
||||
absl::time_zone)
|
||||
absl::memory
|
||||
absl::charset
|
||||
absl::endian
|
||||
absl::config)
|
||||
|
|
@ -1,22 +1,22 @@
|
|||
diff --git a/include/cpuinfo.h b/include/cpuinfo.h
|
||||
index c46b65e..8b83a64 100644
|
||||
index 03f2776..eaf6497 100644
|
||||
--- a/include/cpuinfo.h
|
||||
+++ b/include/cpuinfo.h
|
||||
@@ -18,7 +18,7 @@
|
||||
#define CPUINFO_ARCH_X86 1
|
||||
#define CPUINFO_ARCH_X86 1
|
||||
#endif
|
||||
|
||||
-#if defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
|
||||
+#if defined(__x86_64__) || (defined(_M_X64) && !defined(_M_ARM64EC)) || (defined(_M_AMD64) && !defined(_M_ARM64EC))
|
||||
#define CPUINFO_ARCH_X86_64 1
|
||||
+#if defined(__x86_64__) || defined(__x86_64) || (defined(_M_X64) && !defined(_M_ARM64EC)) || (defined(_M_AMD64) && !defined(_M_ARM64EC))
|
||||
#define CPUINFO_ARCH_X86_64 1
|
||||
#endif
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#define CPUINFO_ARCH_ARM 1
|
||||
#define CPUINFO_ARCH_ARM 1
|
||||
#endif
|
||||
|
||||
-#if defined(__aarch64__) || defined(_M_ARM64)
|
||||
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
|
||||
#define CPUINFO_ARCH_ARM64 1
|
||||
#define CPUINFO_ARCH_ARM64 1
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -823,10 +823,10 @@ select from 'TF8', 'TF16', 'UINT8', 'FLOAT', 'ITENSOR'. \n)");
|
|||
std::ifstream file(performance_test_config.model_info.model_file_path.c_str(),
|
||||
std::ios::binary | std::ios::in | std::ios::ate);
|
||||
if (file.is_open()) {
|
||||
const std::streamsize fsize = file.tellg();
|
||||
const std::streampos fsize = file.tellg();
|
||||
file.seekg(0, std::ios_base::beg);
|
||||
std::vector<char> model_bytes(narrow<size_t>(fsize));
|
||||
file.read(model_bytes.data(), fsize);
|
||||
file.read(model_bytes.data(), narrow<std::streamsize>(fsize));
|
||||
session_ = Ort::Session(env, model_bytes.data(), model_bytes.size(), session_options);
|
||||
} else {
|
||||
ORT_THROW("Model file could not be opened.\n");
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
|
|||
unzip lsb-release
|
||||
|
||||
# cmake
|
||||
RUN CMAKE_VERSION=3.27.3 && \
|
||||
RUN CMAKE_VERSION=3.30.1 && \
|
||||
aria2c -q -d /tmp -o cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz \
|
||||
--checksum=sha-256=62e7819fe0867658b6ea765a711686d637dce76cdf6eb0a6b0f1b879e0344fa7 \
|
||||
--checksum=sha-256=ac31f077ef3378641fa25a3cb980d21b2f083982d3149a8f2eb9154f2b53696b \
|
||||
https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz && \
|
||||
tar -zxf /tmp/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz --strip=1 -C /usr
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ variables:
|
|||
${{ if eq(parameters.CudaVersion, '11.8') }}:
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20240531.1
|
||||
${{ if eq(parameters.CudaVersion, '12.2') }}:
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240610.1
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240719.1
|
||||
|
||||
- name: Repository
|
||||
${{ if eq(parameters.CudaVersion, '11.8') }}:
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ variables:
|
|||
${{ if eq(parameters.CudaVersion, '11.8') }}:
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20240531.1
|
||||
${{ if eq(parameters.CudaVersion, '12.2') }}:
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240610.1
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240719.1
|
||||
- name: linux_trt_version
|
||||
${{ if eq(parameters.CudaVersion, '11.8') }}:
|
||||
value: 10.2.0.19-1.cuda11.8
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ stages:
|
|||
${{ if eq(parameters.CudaVersion, '11.8') }}:
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20240531.1
|
||||
${{ if eq(parameters.CudaVersion, '12.2') }}:
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240610.1
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240719.1
|
||||
timeoutInMinutes: 60
|
||||
|
||||
steps:
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ jobs:
|
|||
${{ if eq(parameters.CudaVersion, '11.8') }}:
|
||||
value: nvidia/cuda:11.8.0-cudnn8-devel-ubi8
|
||||
${{ if eq(parameters.CudaVersion, '12.2') }}:
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240610.1
|
||||
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240719.1
|
||||
- name: linux_trt_version
|
||||
${{ if eq(parameters.CudaVersion, '11.8') }}:
|
||||
value: 10.2.0.19-1.cuda11.8
|
||||
|
|
|
|||
|
|
@ -81,5 +81,5 @@ stages:
|
|||
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20240531.1
|
||||
trt_version: 10.2.0.19-1.cuda11.8
|
||||
${{ if eq(parameters.cuda_version, '12.2') }}:
|
||||
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240610.1
|
||||
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240719.1
|
||||
trt_version: 10.2.0.19-1.cuda12.5
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ steps:
|
|||
packageType: upack
|
||||
feed: '/7424c8e4-5c62-490e-95c4-79446f31017c'
|
||||
definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0'
|
||||
version: 1.0.165
|
||||
version: 1.0.167
|
||||
downloadPath: $(Build.BinariesDirectory)/deps
|
||||
|
||||
# The private ADO project
|
||||
|
|
@ -22,7 +22,7 @@ steps:
|
|||
packageType: upack
|
||||
feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325'
|
||||
definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a'
|
||||
version: 1.0.165
|
||||
version: 1.0.167
|
||||
downloadPath: $(Build.BinariesDirectory)/deps
|
||||
|
||||
# You can add more ADO accounts at here.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240610.1
|
||||
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20240719.1
|
||||
|
||||
ARG PYTHON_VERSION=3.9
|
||||
ARG TORCH_VERSION=2.1.0
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 AS base
|
|||
# The local directory into which to build and install CMAKE
|
||||
ARG ONNXRUNTIME_LOCAL_CODE_DIR=/code
|
||||
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.27.3-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.30.1-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update &&\
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 AS base
|
|||
# The local directory into which to build and install CMAKE
|
||||
ARG ONNXRUNTIME_LOCAL_CODE_DIR=/code
|
||||
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.27.3-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.30.1-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update &&\
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ FROM nvidia/cuda:12.3.1-devel-ubuntu20.04 AS base
|
|||
# The local directory into which to build and install CMAKE
|
||||
ARG ONNXRUNTIME_LOCAL_CODE_DIR=/code
|
||||
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.27.3-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.30.1-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update &&\
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ FROM nvidia/cuda:12.5.1-cudnn-devel-ubuntu20.04 AS base
|
|||
# The local directory into which to build and install CMAKE
|
||||
ARG ONNXRUNTIME_LOCAL_CODE_DIR=/code
|
||||
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.27.3-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.30.1-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update &&\
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ RUN wget "https://github.com/intel/compute-runtime/releases/download/21.48.21782
|
|||
sudo dpkg -i *.deb && rm -rf *.deb
|
||||
|
||||
RUN mkdir -p /opt/cmake/bin && \
|
||||
wget https://github.com/Kitware/CMake/releases/download/v3.27.3/cmake-3.27.3-linux-x86_64.tar.gz && \
|
||||
tar -xf cmake-3.27.3-linux-x86_64.tar.gz --strip 1 -C /opt/cmake && rm -rf /cmake-3.27.3-linux-x86_64.tar.gz && \
|
||||
wget https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-x86_64.tar.gz && \
|
||||
tar -xf cmake-3.30.1-linux-x86_64.tar.gz --strip 1 -C /opt/cmake && rm -rf /cmake-3.30.1-linux-x86_64.tar.gz && \
|
||||
ln -sf /opt/cmake/bin/* /usr/bin
|
||||
|
||||
ARG BUILD_UID=1000
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ FROM nvidia/cuda:12.5.1-cudnn-devel-ubuntu20.04 AS base
|
|||
# The local directory into which to build and install CMAKE
|
||||
ARG ONNXRUNTIME_LOCAL_CODE_DIR=/code
|
||||
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.27.3-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${ONNXRUNTIME_LOCAL_CODE_DIR}/cmake-3.30.1-linux-x86_64/bin:/opt/miniconda/bin:${PATH}
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update &&\
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ cd /tmp/src
|
|||
|
||||
CPU_ARCH=$(uname -m)
|
||||
echo "Installing cmake"
|
||||
GetFile "https://github.com/Kitware/CMake/releases/download/v3.27.3/cmake-3.27.3-linux-$CPU_ARCH.tar.gz" "/tmp/src/cmake.tar.gz"
|
||||
GetFile "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-$CPU_ARCH.tar.gz" "/tmp/src/cmake.tar.gz"
|
||||
tar -zxf /tmp/src/cmake.tar.gz --strip=1 -C /usr
|
||||
|
||||
echo "Installing Ninja"
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ mkdir -p /tmp/src
|
|||
cd /tmp/src
|
||||
|
||||
echo "Installing cmake"
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.27.3/cmake-3.27.3-linux-`uname -m`.tar.gz /tmp/src/cmake-3.27.3-linux-`uname -m`.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.27.3-linux-`uname -m`.tar.gz --strip=1 -C /usr
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-`uname -m`.tar.gz /tmp/src/cmake-3.30.1-linux-`uname -m`.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.30.1-linux-`uname -m`.tar.gz --strip=1 -C /usr
|
||||
|
||||
echo "Installing Ninja"
|
||||
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ mkdir -p /tmp/src
|
|||
cd /tmp/src
|
||||
|
||||
echo "Installing cmake"
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3-linux-`uname -m`.tar.gz /tmp/src/cmake-3.29.3-linux-`uname -m`.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.29.3-linux-`uname -m`.tar.gz --strip=1 -C /usr
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-`uname -m`.tar.gz /tmp/src/cmake-3.30.1-linux-`uname -m`.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.30.1-linux-`uname -m`.tar.gz --strip=1 -C /usr
|
||||
|
||||
echo "Installing Ninja"
|
||||
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Licensed under the MIT License.
|
||||
|
||||
# This file is used by Zip-Nuget Packaging NoContribOps Pipeline,Zip-Nuget-Java Packaging Pipeline
|
||||
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12_dotnet:20240610.1
|
||||
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12_dotnet:20240719.1
|
||||
ARG TRT_VERSION
|
||||
|
||||
#Install TensorRT only if TRT_VERSION is not empty
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ mkdir -p /tmp/src
|
|||
cd /tmp/src
|
||||
|
||||
echo "Installing cmake"
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3-linux-`uname -m`.tar.gz /tmp/src/cmake-3.29.3-linux-`uname -m`.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.29.3-linux-`uname -m`.tar.gz --strip=1 -C /usr
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-`uname -m`.tar.gz /tmp/src/cmake-3.30.1-linux-`uname -m`.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.30.1-linux-`uname -m`.tar.gz --strip=1 -C /usr
|
||||
|
||||
echo "Installing Ninja"
|
||||
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@ ENV LANG C.UTF-8
|
|||
WORKDIR /stage
|
||||
|
||||
# Cmake
|
||||
ENV CMAKE_VERSION=3.27.3
|
||||
ENV CMAKE_VERSION=3.30.1
|
||||
RUN cd /usr/local && \
|
||||
wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz && \
|
||||
tar -zxf /usr/local/cmake-3.27.3-Linux-x86_64.tar.gz --strip=1 -C /usr
|
||||
tar -zxf /usr/local/cmake-3.30.1-Linux-x86_64.tar.gz --strip=1 -C /usr
|
||||
|
||||
# ccache
|
||||
RUN mkdir -p /tmp/ccache && \
|
||||
|
|
|
|||
|
|
@ -71,18 +71,18 @@ if [[ $SYS_LONG_BIT = "64" && "$GLIBC_VERSION" -gt "9" ]]; then
|
|||
tar --strip 1 -xf /tmp/azcopy/azcopy.tar.gz -C /tmp/azcopy
|
||||
cp /tmp/azcopy/azcopy /usr/bin
|
||||
echo "Installing cmake"
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.27.3/cmake-3.27.3-Linux-x86_64.tar.gz /tmp/src/cmake-3.27.3-Linux-x86_64.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.27.3-Linux-x86_64.tar.gz --strip=1 -C /usr
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-Linux-x86_64.tar.gz /tmp/src/cmake-3.30.1-Linux-x86_64.tar.gz
|
||||
tar -zxf /tmp/src/cmake-3.30.1-Linux-x86_64.tar.gz --strip=1 -C /usr
|
||||
echo "Installing Node.js"
|
||||
# The EOL for nodejs v18.17.1 LTS is April 2025
|
||||
GetFile https://nodejs.org/dist/v18.17.1/node-v18.17.1-linux-x64.tar.xz /tmp/src/node-v18.17.1-linux-x64.tar.xz
|
||||
tar -xf /tmp/src/node-v18.17.1-linux-x64.tar.xz --strip=1 -C /usr
|
||||
else
|
||||
echo "Installing cmake"
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.27.3/cmake-3.27.3.tar.gz /tmp/src/cmake-3.27.3.tar.gz
|
||||
tar -xf /tmp/src/cmake-3.27.3.tar.gz -C /tmp/src
|
||||
GetFile https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1.tar.gz /tmp/src/cmake-3.30.1.tar.gz
|
||||
tar -xf /tmp/src/cmake-3.30.1.tar.gz -C /tmp/src
|
||||
pushd .
|
||||
cd /tmp/src/cmake-3.27.3
|
||||
cd /tmp/src/cmake-3.30.1
|
||||
./bootstrap --prefix=/usr --parallel=$(getconf _NPROCESSORS_ONLN) --system-bzip2 --system-curl --system-zlib --system-expat
|
||||
make -j$(getconf _NPROCESSORS_ONLN)
|
||||
make install
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ ENV LANG C.UTF-8
|
|||
WORKDIR /stage
|
||||
|
||||
# CMake
|
||||
ENV CMAKE_VERSION=3.27.3
|
||||
ENV CMAKE_VERSION=3.30.1
|
||||
RUN cd /usr/local && \
|
||||
wget -q -O - https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz | tar zxf -
|
||||
ENV PATH=/usr/local/cmake-${CMAKE_VERSION}-linux-x86_64/bin:${PATH}
|
||||
|
|
|
|||
Loading…
Reference in a new issue