From 672ae2b9119251b12b0c03a1e48e2e6f2c2b0f35 Mon Sep 17 00:00:00 2001 From: divyegala Date: Tue, 18 Jul 2023 16:26:22 -0700 Subject: [PATCH 1/9] add PIP_EXTRA_INDEX_URL --- ci-wheel/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index e52a2f4..dc173d2 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -18,6 +18,9 @@ ARG DEBIAN_FRONTEND=noninteractive ENV RAPIDS_CUDA_VERSION="${CUDA_VER}" ENV RAPIDS_PY_VERSION="${PYTHON_VER}" +# RAPIDS pip index +ENV PIP_EXTRA_INDEX_URL="https://pypi.k8s.rapids.ai/simple" + ENV PYENV_ROOT="/pyenv" ENV PATH="/pyenv/bin:/pyenv/shims:$PATH" From c1687275742ed689ac8d6d312676a82d3a8b4dcc Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 19 Jul 2023 09:10:45 -0700 Subject: [PATCH 2/9] try install gh --- ci-wheel/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index dc173d2..adc9717 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -26,12 +26,12 @@ ENV PATH="/pyenv/bin:/pyenv/shims:$PATH" RUN case "${LINUX_VER}" in \ "ubuntu"*) \ - apt update -y && apt install -y jq build-essential software-properties-common wget gcc zlib1g-dev libbz2-dev libssl-dev libreadline-dev libsqlite3-dev libffi-dev curl git libncurses5-dev libnuma-dev openssh-client libcudnn8-dev zip libopenblas-dev liblapack-dev protobuf-compiler autoconf automake libtool cmake && rm -rf /var/lib/apt/lists/* \ + apt update -y && apt install -y jq gh build-essential software-properties-common wget gcc zlib1g-dev libbz2-dev libssl-dev libreadline-dev libsqlite3-dev libffi-dev curl git libncurses5-dev libnuma-dev openssh-client libcudnn8-dev zip libopenblas-dev liblapack-dev protobuf-compiler autoconf automake libtool cmake && rm -rf /var/lib/apt/lists/* \ && add-apt-repository ppa:git-core/ppa && add-apt-repository ppa:ubuntu-toolchain-r/test && apt update -y && apt install -y git gcc-9 g++-9 && add-apt-repository -r ppa:git-core/ppa && add-apt-repository -r ppa:ubuntu-toolchain-r/test \ && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9 \ ;; \ "centos"*) \ - yum update --exclude=libnccl* -y && yum install -y epel-release wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake && yum clean all \ + yum update --exclude=libnccl* -y && yum install -y epel-release gh wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake && yum clean all \ && yum remove -y git && yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm && yum install -y git jq devtoolset-11 && yum remove -y endpoint-repo \ && echo -e ' \ #!/bin/bash\n \ From 4505050ad7c66aa2bc9f094e3fec7c63c6d19bea Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 19 Jul 2023 09:29:33 -0700 Subject: [PATCH 3/9] try fixing gh install for ubuntu --- ci-wheel/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index adc9717..625e1ba 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -26,9 +26,14 @@ ENV PATH="/pyenv/bin:/pyenv/shims:$PATH" RUN case "${LINUX_VER}" in \ "ubuntu"*) \ - apt update -y && apt install -y jq gh build-essential software-properties-common wget gcc zlib1g-dev libbz2-dev libssl-dev libreadline-dev libsqlite3-dev libffi-dev curl git libncurses5-dev libnuma-dev openssh-client libcudnn8-dev zip libopenblas-dev liblapack-dev protobuf-compiler autoconf automake libtool cmake && rm -rf /var/lib/apt/lists/* \ + apt update -y && apt install -y jq build-essential software-properties-common wget gcc zlib1g-dev libbz2-dev libssl-dev libreadline-dev libsqlite3-dev libffi-dev curl git libncurses5-dev libnuma-dev openssh-client libcudnn8-dev zip libopenblas-dev liblapack-dev protobuf-compiler autoconf automake libtool cmake && rm -rf /var/lib/apt/lists/* \ && add-apt-repository ppa:git-core/ppa && add-apt-repository ppa:ubuntu-toolchain-r/test && apt update -y && apt install -y git gcc-9 g++-9 && add-apt-repository -r ppa:git-core/ppa && add-apt-repository -r ppa:ubuntu-toolchain-r/test \ && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9 \ + && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \ + && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ + && apt update \ + && apt install gh -y ;; \ "centos"*) \ yum update --exclude=libnccl* -y && yum install -y epel-release gh wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake && yum clean all \ From 15d20c2af2236e11b6756ab180971cac670c254d Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 19 Jul 2023 09:36:27 -0700 Subject: [PATCH 4/9] add missing backslash --- ci-wheel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index 625e1ba..3ce85f0 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -33,7 +33,7 @@ RUN case "${LINUX_VER}" in \ && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \ && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ && apt update \ - && apt install gh -y + && apt install gh -y \ ;; \ "centos"*) \ yum update --exclude=libnccl* -y && yum install -y epel-release gh wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake && yum clean all \ From 24308a58ad8c348399d4a7d604d5f40f6c539973 Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 19 Jul 2023 11:07:12 -0700 Subject: [PATCH 5/9] install gh cli from tarballs --- ci-wheel/Dockerfile | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index 3ce85f0..da00c1b 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -7,6 +7,7 @@ FROM ${BASE_IMAGE} ARG CUDA_VER ARG LINUX_VER +ARG CPU_ARCH ARG REAL_ARCH ARG PYTHON_VER=3.9 ARG MANYLINUX_VER @@ -29,14 +30,9 @@ RUN case "${LINUX_VER}" in \ apt update -y && apt install -y jq build-essential software-properties-common wget gcc zlib1g-dev libbz2-dev libssl-dev libreadline-dev libsqlite3-dev libffi-dev curl git libncurses5-dev libnuma-dev openssh-client libcudnn8-dev zip libopenblas-dev liblapack-dev protobuf-compiler autoconf automake libtool cmake && rm -rf /var/lib/apt/lists/* \ && add-apt-repository ppa:git-core/ppa && add-apt-repository ppa:ubuntu-toolchain-r/test && apt update -y && apt install -y git gcc-9 g++-9 && add-apt-repository -r ppa:git-core/ppa && add-apt-repository -r ppa:ubuntu-toolchain-r/test \ && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9 \ - && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \ - && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ - && apt update \ - && apt install gh -y \ ;; \ "centos"*) \ - yum update --exclude=libnccl* -y && yum install -y epel-release gh wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake && yum clean all \ + yum update --exclude=libnccl* -y && yum install -y epel-release wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake && yum clean all \ && yum remove -y git && yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm && yum install -y git jq devtoolset-11 && yum remove -y endpoint-repo \ && echo -e ' \ #!/bin/bash\n \ @@ -56,6 +52,23 @@ RUN case "${LINUX_VER}" in \ ;; \ esac +# Download and install GH CLI tool v2.32.0 +RUN case "${CPU_ARCH}" in \ + "amd"*) \ + wget https://github.com/cli/cli/releases/download/v2.32.0/gh_2.32.0_linux_amd64.tar.gz \ + && tar -xf gh_2.32.0_linux_amd64.tar.gz \ + && mv gh_2.32.0_linux_amd64/bin/gh usr/local/bin \ + ;; \ + "arm"*) \ + wget https://github.com/cli/cli/releases/download/v2.32.0/gh_2.32.0_linux_arm64.tar.gz \ + && tar -xf gh_2.32.0_linux_arm64.tar.gz \ + && mv gh_2.32.0_linux_arm64/bin/gh usr/local/bin \ + ;; \ + *) \ + echo "Unsupported ARCH: ${CPU_ARCH}}" && exit 1; \ + ;; \ + esac + # Install sccache ARG SCCACHE_VERSION=0.5.0 From 0f55e238eb3e93b0488973569f210bfd04ffb6e2 Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 19 Jul 2023 12:34:10 -0700 Subject: [PATCH 6/9] simplify gh installation --- ci-wheel/Dockerfile | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index da00c1b..b65acd7 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -53,21 +53,14 @@ RUN case "${LINUX_VER}" in \ esac # Download and install GH CLI tool v2.32.0 -RUN case "${CPU_ARCH}" in \ - "amd"*) \ - wget https://github.com/cli/cli/releases/download/v2.32.0/gh_2.32.0_linux_amd64.tar.gz \ - && tar -xf gh_2.32.0_linux_amd64.tar.gz \ - && mv gh_2.32.0_linux_amd64/bin/gh usr/local/bin \ - ;; \ - "arm"*) \ - wget https://github.com/cli/cli/releases/download/v2.32.0/gh_2.32.0_linux_arm64.tar.gz \ - && tar -xf gh_2.32.0_linux_arm64.tar.gz \ - && mv gh_2.32.0_linux_arm64/bin/gh usr/local/bin \ - ;; \ - *) \ - echo "Unsupported ARCH: ${CPU_ARCH}}" && exit 1; \ - ;; \ - esac +ARG GH_VERSION=2.32.0 +RUN < Date: Wed, 19 Jul 2023 13:54:17 -0700 Subject: [PATCH 7/9] remove sccache config --- ci-wheel/Dockerfile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index b65acd7..516be09 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -55,7 +55,7 @@ RUN case "${LINUX_VER}" in \ # Download and install GH CLI tool v2.32.0 ARG GH_VERSION=2.32.0 RUN < Date: Wed, 19 Jul 2023 13:57:56 -0700 Subject: [PATCH 8/9] remove -x from set --- ci-wheel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index 516be09..0c47866 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -55,7 +55,7 @@ RUN case "${LINUX_VER}" in \ # Download and install GH CLI tool v2.32.0 ARG GH_VERSION=2.32.0 RUN < Date: Wed, 19 Jul 2023 13:58:54 -0700 Subject: [PATCH 9/9] Revert "remove sccache config" This reverts commit c222ca022f285ffae33d0938a6d6c6c8e6a8356a. --- ci-wheel/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ci-wheel/Dockerfile b/ci-wheel/Dockerfile index 0c47866..b65acd7 100644 --- a/ci-wheel/Dockerfile +++ b/ci-wheel/Dockerfile @@ -74,6 +74,16 @@ RUN curl -o /tmp/sccache.tar.gz \ # Set AUDITWHEEL_* env vars for use with auditwheel ENV AUDITWHEEL_POLICY=${POLICY} AUDITWHEEL_ARCH=${REAL_ARCH} AUDITWHEEL_PLAT=${POLICY}_${REAL_ARCH} +# Set sccache env vars +ENV CMAKE_CUDA_COMPILER_LAUNCHER=sccache +ENV CMAKE_CXX_COMPILER_LAUNCHER=sccache +ENV CMAKE_C_COMPILER_LAUNCHER=sccache +ENV SCCACHE_BUCKET=rapids-sccache-east +ENV SCCACHE_REGION=us-east-2 +ENV SCCACHE_IDLE_TIMEOUT=32768 +ENV SCCACHE_S3_USE_SSL=true +ENV SCCACHE_S3_NO_CREDENTIALS=false + # Install ucx ARG UCX_VERSION=1.14.1 RUN mkdir -p /ucx-src && cd /ucx-src &&\