From c5c8650da0940c605a823e7f1ab8d4deb3d7a467 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 23 Dec 2025 13:49:51 -0600 Subject: [PATCH 1/2] remove unnecessary gha-tools usage, put floors on conda dependencies --- .github/workflows/build-cuvs-image.yml | 9 ++------- .github/workflows/build-rapids-image.yml | 9 ++------- .github/workflows/build-test-publish-images.yml | 2 +- .pre-commit-config.yaml | 2 +- Dockerfile | 8 +++----- cuvs-bench/gpu/Dockerfile | 1 - 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-cuvs-image.yml b/.github/workflows/build-cuvs-image.yml index 19d14d1c..d6e1b366 100644 --- a/.github/workflows/build-cuvs-image.yml +++ b/.github/workflows/build-cuvs-image.yml @@ -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 diff --git a/.github/workflows/build-rapids-image.yml b/.github/workflows/build-rapids-image.yml index 75cd36c2..b2ffd040 100644 --- a/.github/workflows/build-rapids-image.yml +++ b/.github/workflows/build-rapids-image.yml @@ -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 diff --git a/.github/workflows/build-test-publish-images.yml b/.github/workflows/build-test-publish-images.yml index 8082beb1..b4fe73ae 100644 --- a/.github/workflows/build-test-publish-images.yml +++ b/.github/workflows/build-test-publish-images.yml @@ -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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8919b4d4..04ae5ff2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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"] diff --git a/Dockerfile b/Dockerfile index eb856407..88bcdd54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -86,7 +85,7 @@ rapids-mamba-retry install -y -n base \ "rapids=${RAPIDS_VER}.*" \ "python=${PYTHON_VER}.*" \ "cuda-version=${CUDA_VER%.*}.*" \ - ipython \ + 'ipython>=9' \ 'rapids-cli==0.1.*' \ 'openssl==3.6.0' conda clean -afy @@ -98,7 +97,6 @@ ENTRYPOINT ["/home/rapids/entrypoint.sh"] CMD ["ipython"] - # Notebooks image FROM base AS notebooks @@ -124,8 +122,8 @@ EOF RUN <=7.0.0' \ + 'jupyterlab-nvdashboard>=0.13.0' conda clean -afy EOF diff --git a/cuvs-bench/gpu/Dockerfile b/cuvs-bench/gpu/Dockerfile index fd4b1cfe..03177352 100644 --- a/cuvs-bench/gpu/Dockerfile +++ b/cuvs-bench/gpu/Dockerfile @@ -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"] From 72875aff0e97ddf924063b627b005c1aed3b24a3 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 23 Dec 2025 15:36:04 -0600 Subject: [PATCH 2/2] update ipython floor --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 88bcdd54..9c96a6a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,7 +85,7 @@ rapids-mamba-retry install -y -n base \ "rapids=${RAPIDS_VER}.*" \ "python=${PYTHON_VER}.*" \ "cuda-version=${CUDA_VER%.*}.*" \ - 'ipython>=9' \ + 'ipython>=8.37.0' \ 'rapids-cli==0.1.*' \ 'openssl==3.6.0' conda clean -afy