Update cmake to 3.27 and upgrade Linux CUDA docker files from CentOS7 to UBI8

dockerfiles/Dockerfile.source

@@ -4,17 +4,17 @@
 # --------------------------------------------------------------
 # Dockerfile to run ONNXRuntime with source build for CPU
 
-FROM ubuntu:22.04
+FROM mcr.microsoft.com/cbl-mariner/base/python:3
 MAINTAINER Changming Sun "chasun@microsoft.com"
 ADD . /code
 
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends python3-dev ca-certificates g++ python3-numpy gcc make git python3-setuptools python3-wheel python3-pip aria2 && aria2c -q -d /tmp -o cmake-3.26.3-linux-x86_64.tar.gz https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz && tar -zxf /tmp/cmake-3.26.3-linux-x86_64.tar.gz --strip=1 -C /usr
+RUN tdnf install -y tar ca-certificates build-essential python3-numpy cmake python3-setuptools python3-wheel python3-pip curl python3-devel
+RUN /code/dockerfiles/scripts/install_cmake.sh
 
 # Prepare onnxruntime repository & build onnxruntime
 RUN cd /code && python3 -m pip install -r tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/requirements.txt && /bin/bash ./build.sh --allow_running_as_root --skip_submodule_sync --config Release --build_wheel --update --build --parallel --cmake_extra_defines ONNXRUNTIME_VERSION=$(cat ./VERSION_NUMBER)
 
-FROM ubuntu:22.04
+FROM mcr.microsoft.com/cbl-mariner/base/python:3
 COPY --from=0 /code/build/Linux/Release/dist /root
 COPY --from=0 /code/dockerfiles/LICENSE-IMAGE.txt /code/LICENSE-IMAGE.txt
