Skip to content

Commit

Permalink
Merge branch 'main' into python-3.13
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice authored Feb 18, 2025
2 parents ba293d0 + 028ad7c commit ad4868e
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
jobs:
run:
name: build (${{ matrix.CUDA_VER }}, ${{ matrix.PYTHON_VER }}, ${{ matrix.LINUX_VER }}, ${{ matrix.ARCH }})
timeout-minutes: 30
strategy:
max-parallel: 50
matrix:
Expand Down
10 changes: 9 additions & 1 deletion ci-conda.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,16 @@ ARG TARGETPLATFORM=notset
ARG CUDA_VER=notset
ARG LINUX_VER=notset
ARG PYTHON_VER=notset
ARG PYTHON_VER_UPPER_BOUND=notset
ARG CONDA_ARCH=notset

ARG DEBIAN_FRONTEND

# Set RAPIDS versions env variables
ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
ENV RAPIDS_PY_VERSION="${PYTHON_VER}"
ENV RAPIDS_DEPENDENCIES="latest"
ENV RAPIDS_CONDA_ARCH="${CONDA_ARCH}"

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

Expand Down Expand Up @@ -233,13 +236,16 @@ rapids-mamba-retry install -y \
boa \
ca-certificates \
certifi \
conda-build \
conda-package-handling \
dunamai \
git \
jq \
packaging \
"python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" \
"rapids-dependency-file-generator==1.*"
"rapids-dependency-file-generator==1.*" \
rattler-build \
;
conda clean -aipty
EOF

Expand All @@ -254,6 +260,7 @@ curl -o /tmp/sccache.tar.gz \
tar -C /tmp -xvf /tmp/sccache.tar.gz
mv "/tmp/sccache-v${SCCACHE_VER}-"${REAL_ARCH}"-unknown-linux-musl/sccache" /usr/bin/sccache
chmod +x /usr/bin/sccache
rm -rf /tmp/sccache.tar.gz "/tmp/sccache-v${SCCACHE_VER}-"${REAL_ARCH}"-unknown-linux-musl"

wget https://github.com/cli/cli/releases/download/v${GH_CLI_VER}/gh_${GH_CLI_VER}_linux_${CPU_ARCH}.tar.gz
tar -xf gh_*.tar.gz
Expand All @@ -266,6 +273,7 @@ ARG CODECOV_VER=notset
RUN <<EOF
# temporary workaround for discovered codecov binary install issue. See rapidsai/ci-imgs/issues/142
pip install codecov-cli==${CODECOV_VER}
pip cache purge
EOF

RUN /opt/conda/bin/git config --system --add safe.directory '*'
Expand Down
2 changes: 2 additions & 0 deletions ci-wheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ ARG REAL_ARCH=notset
ARG PYTHON_VER=notset
ARG MANYLINUX_VER=notset
ARG POLICY=${MANYLINUX_VER}
ARG CONDA_ARCH=notset

ARG DEBIAN_FRONTEND=noninteractive

# Set RAPIDS versions env variables
ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
ENV RAPIDS_PY_VERSION="${PYTHON_VER}"
ENV RAPIDS_DEPENDENCIES="latest"
ENV RAPIDS_CONDA_ARCH="${CONDA_ARCH}"

ENV PYENV_ROOT="/pyenv"
ENV PATH="/pyenv/bin:/pyenv/shims:$PATH"
Expand Down
4 changes: 4 additions & 0 deletions ci/compute-build-args.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ if [[
MANYLINUX_VER="manylinux_2_31"
fi

# translate ARCH to conda-equivalent string values
CONDA_ARCH=$(echo "$ARCH" | sed 's#amd64#linux64#' | sed 's#arm64#aarch64#')

ARGS="
CUDA_VER: ${CUDA_VER}
LINUX_VER: ${LINUX_VER}
PYTHON_VER: ${PYTHON_VER}
CPU_ARCH: ${ARCH}
REAL_ARCH: $(arch)
MANYLINUX_VER: ${MANYLINUX_VER}
CONDA_ARCH: ${CONDA_ARCH}
"
export ARGS

Expand Down
13 changes: 13 additions & 0 deletions citestwheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ FROM ${BASE_IMAGE}

ARG CUDA_VER=notset
ARG LINUX_VER=notset
ARG CPU_ARCH=notset
ARG PYTHON_VER=notset
ARG CONDA_ARCH=notset

# Set RAPIDS versions env variables
ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
ENV RAPIDS_PY_VERSION="${PYTHON_VER}"
ENV RAPIDS_DEPENDENCIES="latest"
ENV RAPIDS_CONDA_ARCH="${CONDA_ARCH}"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -113,6 +116,16 @@ case "${LINUX_VER}" in
esac
EOF

# Download and install GH CLI tool
ARG GH_CLI_VER=notset
RUN <<EOF
set -e
wget https://github.com/cli/cli/releases/download/v${GH_CLI_VER}/gh_${GH_CLI_VER}_linux_${CPU_ARCH}.tar.gz
tar -xf gh_*.tar.gz
mv gh_*/bin/gh /usr/local/bin
rm -rf gh_*
EOF

# Install pyenv
RUN curl https://pyenv.run | bash

Expand Down
8 changes: 4 additions & 4 deletions latest.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Define the values used for the "latest" tag
miniforge-cuda:
CUDA_VER: "12.5.1"
CUDA_VER: "12.8.0"
PYTHON_VER: "3.12"
LINUX_VER: "ubuntu24.04"
ci-conda:
CUDA_VER: "12.5.1"
CUDA_VER: "12.8.0"
PYTHON_VER: "3.12"
LINUX_VER: "ubuntu24.04"
ci-wheel:
CUDA_VER: "12.5.1"
CUDA_VER: "12.8.0"
PYTHON_VER: "3.12"
# Wheels should always be built with the oldest supported glibc version
LINUX_VER: "rockylinux8"
citestwheel:
CUDA_VER: "12.5.1"
CUDA_VER: "12.8.0"
PYTHON_VER: "3.12"
LINUX_VER: "ubuntu24.04"

0 comments on commit ad4868e

Please sign in to comment.