Skip to content

Commit

Permalink
Merge branch 'branch-25.04' into nvks-runners
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice authored Feb 12, 2025
2 parents 459d3ee + a54fdfc commit 6f7c3be
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/ops-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
auto_merger: true
branch_checker: true
forward_merger: true
label_checker: true
2 changes: 1 addition & 1 deletion context/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ EOF

if [ -e "/home/rapids/environment.yml" ]; then
echo "environment.yml found. Installing packages."
timeout ${CONDA_TIMEOUT:-600} mamba env update -n base -f /home/rapids/environment.yml || exit $?
timeout ${CONDA_TIMEOUT:-600} mamba env update -n base -y -f /home/rapids/environment.yml || exit $?
fi

if [ "$EXTRA_CONDA_PACKAGES" ]; then
Expand Down
2 changes: 2 additions & 0 deletions context/test_notebooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
'cuspatial/nyc_taxi_years_correlation.ipynb',
# context on skip zipcodes: https://github.com/rapidsai/cuspatial/issues/1426
'cuspatial/ZipCodes_Stops_PiP_cuSpatial.ipynb',
# context on this being skipped: https://github.com/rapidsai/docker/issues/726
'cuspatial/trajectory_clustering.ipynb',
]


Expand Down
6 changes: 3 additions & 3 deletions cuvs-bench/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export DATA_FOLDER=path/to/store/results/and/data
docker run --gpus all --rm -it \
-v $DATA_FOLDER:/home/rapids/benchmarks \
-u $(id -u) \
rapidsai/cuvs-bench:25.04a-cuda12.5-py3.12 \
rapidsai/cuvs-bench:25.04a-cuda12.8-py3.12 \
"--dataset deep-image-96-angular" \
"--normalize" \
"--algorithms cuvs_cagra" \
Expand All @@ -47,7 +47,7 @@ Where:

- `DATA_FOLDER=path/to/store/results/and/data`: Results and datasets will be written to this host folder.
- `-u $(id -u)`: This flag allows the container to use the host user for permissions
- `rapidsai/cuvs-bench:25.04a-cuda12.5-py3.12`: Image to use, either `cuvs-bench` or `cuvs-bench-datasets`, cuVS version, CUDA version, and Python version.
- `rapidsai/cuvs-bench:25.04a-cuda12.8-py3.12`: Image to use, either `cuvs-bench` or `cuvs-bench-datasets`, cuVS version, CUDA version, and Python version.
- "--dataset deep-image-96-angular": Dataset name(s). See https://docs.rapids.ai/api/cuvs/nightly/cuvs_bench for more details.
- "--normalize": Whether to normalize the dataset, leave string empty ("") to not normalize.
- "--algorithms cuvs_cagra": What algorithm(s) to use as a ; separated list, as well as any other argument to pass to `cuvs_bench.run`.
Expand All @@ -74,7 +74,7 @@ export DATA_FOLDER=path/to/store/results/and/data
docker run --gpus all --rm -it \
-v $DATA_FOLDER:/home/rapids/benchmarks \
-u $(id -u) \
rapidsai/cuvs-bench:25.04a-cuda12.5-py3.12 \
rapidsai/cuvs-bench:25.04a-cuda12.8-py3.12 \
--entrypoint /bin/bash
```

Expand Down
8 changes: 4 additions & 4 deletions dockerhub-readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ There are two types:

The tag naming scheme for RAPIDS images incorporates key platform details into the tag as shown below:
```
25.04-cuda12.5-py3.12
25.04-cuda12.8-py3.12
^ ^ ^
| | Python version
| |
Expand All @@ -48,7 +48,7 @@ The tag naming scheme for RAPIDS images incorporates key platform details into t
RAPIDS version
```

**Note: Nightly builds of the images have the RAPIDS version appended with an `a` (ie `25.04a-cuda12.5-py3.12`)**
**Note: Nightly builds of the images have the RAPIDS version appended with an `a` (ie `25.04a-cuda12.8-py3.12`)**

## Usage

Expand Down Expand Up @@ -81,7 +81,7 @@ $ docker run \
-e EXTRA_CONDA_PACKAGES="jq" \
-e EXTRA_PIP_PACKAGES="beautifulsoup4" \
-p 8888:8888 \
rapidsai/notebooks:25.04-cuda12.5-py3.12
rapidsai/notebooks:25.04-cuda12.8-py3.12
```

### Bind Mounts
Expand All @@ -106,7 +106,7 @@ $ docker run \
--gpus all \
--shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 \
-v $(pwd)/environment.yml:/home/rapids/environment.yml \
rapidsai/base:25.04-cuda12.5-py3.12
rapidsai/base:25.04-cuda12.8-py3.12
```

### Use JupyterLab to Explore the Notebooks
Expand Down
2 changes: 1 addition & 1 deletion matrix.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUDA_VER: # Should be `<major>.<minor>.<patch>` (e.g. `12.5.1`)
CUDA_VER: # Should be `<major>.<minor>.<patch>` (e.g. `12.8.0`)
- "11.8.0"
- "12.0.1"
- "12.8.0"
Expand Down

0 comments on commit 6f7c3be

Please sign in to comment.