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

Update Linux docker images #23244

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Update Linux docker images #23244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
494982c
update
snnn Jan 9, 2025
905f404
Merge remote-tracking branch 'upstream/main' into snnn/update_docker_…
snnn Jan 9, 2025
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
4 changes: 4 additions & 0 deletions cmake/adjust_global_compile_flags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,10 @@ else()
# suppress warnings from flatbuffers
string(APPEND CMAKE_CXX_FLAGS " -Wno-restrict ")
string(APPEND CMAKE_C_FLAGS " -Wno-restrict ")
if(onnxruntime_USE_XNNPACK)
# https://github.com/google/XNNPACK/issues/7650
string(APPEND CMAKE_C_FLAGS " -Wno-incompatible-pointer-types ")
endif()
endif()
# Check support for AVX and f16c.
include(CheckCXXCompilerFlag)
Expand Down
3 changes: 3 additions & 0 deletions cmake/onnxruntime_optimizer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ if (onnxruntime_EXTERNAL_TRANSFORMER_SRC_PATH)
file(GLOB onnxruntime_external_transformer_src ${onnxruntime_external_transformer_src_patterns})
list(APPEND onnxruntime_optimizer_srcs ${onnxruntime_external_transformer_src})
endif()
if(HAS_MAYBE_UNINITIALIZED)
set_source_files_properties("${ONNXRUNTIME_ROOT}/core/optimizer/selectors_actions/selector_action_transformer.cc" PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized")
endif()

onnxruntime_add_static_library(onnxruntime_optimizer ${onnxruntime_optimizer_srcs})

Expand Down
4 changes: 3 additions & 1 deletion onnxruntime/core/framework/node_unit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,9 @@ std::vector<const Node*> NodeUnit::GetAllNodesInGroup() const noexcept {
if (redundant_clip_node_) {
all_nodes.push_back(redundant_clip_node_);
}
all_nodes.insert(all_nodes.end(), q_nodes_.begin(), q_nodes_.end());
all_nodes.reserve(all_nodes.size() + q_nodes_.size());
for (auto& n : q_nodes_)
all_nodes.push_back(n);
return all_nodes;
}

Expand Down
4 changes: 2 additions & 2 deletions onnxruntime/test/providers/cpu/ml/write_scores_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ TEST_F(WriteScores, single_score_transform_none) {
write_scores<float>(v1, POST_EVAL_TRANSFORM::NONE, 0, &t, -1);
const float* output_data = t.Data<float>();
for (size_t i = 0; i != v2.size(); ++i) {
EXPECT_FLOAT_EQ(v1[i], output_data[i]);
EXPECT_FLOAT_EQ(v2[i], output_data[i]);
}
}

Expand All @@ -84,4 +84,4 @@ TEST_F(WriteScores, single_score_transform_none_add_second_class) {
EXPECT_FLOAT_EQ(1 - v2[0], output_data[0]);
}
}
}
}
7 changes: 3 additions & 4 deletions onnxruntime/test/providers/cpu/reduction/reduction_ops_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4500,15 +4500,14 @@ TEST(ReductionOpTest, OptimizeShapeForFastReduce_KR) {
TEST(ReductionOpTest, OptimizeShapeForFastReduce_KR_neg) {
FastReduceKind fast_kind;
TensorShapeVector fast_shape, fast_output_shape, fast_axes;
TensorShapeVector expected_fast_shape, expected_fast_output_shape, expected_fast_axes;

// KR - keep_dims=1
fast_kind = OptimizeShapeForFastReduce(
TensorShapeVector{10, 11}, TensorShapeVector{-1},
fast_shape, fast_output_shape, fast_axes, true);
expected_fast_shape = TensorShapeVector{10, 11};
expected_fast_output_shape = TensorShapeVector{10, 1};
expected_fast_axes = TensorShapeVector{1};
TensorShapeVector expected_fast_shape{10, 11};
TensorShapeVector expected_fast_output_shape{10, 1};
TensorShapeVector expected_fast_axes{1};
ASSERT_EQ(fast_kind, FastReduceKind::kKR);
ASSERT_EQ(fast_shape, expected_fast_shape);
ASSERT_EQ(fast_output_shape, expected_fast_output_shape);
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/bigmodels-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ parameters:

variables:
- name: docker_base_image
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
- name: linux_trt_version
value: 10.3.0.26-1.cuda11.8
- name: Repository
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ parameters:
variables:
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250108.1

- name: Repository
${{ if eq(parameters.CudaVersion, '11.8') }}:
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ variables:
- template: templates/common-variables.yml
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250108.1
- name: linux_trt_version
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: ${{ variables.linux_trt_version_cuda11 }}
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-cuda-minimal-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ variables:
- template: templates/common-variables.yml
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250108.1
- name: linux_trt_version
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: ${{ variables.linux_trt_version_cuda11 }}
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/py-cuda-alt-package-test-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stages:
machine_pool: 'Onnxruntime-Linux-GPU'
python_wheel_suffix: '_gpu'
timeout: 480
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
cuda_version: '11.8'

- stage: Republish_Wheels
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/py-cuda-package-test-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stages:
machine_pool: 'Onnxruntime-Linux-GPU'
python_wheel_suffix: '_gpu'
timeout: 480
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241120.3
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250108.1
cuda_version: '12.2'

- stage: Republish_Wheels
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/stages/java-cuda-packaging-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ stages:
value: false
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250108.1
timeoutInMinutes: 60

steps:
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/stages/jobs/py-linux-cuda-package-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
- template: ../../templates/common-variables.yml
- name: docker_base_image
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
${{ if eq(parameters.CudaVersion, '12.2') }}:
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241120.3
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250108.1
- name: linux_trt_version
${{ if eq(parameters.CudaVersion, '11.8') }}:
value: ${{ variables.linux_trt_version_cuda11 }}
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/stages/py-gpu-packaging-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ stages:
cmake_build_type: ${{ parameters.cmake_build_type }}
cuda_version: ${{ parameters.cuda_version }}
${{ if eq(parameters.cuda_version, '11.8') }}:
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241120.3
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20250108.1
${{ if eq(parameters.cuda_version, '12.2') }}:
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241120.3
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20250108.1

- ${{ if eq(parameters.enable_windows_dml, true) }}:
- ${{ each python_version in parameters.PythonVersions }}:
Expand Down
19 changes: 0 additions & 19 deletions tools/ci_build/github/linux/build_linux_python_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,6 @@ if [ "$BUILD_CONFIG" != "Debug" ]; then
fi
if [ "$ENABLE_CACHE" = true ] ; then
BUILD_ARGS+=("--use_cache")
# No release binary for ccache aarch64, so we need to build it from source.
if ! [ -x "$(command -v ccache)" ]; then
ccache_url="https://github.com/ccache/ccache/archive/refs/tags/v4.8.tar.gz"
cd /build
curl -sSL --retry 5 --retry-delay 10 --create-dirs --fail -L -o ccache_src.tar.gz $ccache_url
mkdir ccache_main
cd ccache_main
tar -zxf ../ccache_src.tar.gz --strip=1

mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=/build -DCMAKE_BUILD_TYPE=Release ..
make -j$(nproc)
make install
export PATH=/build/bin:$PATH
which ccache
rm -f ccache_src.tar.gz
rm -rf ccache_src
fi
ccache -s;
fi

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241120.3
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc14:20250108.1

ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17

Expand Down
3 changes: 1 addition & 2 deletions tools/ci_build/github/linux/docker/inference/aarch64/default/cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# 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/cpu_aarch64_ubi8_gcc12_dotnet:20241120.3
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_aarch64_ubi8_gcc14_dotnet:20250108.1

ENV PATH=/opt/rh/gcc-toolset-12/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV LANG=en_US.UTF-8
ENV LC_ALL=en_US.UTF-8

Expand Down
9 changes: 0 additions & 9 deletions tools/ci_build/github/linux/docker/inference/aarch64/default/cpu/scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,6 @@ cd /tmp/src

CPU_ARCH=$(uname -m)

echo "Installing Ninja"
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
tar -zxf ninja-linux.tar.gz
pushd ninja-1.10.0
cmake -Bbuild-cmake -H.
cmake --build build-cmake
mv ./build-cmake/ninja /usr/bin
popd

echo "Installing Node.js"

if [[ "$CPU_ARCH" = "x86_64" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_aarch64_ubi8_gcc12:20241120.3
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_aarch64_ubi8_gcc14:20250108.1

ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/install_centos.sh && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts
Expand Down
3 changes: 1 addition & 2 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# 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/cpu_x64_ubi8_gcc12_dotnet:20241120.3
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc14_dotnet:20250108.1

ENV PATH=/usr/lib/jvm/msopenjdk-17/bin:/opt/rh/gcc-toolset-12/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV LANG=en_US.UTF-8
ENV LC_ALL=en_US.UTF-8

Expand Down
8 changes: 0 additions & 8 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ mkdir -p /tmp/src
cd /tmp/src
CPU_ARCH=$(uname -m)

echo "Installing Ninja"
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
tar -zxf ninja-linux.tar.gz
pushd ninja-1.10.0
cmake -Bbuild-cmake -H.
cmake --build build-cmake
mv ./build-cmake/ninja /usr/bin
popd

echo "Installing Node.js"
CPU_ARCH=`uname -m`
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/inference/x86_64/default/cuda11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/cuda11_x64_almalinux8_gcc11_dotnet:20241120.3
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11_dotnet:20250108.1

ARG TRT_VERSION
#Install TensorRT only if TRT_VERSION is not empty
Expand Down
9 changes: 0 additions & 9 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cuda11/scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,6 @@ mkdir -p /tmp/src
cd /tmp/src


echo "Installing Ninja"
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
tar -zxf ninja-linux.tar.gz
pushd ninja-1.10.0
cmake -Bbuild-cmake -H.
cmake --build build-cmake
mv ./build-cmake/ninja /usr/bin
popd

echo "Installing Node.js"
CPU_ARCH=`uname -m`
if [[ "$CPU_ARCH" = "x86_64" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cuda12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:20241120.3
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12_dotnet:20250108.1
ARG TRT_VERSION

#Install TensorRT only if TRT_VERSION is not empty
Expand Down Expand Up @@ -37,7 +37,7 @@ ENV LC_ALL=en_US.UTF-8

ENV CUDAHOSTCXX=/opt/rh/gcc-toolset-12/root/usr/bin/g++
ADD scripts /tmp/scripts
RUN sed -i 's/enabled\s*=\s*1/enabled = 1\nexclude=dotnet* aspnet* netstandard*/g' /etc/yum.repos.d/ubi.repo && \
RUN sed -i 's/enabled\s*=\s*1/enabled = 1\nexclude=dotnet* aspnet* netstandard*/g' /etc/yum.repos.d/almalinux.repo && \
cd /tmp/scripts && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts
ENV PATH=/usr/lib/jvm/msopenjdk-17/bin:$PATH
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17
Expand Down
8 changes: 0 additions & 8 deletions tools/ci_build/github/linux/docker/inference/x86_64/default/cuda12/scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ mkdir -p /tmp/src

cd /tmp/src

echo "Installing Ninja"
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
tar -zxf ninja-linux.tar.gz
pushd ninja-1.10.0
cmake -Bbuild-cmake -H.
cmake --build build-cmake
mv ./build-cmake/ninja /usr/bin
popd

echo "Installing Node.js"
CPU_ARCH=`uname -m`
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/inference/x86_64/python/cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241120.3
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc14:20250108.1

ADD scripts /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/install_centos.sh && rm -rf /tmp/scripts
Expand Down
13 changes: 0 additions & 13 deletions tools/ci_build/github/linux/docker/scripts/install_ninja.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
echo "File '$path' already exists. Skipping download"
return 0
else
rm -rf $path

Check warning on line 16 in tools/ci_build/github/linux/docker/scripts/install_ninja.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/install_ninja.sh:16:14: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
fi
fi

Expand All @@ -34,16 +34,3 @@
return $?
}

mkdir -p /tmp/src
cd /tmp/src

echo "Installing Ninja"
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
tar -zxf ninja-linux.tar.gz
cd ninja-1.10.0
cmake -Bbuild-cmake -H.
cmake --build build-cmake
mv ./build-cmake/ninja /usr/bin

cd /
rm -rf /tmp/src
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PARENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." &> /dev/null && pwd)"
source "$PARENT_DIR/install_dotnet.sh"

if [ ! -d "/opt/conda/bin" ]; then
PYTHON_EXES=("/opt/python/cp38-cp38/bin/python3.8" "/opt/python/cp39-cp39/bin/python3.9" "/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp312-cp312/bin/python3.12")
PYTHON_EXES=("/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp312-cp312/bin/python3.12")
snnn marked this conversation as resolved.
Show resolved Hide resolved
else
PYTHON_EXES=("/opt/conda/bin/python")
fi
Expand Down
16 changes: 1 addition & 15 deletions tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Install azcopy, Ninja, Node.js CCache
# Install azcopy, Node.js
set -e -x

# Download a file from internet
Expand All @@ -15,22 +15,22 @@
echo "File '$path' already exists. Skipping download"
return 0
else
rm -rf $path

Check warning on line 18 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:18:14: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
fi
fi

if [[ -f $uri ]]; then
echo "'$uri' is a file path, copying file to '$path'"
cp $uri $path

Check warning on line 24 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:24:8: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)

Check warning on line 24 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:24:13: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
return $?
fi

echo "Downloading $uri"
# Use aria2c if available, otherwise use curl
if command -v aria2c > /dev/null; then
aria2c -q -d $(dirname $path) -o $(basename $path) "$uri"

Check warning on line 31 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Quote this to prevent word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:31:18: warning: Quote this to prevent word splitting. (ShellCheck.SC2046)

Check warning on line 31 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:31:28: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)

Check warning on line 31 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Quote this to prevent word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:31:38: warning: Quote this to prevent word splitting. (ShellCheck.SC2046)

Check warning on line 31 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:31:49: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
else
curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail

Check warning on line 33 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:33:30: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)

Check warning on line 33 in tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh

View workflow job for this annotation

GitHub Actions / Optional Lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting.

Raw Output:
./tools/ci_build/github/linux/docker/scripts/manylinux/install_shared_deps.sh:33:62: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
fi

return $?
Expand All @@ -44,21 +44,7 @@
tar --strip 1 -xf /tmp/azcopy/azcopy.tar.gz -C /tmp/azcopy
cp /tmp/azcopy/azcopy /usr/bin

echo "Installing Ninja"
GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz
tar -zxf ninja-linux.tar.gz
cd ninja-1.10.0
cmake -Bbuild-cmake -H.
cmake --build build-cmake
mv ./build-cmake/ninja /usr/bin

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.gz /tmp/src/node-v18.17.1-linux-x64.tar.gz
tar --strip 1 -xf /tmp/src/node-v18.17.1-linux-x64.tar.gz -C /usr

echo "Installing CCache"
mkdir -p /tmp/ccache
GetFile https://github.com/ccache/ccache/releases/download/v4.7.4/ccache-4.7.4-linux-x86_64.tar.xz /tmp/src/ccache-4.7.4-linux-x86_64.tar.xz
tar --strip 1 -xf /tmp/src/ccache-4.7.4-linux-x86_64.tar.xz -C /tmp/ccache
cp /tmp/ccache/ccache /usr/bin
Loading