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
4 changes: 2 additions & 2 deletions .github/workflows/test-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,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
Expand Down Expand Up @@ -206,7 +206,7 @@ COPY --from=dependencies --chown=rapids /test_notebooks_dependencies.yaml test_n
COPY --from=dependencies --chown=rapids /notebooks /home/rapids/notebooks

RUN <<EOF
rapids-mamba-retry env update -n base -f test_notebooks_dependencies.yaml
rapids-conda-retry env update -n base -f test_notebooks_dependencies.yaml
conda clean -afy
EOF

Expand All @@ -216,7 +216,7 @@ PACKAGES_TO_INSTALL=(
'dask-labextension>=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
Expand Down
4 changes: 2 additions & 2 deletions context/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ conda activate

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
Expand Down
5 changes: 3 additions & 2 deletions context/scripts/configure-conda-base-environment
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
# Copyright (c) 2026, NVIDIA CORPORATION.

# [description]
#
Expand Down Expand Up @@ -33,8 +34,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

Expand Down
5 changes: 3 additions & 2 deletions context/scripts/update-base-conda-environment
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
# Copyright (c) 2026, NVIDIA CORPORATION.

set -e -u -o pipefail

Expand All @@ -14,7 +15,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
Expand All @@ -23,7 +24,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
Expand Down
2 changes: 1 addition & 1 deletion cuvs-bench/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions cuvs-bench/cpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -45,14 +45,14 @@ EOF
# an older conda with newer packages still works well
# ref: https://github.com/rapidsai/ci-imgs/issues/185
RUN <<EOF
rapids-mamba-retry update --all -y -n base
rapids-mamba-retry install -y -n base "python=${PYTHON_VER}"
rapids-mamba-retry update --all -y -n base
rapids-conda-retry update --all -y -n base
rapids-conda-retry install -y -n base "python=${PYTHON_VER}"
rapids-conda-retry update --all -y -n base
PACKAGES_TO_INSTALL=(
"cuvs-bench-cpu=${RAPIDS_VER}.*"
"python=${PYTHON_VER}"
)
rapids-mamba-retry install -y -n base \
rapids-conda-retry install -y -n base \
"${PACKAGES_TO_INSTALL[@]}"
conda clean -afy
chmod -R 777 /opt/conda
Expand Down
4 changes: 2 additions & 2 deletions cuvs-bench/gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ rm -rf /var/lib/apt/lists/*
/tmp/build-scripts/install-gha-tools

# install cuvs-bench
rapids-mamba-retry update --all -y -n base
rapids-conda-retry update --all -y -n base
PACKAGES_TO_INSTALL=(
"cuvs-bench=${RAPIDS_VER}.*"
"cuda-version=${CUDA_VER%.*}.*"
)
rapids-mamba-retry install -y -n base \
rapids-conda-retry install -y -n base \
"${PACKAGES_TO_INSTALL[@]}"
conda clean -afy
chmod -R 777 /opt/conda
Expand Down
Loading