From d16a80f84521d7065a258bc76f15ed8be48a405f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 5 Mar 2026 14:23:50 -0800 Subject: [PATCH 1/3] Consistently use Conda install for Conda packages Both Conda and Mamba use the same underlying solver. To standardize stick to using Conda for installs throughout our images. --- .github/workflows/test-notebooks.yml | 4 ++-- Dockerfile | 6 +++--- context/entrypoint.sh | 4 ++-- context/scripts/configure-conda-base-environment | 4 ++-- context/scripts/update-base-conda-environment | 4 ++-- cuvs-bench/cpu/Dockerfile | 10 +++++----- cuvs-bench/gpu/Dockerfile | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test-notebooks.yml b/.github/workflows/test-notebooks.yml index 1abc0713..5099a3a3 100644 --- a/.github/workflows/test-notebooks.yml +++ b/.github/workflows/test-notebooks.yml @@ -71,7 +71,7 @@ jobs: steps: - name: Install required tools run: | - mamba install -n base --freeze-installed \ + conda install -n base --freeze-installed \ curl \ git - name: Checkout code @@ -94,7 +94,7 @@ jobs: - name: Install awscli if: '!cancelled()' run: | - rapids-mamba-retry install -n base awscli + rapids-conda-retry install -n base awscli - uses: aws-actions/configure-aws-credentials@v5 if: '!cancelled()' with: diff --git a/Dockerfile b/Dockerfile index b5dbc268..fc4ab197 100644 --- a/Dockerfile +++ b/Dockerfile @@ -174,7 +174,7 @@ PACKAGES_TO_INSTALL=( 'ipython>=8.37.0' 'rapids-cli==0.1.*' ) -rapids-mamba-retry install -y -n base \ +rapids-conda-retry install -y -n base \ "${PACKAGES_TO_INSTALL[@]}" conda clean -afy @@ -204,7 +204,7 @@ COPY --from=dependencies --chown=rapids /test_notebooks_dependencies.yaml test_n COPY --from=dependencies --chown=rapids /notebooks /home/rapids/notebooks RUN <=7.0.0' 'jupyterlab-nvdashboard>=0.13.0' ) -rapids-mamba-retry install -y -n base \ +rapids-conda-retry install -y -n base \ "${PACKAGES_TO_INSTALL[@]}" conda clean -afy EOF diff --git a/context/entrypoint.sh b/context/entrypoint.sh index 991cbead..0ff9e407 100755 --- a/context/entrypoint.sh +++ b/context/entrypoint.sh @@ -12,12 +12,12 @@ EOF if [ -e "/home/rapids/environment.yml" ]; then echo "environment.yml found. Installing packages." - timeout ${CONDA_TIMEOUT:-600} mamba env update -n base -y -f /home/rapids/environment.yml || exit $? + timeout ${CONDA_TIMEOUT:-600} conda env update -n base -y -f /home/rapids/environment.yml || exit $? fi if [ "$EXTRA_CONDA_PACKAGES" ]; then echo "EXTRA_CONDA_PACKAGES environment variable found. Installing packages." - timeout ${CONDA_TIMEOUT:-600} mamba install -n base -y $EXTRA_CONDA_PACKAGES || exit $? + timeout ${CONDA_TIMEOUT:-600} conda install -n base -y $EXTRA_CONDA_PACKAGES || exit $? fi if [ "$EXTRA_PIP_PACKAGES" ]; then diff --git a/context/scripts/configure-conda-base-environment b/context/scripts/configure-conda-base-environment index 8aac04c5..6e604799 100755 --- a/context/scripts/configure-conda-base-environment +++ b/context/scripts/configure-conda-base-environment @@ -33,8 +33,8 @@ if [[ "$PYTHON_VERSION_PADDED" > "3.12" ]]; then else PYTHON_ABI_TAG="cpython" fi -rapids-mamba-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" -rapids-mamba-retry update --all -y -n base +rapids-conda-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" +rapids-conda-retry update --all -y -n base find /opt/conda -follow -type f -name '*.a' -delete find /opt/conda -follow -type f -name '*.pyc' -delete diff --git a/context/scripts/update-base-conda-environment b/context/scripts/update-base-conda-environment index 13d02528..be653f76 100755 --- a/context/scripts/update-base-conda-environment +++ b/context/scripts/update-base-conda-environment @@ -14,7 +14,7 @@ SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")" # Ensure new files/dirs have group write permissions umask 002 -# install gha-tools for rapids-mamba-retry +# install gha-tools for rapids-conda-retry "${SCRIPT_DIR}/install-gha-tools" # Example of pinned package in case you require an override @@ -23,7 +23,7 @@ umask 002 # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well PATH="/opt/conda/bin:$PATH" \ - rapids-mamba-retry update --all -y -n base + rapids-conda-retry update --all -y -n base # clean up the package cache and other unused files, to minimize # what's copied into later images diff --git a/cuvs-bench/cpu/Dockerfile b/cuvs-bench/cpu/Dockerfile index 64c83f21..12ad19c6 100644 --- a/cuvs-bench/cpu/Dockerfile +++ b/cuvs-bench/cpu/Dockerfile @@ -34,7 +34,7 @@ RUN \ apt-get install -y --no-install-recommends \ "${PACKAGES_TO_INSTALL[@]}" - # install gha-tools for rapids-mamba-retry + # install gha-tools for rapids-conda-retry /tmp/build-scripts/install-gha-tools # clean up @@ -45,14 +45,14 @@ EOF # an older conda with newer packages still works well # ref: https://github.com/rapidsai/ci-imgs/issues/185 RUN < Date: Thu, 5 Mar 2026 14:25:38 -0800 Subject: [PATCH 2/3] Note Miniforge image is used Previously there were Mambaforge and Miniforge images. However these have been consolidated into one image, Miniforge. So just use the standardized name here. --- cuvs-bench/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cuvs-bench/README.md b/cuvs-bench/README.md index 730692fa..e814a0f0 100644 --- a/cuvs-bench/README.md +++ b/cuvs-bench/README.md @@ -9,7 +9,7 @@ These images are meant to enable end users of cuVS ANN algorithms to easily run There are two image types: - gpu: Contains dockerfile to build images using conda packages for GPU systems. -- cpu: Contains dockerfile to build images using conda packages for CPU systems. Based on `mambaforge`. +- cpu: Contains dockerfile to build images using conda packages for CPU systems. Based on `miniforge`. # Running the Containers From ec1a6292242ea2a9d879ce31d0371516e933a784 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 5 Mar 2026 15:47:28 -0800 Subject: [PATCH 3/3] Bump year to 2026 --- context/entrypoint.sh | 2 +- context/scripts/configure-conda-base-environment | 1 + context/scripts/update-base-conda-environment | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/context/entrypoint.sh b/context/entrypoint.sh index 0ff9e407..52841a74 100755 --- a/context/entrypoint.sh +++ b/context/entrypoint.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2023-2025, NVIDIA CORPORATION. +# Copyright (c) 2023-2026, NVIDIA CORPORATION. set -eo pipefail diff --git a/context/scripts/configure-conda-base-environment b/context/scripts/configure-conda-base-environment index 6e604799..34f87531 100755 --- a/context/scripts/configure-conda-base-environment +++ b/context/scripts/configure-conda-base-environment @@ -1,4 +1,5 @@ #!/bin/bash +# Copyright (c) 2026, NVIDIA CORPORATION. # [description] # diff --git a/context/scripts/update-base-conda-environment b/context/scripts/update-base-conda-environment index be653f76..b084c417 100755 --- a/context/scripts/update-base-conda-environment +++ b/context/scripts/update-base-conda-environment @@ -1,4 +1,5 @@ #!/bin/bash +# Copyright (c) 2026, NVIDIA CORPORATION. set -e -u -o pipefail