Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 2 additions & 7 deletions .github/workflows/build-cuvs-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,15 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Install gha-tools
run: |
mkdir -p /tmp/gha-tools
curl -s -L 'https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz' | tar -xz -C /tmp/gha-tools
echo "/tmp/gha-tools" >> "${GITHUB_PATH}"
- name: Clean up condarc for release builds
run: |
GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)"
GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v'
if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then
rapids-logger 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
echo 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
sed -i 's|rapidsai-nightly|rapidsai|' context/condarc
else
rapids-logger "Most recent tag is an alpha. Build will use nightly channels."
echo "Most recent tag is an alpha. Build will use nightly channels."
fi
- name: Login to DockerHub
uses: docker/login-action@v3
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/build-rapids-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,15 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Install gha-tools
run: |
mkdir -p /tmp/gha-tools
curl -s -L 'https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz' | tar -xz -C /tmp/gha-tools
echo "/tmp/gha-tools" >> "${GITHUB_PATH}"
- name: Clean up condarc for release builds
run: |
GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)"
GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v'
if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then
rapids-logger 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
echo 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
sed -i 's|rapidsai-nightly|rapidsai|' context/condarc
else
rapids-logger "Most recent tag is an alpha. Build will use nightly channels."
echo "Most recent tag is an alpha. Build will use nightly channels."
fi
- name: Login to DockerHub
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-publish-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v'
ALPHA_TAG=""
if [[ $GIT_DESCRIBE_TAG =~ [a-z] ]]; then
rapids-logger "Most recent tag is an alpha tag"
echo "Most recent tag is an alpha tag"
ALPHA_TAG="a"
fi
RAPIDS_VER="$(echo $GIT_DESCRIBE_TAG | awk 'BEGIN{FS=OFS="."} NF--')" # Convert full tag to YY.MM
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.7
rev: v0.14.10
hooks:
- id: ruff
args: ["--config", "pyproject.toml"]
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ apt-get purge -y --auto-remove rsync
rm -rf /var/lib/apt/lists/*
EOF


# Base image
FROM rapidsai/miniforge-cuda:${RAPIDS_VER}-cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER} AS base
ARG CUDA_VER
Expand Down Expand Up @@ -86,7 +85,7 @@ rapids-mamba-retry install -y -n base \
"rapids=${RAPIDS_VER}.*" \
"python=${PYTHON_VER}.*" \
"cuda-version=${CUDA_VER%.*}.*" \
ipython \
'ipython>=8.37.0' \
'rapids-cli==0.1.*' \
'openssl==3.6.0'
conda clean -afy
Expand All @@ -98,7 +97,6 @@ ENTRYPOINT ["/home/rapids/entrypoint.sh"]

CMD ["ipython"]


# Notebooks image
FROM base AS notebooks

Expand All @@ -124,8 +122,8 @@ EOF
RUN <<EOF
rapids-mamba-retry install -y -n base \
"jupyterlab=4" \
dask-labextension \
jupyterlab-nvdashboard
'dask-labextension>=7.0.0' \
'jupyterlab-nvdashboard>=0.13.0'
conda clean -afy
EOF

Expand Down
1 change: 0 additions & 1 deletion cuvs-bench/gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ CMD ["--dataset fashion-mnist-784-euclidean", "", "--algorithms cuvs_cagra", ""]

ENTRYPOINT ["/bin/bash", "/data/scripts/run_benchmark.sh"]


FROM cuvs-bench AS cuvs-bench-datasets

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