From 985d297426a9c614e65d06faa2d88666897f8879 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 20 Oct 2023 14:16:47 -0700 Subject: [PATCH 01/15] Remove manylinux2014 from aten and lort cpu --- .../azure-pipelines/linux-cpu-aten-pipeline.yml | 7 +++++-- .../azure-pipelines/linux-cpu-eager-pipeline.yml | 7 +++++-- .../linux/docker/Dockerfile.manylinux2014_aten_cpu | 10 ---------- .../linux/docker/Dockerfile.manylinux2014_lort_cpu | 10 ---------- .../github/linux/docker/Dockerfile.manylinux2_28_cpu | 11 ++++++++++- 5 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_aten_cpu delete mode 100644 tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_lort_cpu diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml index 146186e9eeaf5..b4bcc4efdaee7 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml @@ -55,9 +55,12 @@ jobs: - template: templates/get-docker-image-steps.yml parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_aten_cpu + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu Context: tools/ci_build/github/linux/docker - DockerBuildArgs: "--build-arg BUILD_UID=$( id -u )" + DockerBuildArgs: " + --build-arg BUILD_ATEN=true + --build-arg BUILD_UID=$( id -u ) + " Repository: 'onnxruntimecpubuildaten' UseImageCacheContainerRegistry: true UsePipelineCache: false diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml index a5c08e95b7efc..34c2b1eb1ffa6 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml @@ -59,9 +59,12 @@ jobs: - template: templates/get-docker-image-steps.yml parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_lort_cpu + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu Context: tools/ci_build/github/linux/docker - DockerBuildArgs: "--build-arg BUILD_UID=$( id -u )" + DockerBuildArgs: " + --build-arg BUILD_ATEN=true + --build-arg BUILD_UID=$( id -u ) + " Repository: onnxruntimecpubuildlort - task: CmdLine@2 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_aten_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_aten_cpu deleted file mode 100644 index ad3e783040b9a..0000000000000 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_aten_cpu +++ /dev/null @@ -1,10 +0,0 @@ -FROM quay.io/pypa/manylinux2014_x86_64:latest - -ADD scripts /tmp/scripts -RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_aten.sh && rm -rf /tmp/scripts - -ARG BUILD_UID=1001 -ARG BUILD_USER=onnxruntimedev -RUN adduser --uid $BUILD_UID $BUILD_USER -WORKDIR /home/$BUILD_USER -USER $BUILD_USER diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_lort_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_lort_cpu deleted file mode 100644 index 43d51fb1d6fc7..0000000000000 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_lort_cpu +++ /dev/null @@ -1,10 +0,0 @@ -FROM quay.io/pypa/manylinux2014_x86_64:latest - -ADD scripts /tmp/scripts -RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_lort.sh && rm -rf /tmp/scripts - -ARG BUILD_UID=1002 -ARG BUILD_USER=onnxruntimedev -RUN adduser --uid $BUILD_UID $BUILD_USER -WORKDIR /home/$BUILD_USER -USER $BUILD_USER diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index af87852561e0a..1f4f89da202fa 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -4,6 +4,8 @@ ARG PLATFORM=x86_64 ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64 ARG PREPEND_PATH=/usr/lib/jvm/msopenjdk-11/bin:${DEVTOOLSET_ROOTPATH}/usr/bin: +ARG BUILD_LORT=false +ARG BUILD_ATEN=false #Build manylinux2014 docker image begin FROM $BASEIMAGE AS runtime_base @@ -156,7 +158,14 @@ ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11 ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh -RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh && rm -rf /tmp/scripts +RUN if [ $BUILD_LORT = true ]; then \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + else if [ $BUILD_ATEN = true ]; then \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ + else \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh ; \ + fi +RUN rm -rf /tmp/scripts ARG BUILD_UID=1001 ARG BUILD_USER=onnxruntimedev From 1353327fbc3b35ffbb1fc0dc797857cdc6578a86 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 20 Oct 2023 14:17:20 -0700 Subject: [PATCH 02/15] Remove manylinux2014 from aten and lort cpu --- .../github/azure-pipelines/linux-cpu-eager-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml index 34c2b1eb1ffa6..17f12e4b504e0 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml @@ -62,7 +62,7 @@ jobs: Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu Context: tools/ci_build/github/linux/docker DockerBuildArgs: " - --build-arg BUILD_ATEN=true + --build-arg BUILD_LORT=true --build-arg BUILD_UID=$( id -u ) " Repository: onnxruntimecpubuildlort From 6ddcff2f11c56f89a82a4e3955ba059acb27a2e9 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 20 Oct 2023 14:47:23 -0700 Subject: [PATCH 03/15] Remove manylinux2014 from aten and lort cpu --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index 1f4f89da202fa..7a09befc31459 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -159,10 +159,12 @@ ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11 ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh RUN if [ $BUILD_LORT = true ]; then \ - cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ - else if [ $BUILD_ATEN = true ]; then \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + fi +RUN if [ $BUILD_ATEN = true ]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ - else \ + fi +RUN if [ $BUILD_ATEN = false ] && [ $BUILD_LORT = false ]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh ; \ fi RUN rm -rf /tmp/scripts From ba89ede944eec5f1705762f4e6bdd2b8eb108e41 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 20 Oct 2023 14:56:43 -0700 Subject: [PATCH 04/15] Remove manylinux2014 from aten and lort cpu --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index 7a09befc31459..00af276a0b657 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -159,12 +159,10 @@ ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11 ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh RUN if [ $BUILD_LORT = true ]; then \ - cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ - fi -RUN if [ $BUILD_ATEN = true ]; then \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + elif [ $BUILD_ATEN = true ]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ - fi -RUN if [ $BUILD_ATEN = false ] && [ $BUILD_LORT = false ]; then \ + else \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh ; \ fi RUN rm -rf /tmp/scripts From 6b8159a89b8929bf3e2d57855585ee378cf2b5e7 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 20 Oct 2023 16:27:04 -0700 Subject: [PATCH 05/15] Change testing image to BASEIMAGE=registry.access.redhat.com/ubi8/ubi --- .../linux-cpu-aten-pipeline.yml | 2 +- .../linux-cpu-eager-pipeline.yml | 2 +- .../linux/docker/Dockerfile.manylinux2_28_cpu | 11 +---------- .../docker/Dockerfile.manylinux2_28_cpu_alt | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml index b4bcc4efdaee7..5d06a4fd56dd8 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml @@ -55,7 +55,7 @@ jobs: - template: templates/get-docker-image-steps.yml parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --build-arg BUILD_ATEN=true diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml index 17f12e4b504e0..df00ac668c95f 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml @@ -59,7 +59,7 @@ jobs: - template: templates/get-docker-image-steps.yml parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --build-arg BUILD_LORT=true diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index 00af276a0b657..af87852561e0a 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -4,8 +4,6 @@ ARG PLATFORM=x86_64 ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64 ARG PREPEND_PATH=/usr/lib/jvm/msopenjdk-11/bin:${DEVTOOLSET_ROOTPATH}/usr/bin: -ARG BUILD_LORT=false -ARG BUILD_ATEN=false #Build manylinux2014 docker image begin FROM $BASEIMAGE AS runtime_base @@ -158,14 +156,7 @@ ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11 ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh -RUN if [ $BUILD_LORT = true ]; then \ - cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ - elif [ $BUILD_ATEN = true ]; then \ - cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ - else \ - cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh ; \ - fi -RUN rm -rf /tmp/scripts +RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh && rm -rf /tmp/scripts ARG BUILD_UID=1001 ARG BUILD_USER=onnxruntimedev diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt new file mode 100644 index 0000000000000..eabc2ad14834f --- /dev/null +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -0,0 +1,19 @@ +ARG BASEIMAGE=registry.access.redhat.com/ubi8/ubi + +ARG BUILD_LORT=false +ARG BUILD_ATEN=false + +FROM $BASEIMAGE AS runtime_base +ADD scripts /tmp/scripts +RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh +RUN if [ $BUILD_LORT = true ]; then \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + else [ $BUILD_ATEN = true ]; then \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ +RUN rm -rf /tmp/scripts + +ARG BUILD_UID=1002 +ARG BUILD_USER=onnxruntimedev +RUN adduser --uid $BUILD_UID $BUILD_USER +WORKDIR /home/$BUILD_USER +USER $BUILD_USER From 75bd7c83034d34d80fa65cbad41a5ef2cf9c6a73 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 20 Oct 2023 16:48:51 -0700 Subject: [PATCH 06/15] Change typo --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu_alt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt index eabc2ad14834f..d4db6ec60970d 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -8,7 +8,7 @@ ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh RUN if [ $BUILD_LORT = true ]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ - else [ $BUILD_ATEN = true ]; then \ + elif [ $BUILD_ATEN = true ]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ RUN rm -rf /tmp/scripts From 7a4e11026252fa19ed208e52ba9ced5a47637114 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 20 Oct 2023 17:21:55 -0700 Subject: [PATCH 07/15] Adding fi --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu_alt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt index d4db6ec60970d..f823d738e6eee 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -10,6 +10,7 @@ RUN if [ $BUILD_LORT = true ]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ elif [ $BUILD_ATEN = true ]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ + fi RUN rm -rf /tmp/scripts ARG BUILD_UID=1002 From 83334845cc8ceff1c6e741cde93325d779b00058 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 16 Nov 2023 15:33:26 -0800 Subject: [PATCH 08/15] Update Docker file --- .../docker/Dockerfile.manylinux2_28_cpu_alt | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt index f823d738e6eee..c41eee68a9e2b 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -1,14 +1,39 @@ ARG BASEIMAGE=registry.access.redhat.com/ubi8/ubi +ARG POLICY=manylinux_2_28 +ARG PLATFORM=x86_64 ARG BUILD_LORT=false ARG BUILD_ATEN=false +ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root +ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64 +ARG PREPEND_PATH=/usr/lib/jvm/msopenjdk-11/bin:${DEVTOOLSET_ROOTPATH}/usr/bin: + FROM $BASEIMAGE AS runtime_base + +ARG BUILD_LORT +ARG BUILD_ATEN + +ARG POLICY +ARG PLATFORM +ARG DEVTOOLSET_ROOTPATH +ARG LD_LIBRARY_PATH_ARG +ARG PREPEND_PATH +LABEL maintainer="The ManyLinux project" + +ENV AUDITWHEEL_POLICY=${POLICY} AUDITWHEEL_ARCH=${PLATFORM} AUDITWHEEL_PLAT=${POLICY}_${PLATFORM} +ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 +ENV DEVTOOLSET_ROOTPATH=${DEVTOOLSET_ROOTPATH} +ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH_ARG} +ENV PATH=${PREPEND_PATH}${PATH} +ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig + + ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh -RUN if [ $BUILD_LORT = true ]; then \ +RUN if [[ $BUILD_LORT = true ]]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ - elif [ $BUILD_ATEN = true ]; then \ + elif [[ $BUILD_ATEN = true ]]; then \ cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ fi RUN rm -rf /tmp/scripts From 8637e61ea5d64352d611489832d9ddffbbb1647e Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 17 Nov 2023 14:53:33 -0800 Subject: [PATCH 09/15] Update CudaVersion --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu_alt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt index c41eee68a9e2b..f7d26f4b973f8 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -31,10 +31,10 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh -RUN if [[ $BUILD_LORT = true ]]; then \ - cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ - elif [[ $BUILD_ATEN = true ]]; then \ - cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ +RUN if [ "$BUILD_LORT" = true ];\ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + elif [ "$BUILD_ATEN" = true ];\ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ fi RUN rm -rf /tmp/scripts From f2f83baabcadbc69b41a28e85cc8d21d59b618d0 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 17 Nov 2023 15:02:45 -0800 Subject: [PATCH 10/15] Remove cd --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu_alt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt index f7d26f4b973f8..f99ebcb339f84 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -30,11 +30,10 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ADD scripts /tmp/scripts -RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh RUN if [ "$BUILD_LORT" = true ];\ - then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_lort.sh ; \ elif [ "$BUILD_ATEN" = true ];\ - then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_aten.sh ; \ fi RUN rm -rf /tmp/scripts From 7bd1f0452acddce9e96ed5acf19fb22f742d028c Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 17 Nov 2023 15:32:52 -0800 Subject: [PATCH 11/15] update PATH to include cmake --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu_alt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt index f99ebcb339f84..f370e0f0106dc 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -28,12 +28,14 @@ ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH_ARG} ENV PATH=${PREPEND_PATH}${PATH} ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig +ENV PATH ${DEVTOOLSET_ROOTPATH}/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ADD scripts /tmp/scripts +RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh RUN if [ "$BUILD_LORT" = true ];\ - then cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ elif [ "$BUILD_ATEN" = true ];\ - then cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_aten.sh ; \ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ fi RUN rm -rf /tmp/scripts From af1b8654baec0ce7c7ad4ce1963f8bc09c3979a3 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 17 Nov 2023 16:33:36 -0800 Subject: [PATCH 12/15] update PATH to include cmake --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu_alt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt index f370e0f0106dc..b21187ff2d804 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt @@ -27,9 +27,13 @@ ENV DEVTOOLSET_ROOTPATH=${DEVTOOLSET_ROOTPATH} ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH_ARG} ENV PATH=${PREPEND_PATH}${PATH} ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig - +RUN echo $PATH +RUN which cmake ENV PATH ${DEVTOOLSET_ROOTPATH}/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +RUN echo $PATH +RUN which cmake + ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh RUN if [ "$BUILD_LORT" = true ];\ From a2458f23dfa544f3408f4b995cad540842aed652 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 17 Nov 2023 16:55:43 -0800 Subject: [PATCH 13/15] Update manylinux2_28_cpu --- .../azure-pipelines/linux-cpu-aten-pipeline.yml | 2 +- .../azure-pipelines/linux-cpu-eager-pipeline.yml | 2 +- .../github/linux/docker/Dockerfile.manylinux2_28_cpu | 12 +++++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml index 5d06a4fd56dd8..b4bcc4efdaee7 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml @@ -55,7 +55,7 @@ jobs: - template: templates/get-docker-image-steps.yml parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --build-arg BUILD_ATEN=true diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml index df00ac668c95f..17f12e4b504e0 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml @@ -59,7 +59,7 @@ jobs: - template: templates/get-docker-image-steps.yml parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --build-arg BUILD_LORT=true diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index af87852561e0a..5a60785c6889d 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -4,9 +4,12 @@ ARG PLATFORM=x86_64 ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64 ARG PREPEND_PATH=/usr/lib/jvm/msopenjdk-11/bin:${DEVTOOLSET_ROOTPATH}/usr/bin: - +ARG BUILD_LORT +ARG BUILD_ATEN #Build manylinux2014 docker image begin FROM $BASEIMAGE AS runtime_base +ARG BUILD_LORT +ARG BUILD_ATEN ARG POLICY ARG PLATFORM ARG DEVTOOLSET_ROOTPATH @@ -156,6 +159,13 @@ ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11 ADD scripts /tmp/scripts RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh +RUN if [ "$BUILD_LORT" = true ];\ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ + elif [ "$BUILD_ATEN" = true ];\ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ + else;\ + then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh ; \ + fi RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh && rm -rf /tmp/scripts ARG BUILD_UID=1001 From acdf2fcc08f374a7447bc8d88dd1bd633607ea78 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sun, 19 Nov 2023 17:30:43 -0800 Subject: [PATCH 14/15] Uppdate if else --- .../github/linux/docker/Dockerfile.manylinux2_28_cpu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index 5a60785c6889d..359df6b0875d8 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -4,8 +4,8 @@ ARG PLATFORM=x86_64 ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64 ARG PREPEND_PATH=/usr/lib/jvm/msopenjdk-11/bin:${DEVTOOLSET_ROOTPATH}/usr/bin: -ARG BUILD_LORT -ARG BUILD_ATEN +ARG BUILD_LORT=false +ARG BUILD_ATEN=false #Build manylinux2014 docker image begin FROM $BASEIMAGE AS runtime_base ARG BUILD_LORT @@ -163,8 +163,8 @@ RUN if [ "$BUILD_LORT" = true ];\ then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ elif [ "$BUILD_ATEN" = true ];\ then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ - else;\ - then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh ; \ + else \ + cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh ; \ fi RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_deps.sh && rm -rf /tmp/scripts From d82ff53810289961f0b779fcc44c37c1810b07e8 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 20 Nov 2023 10:04:44 -0800 Subject: [PATCH 15/15] Delete Dockerfile.manylinux2_28_cpu_alt --- .../docker/Dockerfile.manylinux2_28_cpu_alt | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt deleted file mode 100644 index b21187ff2d804..0000000000000 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu_alt +++ /dev/null @@ -1,50 +0,0 @@ -ARG BASEIMAGE=registry.access.redhat.com/ubi8/ubi -ARG POLICY=manylinux_2_28 -ARG PLATFORM=x86_64 - -ARG BUILD_LORT=false -ARG BUILD_ATEN=false - -ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root -ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64 -ARG PREPEND_PATH=/usr/lib/jvm/msopenjdk-11/bin:${DEVTOOLSET_ROOTPATH}/usr/bin: - -FROM $BASEIMAGE AS runtime_base - -ARG BUILD_LORT -ARG BUILD_ATEN - -ARG POLICY -ARG PLATFORM -ARG DEVTOOLSET_ROOTPATH -ARG LD_LIBRARY_PATH_ARG -ARG PREPEND_PATH -LABEL maintainer="The ManyLinux project" - -ENV AUDITWHEEL_POLICY=${POLICY} AUDITWHEEL_ARCH=${PLATFORM} AUDITWHEEL_PLAT=${POLICY}_${PLATFORM} -ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 -ENV DEVTOOLSET_ROOTPATH=${DEVTOOLSET_ROOTPATH} -ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH_ARG} -ENV PATH=${PREPEND_PATH}${PATH} -ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig -RUN echo $PATH -RUN which cmake -ENV PATH ${DEVTOOLSET_ROOTPATH}/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - -RUN echo $PATH -RUN which cmake - -ADD scripts /tmp/scripts -RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh -RUN if [ "$BUILD_LORT" = true ];\ - then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_lort.sh ; \ - elif [ "$BUILD_ATEN" = true ];\ - then cd /tmp/scripts && /tmp/scripts/manylinux/install_deps_aten.sh ; \ - fi -RUN rm -rf /tmp/scripts - -ARG BUILD_UID=1002 -ARG BUILD_USER=onnxruntimedev -RUN adduser --uid $BUILD_UID $BUILD_USER -WORKDIR /home/$BUILD_USER -USER $BUILD_USER