-RUN apt-get update && apt-get install -y --no-install-recommends libstdc++6 ca-certificates python3-setuptools python3-wheel python3-pip unattended-upgrades && unattended-upgrade && python3 -m pip install /root/*.whl && rm -rf /root/*.whl
+RUN tdnf install -y  ca-certificates python3-setuptools python3-wheel python3-pip && python3 -m pip install /root/*.whl && rm -rf /root/*.whl

dockerfiles/README.md

@@ -7,10 +7,6 @@
 - OpenVINO: [Dockerfile](Dockerfile.openvino), [Instructions](#openvino)
 - TensorRT: [Dockerfile](Dockerfile.tensorrt), [Instructions](#tensorrt)
 - VitisAI: [Dockerfile](Dockerfile.vitisai)
-
-**Platforms**
-- ARM 32v7: [Dockerfile](Dockerfile.arm32v7), [Instructions](#arm-3264)
-- ARM 64: [Dockerfile](Dockerfile.arm64), [Instructions](#arm-3264)
 - NVIDIA Jetson TX1/TX2/Nano/Xavier: [Dockerfile](Dockerfile.jetson), [Instructions](#nvidia-jetson-tx1tx2nanoxavier)
 
 **Other**
@@ -22,38 +18,36 @@
 # Instructions
 
 ## CPU
-**Ubuntu 22.04, CPU, Python Bindings**
+**Mariner 2.0, CPU, Python Bindings**
 
-1. Update submodules
-```
-git submodule update --init
-```
 
-2. Build the docker image from the Dockerfile in this repository.
-  ```
+1. Build the docker image from the Dockerfile in this repository.
+  ```bash
   docker build -t onnxruntime-source -f Dockerfile.source ..
   ```
 
-3. Run the Docker image
+2. Run the Docker image
 
-  ```
+  ```bash
   docker run -it onnxruntime-source
   ```
 
-## CUDA
-**Ubuntu 20.04, CUDA 11.4, CuDNN 8**
+The docker file supports both x86_64 and ARM64(aarch64). You may use docker's "--platform" parameter to explictly specify which CPU architecture you want to build. For example:
 
-1. Update submodules
-```
-git submodule update --init
+```bash
+  docker build --platform linux/arm64/v8 -f Dockerfile.source
 ```
+However, we cannot build the code for 32-bit ARM in such a way since a 32-bit compiler/linker might not have enough memory to generate the binaries.
 
-2. Build the docker image from the Dockerfile in this repository.
+## CUDA
+**Ubuntu 22.04, CUDA 12.1, CuDNN 8**
+
+1. Build the docker image from the Dockerfile in this repository.
   ```
   docker build -t onnxruntime-cuda -f Dockerfile.cuda ..
   ```
 
-3. Run the Docker image
+2. Run the Docker image
 
   ```
   docker run --gpus all -it onnxruntime-cuda

dockerfiles/scripts/install_cmake.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+mkdir -p /tmp/src
+cd /tmp/src
+
+echo "Installing cmake"
+curl https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-`uname -m`.tar.gz -sSL --retry 5  -o /tmp/src/cmake-3.27.1-linux-`uname -m`.tar.gz
+tar -zxf /tmp/src/cmake-3.27.1-linux-`uname -m`.tar.gz --strip=1 -C /usr

dockerfiles/scripts/install_common_deps.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 DEBIAN_FRONTEND=noninteractive
 apt-get update && apt-get install -y --no-install-recommends \
         wget \
         zip \
@@ -21,6 +21,6 @@
 rm -rf /opt/miniconda/pkgs
 
 # Dependencies: cmake
-wget --quiet https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz
-tar zxf cmake-3.26.3-linux-x86_64.tar.gz
-rm -rf cmake-3.26.3-linux-x86_64.tar.gz
+wget --quiet https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz
+tar zxf cmake-3.27.1-linux-x86_64.tar.gz
+rm -rf cmake-3.27.1-linux-x86_64.tar.gz

tools/ci_build/github/linux/docker/inference/aarch64/default/cpu/scripts/install_deps.sh

@@ -14,22 +14,22 @@
       echo "File '$path' already exists. Skipping download"
       return 0
     else
       rm -rf $path
     fi
   fi
 
   if [[ -f $uri ]]; then
     echo "'$uri' is a file path, copying file to '$path'"
     cp $uri $path
     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"
   else
     curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail
   fi
 
   return $?
@@ -39,8 +39,8 @@
 cd /tmp/src
 
 echo "Installing cmake"
-GetFile https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-`uname -m`.tar.gz /tmp/src/cmake-3.26.3-linux-`uname -m`.tar.gz
-tar -zxf /tmp/src/cmake-3.26.3-linux-`uname -m`.tar.gz --strip=1 -C /usr
+GetFile https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-`uname -m`.tar.gz /tmp/src/cmake-3.27.1-linux-`uname -m`.tar.gz
+tar -zxf /tmp/src/cmake-3.27.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
@@ -52,7 +52,7 @@
 popd
 
 echo "Installing Node.js"
 CPU_ARCH=`uname -m`
 if [[ "$CPU_ARCH" = "x86_64" ]]; then
   NODEJS_ARCH=x64
 elif [[ "$CPU_ARCH" = "aarch64" ]]; then
@@ -60,8 +60,8 @@
 else
   NODEJS_ARCH=$CPU_ARCH
 fi
 GetFile https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-${NODEJS_ARCH}.tar.gz /tmp/src/node-v16.14.2-linux-${NODEJS_ARCH}.tar.gz
 tar --strip 1 -xf /tmp/src/node-v16.14.2-linux-${NODEJS_ARCH}.tar.gz -C /usr
 
 # The Python version in CentOS 7's python3 package is no longer supported (3.6) so we will build Python from source.
 echo "Installing Python"

tools/ci_build/github/linux/docker/inference/x64/default/cpu/scripts/install_deps.sh

@@ -14,22 +14,22 @@
       echo "File '$path' already exists. Skipping download"
       return 0
     else
       rm -rf $path
     fi
   fi
 
   if [[ -f $uri ]]; then
     echo "'$uri' is a file path, copying file to '$path'"
     cp $uri $path
     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"
   else
     curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail
   fi
 
   return $?
@@ -39,8 +39,8 @@
 cd /tmp/src
 
 echo "Installing cmake"
-GetFile https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-`uname -m`.tar.gz /tmp/src/cmake-3.26.3-linux-`uname -m`.tar.gz
-tar -zxf /tmp/src/cmake-3.26.3-linux-`uname -m`.tar.gz --strip=1 -C /usr
+GetFile https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-`uname -m`.tar.gz /tmp/src/cmake-3.27.1-linux-`uname -m`.tar.gz
+tar -zxf /tmp/src/cmake-3.27.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
@@ -52,7 +52,7 @@
 popd
 
 echo "Installing Node.js"
 CPU_ARCH=`uname -m`
 if [[ "$CPU_ARCH" = "x86_64" ]]; then
   NODEJS_ARCH=x64
 elif [[ "$CPU_ARCH" = "aarch64" ]]; then
@@ -60,8 +60,8 @@
 else
   NODEJS_ARCH=$CPU_ARCH
 fi
 GetFile https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-${NODEJS_ARCH}.tar.gz /tmp/src/node-v16.14.2-linux-${NODEJS_ARCH}.tar.gz
 tar --strip 1 -xf /tmp/src/node-v16.14.2-linux-${NODEJS_ARCH}.tar.gz -C /usr
 
 # The Python version in CentOS 7's python3 package is no longer supported (3.6) so we will build Python from source.
 echo "Installing Python"

tools/ci_build/github/linux/docker/scripts/install_os_deps.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 set -e -x
 
 SCRIPT_DIR="$( dirname "${BASH_SOURCE[0]}" )"
 INSTALL_DEPS_DISTRIBUTED_SETUP=false
 
 while getopts p:d:v:tmur parameter_Option
 do case "${parameter_Option}"
 in
 p) echo "Python version is no longer accepted as an input to this script. Ignoring the input argument -p.";;
 d) DEVICE_TYPE=${OPTARG};;
@@ -32,22 +32,22 @@
       echo "File '$path' already exists. Skipping download"
       return 0
     else
       rm -rf $path
     fi
   fi
 
   if [[ -f $uri ]]; then
     echo "'$uri' is a file path, copying file to '$path'"
     cp $uri $path
     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"
   else
     curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail
   fi
 
   return $?
@@ -62,7 +62,7 @@
 if [[ "$DISTRIBUTOR" = "CentOS" && $SYS_LONG_BIT = "64" ]]; then
   LIBDIR="lib64"
 else
   LIBDIR="lib"
 fi
 if [[ $SYS_LONG_BIT = "64" && "$GLIBC_VERSION" -gt "9" ]]; then
   echo "Installing azcopy"
@@ -71,19 +71,19 @@
   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.26.3/cmake-3.26.3-Linux-x86_64.tar.gz /tmp/src/cmake-3.26.3-Linux-x86_64.tar.gz
-  tar -zxf /tmp/src/cmake-3.26.3-Linux-x86_64.tar.gz --strip=1 -C /usr
+  GetFile https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-Linux-x86_64.tar.gz /tmp/src/cmake-3.27.1-Linux-x86_64.tar.gz
+  tar -zxf /tmp/src/cmake-3.27.1-Linux-x86_64.tar.gz --strip=1 -C /usr
   echo "Installing Node.js"
   GetFile https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz /tmp/src/node-v16.14.2-linux-x64.tar.xz
   tar -xf /tmp/src/node-v16.14.2-linux-x64.tar.xz --strip=1 -C /usr
 else
   echo "Installing cmake"
-  GetFile https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3.tar.gz /tmp/src/cmake-3.26.3.tar.gz
-  tar -xf /tmp/src/cmake-3.26.3.tar.gz -C /tmp/src
+  GetFile https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1.tar.gz /tmp/src/cmake-3.27.1.tar.gz
+  tar -xf /tmp/src/cmake-3.27.1.tar.gz -C /tmp/src
   pushd .
-  cd /tmp/src/cmake-3.26.3
+  cd /tmp/src/cmake-3.27.1
   ./bootstrap --prefix=/usr --parallel=$(getconf _NPROCESSORS_ONLN) --system-bzip2 --system-curl --system-zlib --system-expat
   make -j$(getconf _NPROCESSORS_ONLN)
   make install
   popd
 fi
@@ -91,12 +91,12 @@
 cd /tmp/src
 
 if ! [ -x "$(command -v protoc)" ]; then
   source ${0/%install_os_deps\.sh/install_protobuf\.sh}
 fi
 
 if [ $DEVICE_TYPE = "gpu" ]; then
   if [[ $INSTALL_DEPS_DISTRIBUTED_SETUP = true ]]; then
     source ${0/%install_os_deps.sh/install_openmpi.sh}
   fi
 fi