Skip to content

Commit 6f7c3be

Browse files
authored
Merge branch 'branch-25.04' into nvks-runners
2 parents 459d3ee + a54fdfc commit 6f7c3be

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

.github/ops-bot.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
auto_merger: true
55
branch_checker: true
66
forward_merger: true
7+
label_checker: true

context/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ EOF
1010

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

1616
if [ "$EXTRA_CONDA_PACKAGES" ]; then

context/test_notebooks.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
'cuspatial/nyc_taxi_years_correlation.ipynb',
3434
# context on skip zipcodes: https://github.com/rapidsai/cuspatial/issues/1426
3535
'cuspatial/ZipCodes_Stops_PiP_cuSpatial.ipynb',
36+
# context on this being skipped: https://github.com/rapidsai/docker/issues/726
37+
'cuspatial/trajectory_clustering.ipynb',
3638
]
3739

3840

cuvs-bench/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export DATA_FOLDER=path/to/store/results/and/data
3636
docker run --gpus all --rm -it \
3737
-v $DATA_FOLDER:/home/rapids/benchmarks \
3838
-u $(id -u) \
39-
rapidsai/cuvs-bench:25.04a-cuda12.5-py3.12 \
39+
rapidsai/cuvs-bench:25.04a-cuda12.8-py3.12 \
4040
"--dataset deep-image-96-angular" \
4141
"--normalize" \
4242
"--algorithms cuvs_cagra" \
@@ -47,7 +47,7 @@ Where:
4747

4848
- `DATA_FOLDER=path/to/store/results/and/data`: Results and datasets will be written to this host folder.
4949
- `-u $(id -u)`: This flag allows the container to use the host user for permissions
50-
- `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.
50+
- `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.
5151
- "--dataset deep-image-96-angular": Dataset name(s). See https://docs.rapids.ai/api/cuvs/nightly/cuvs_bench for more details.
5252
- "--normalize": Whether to normalize the dataset, leave string empty ("") to not normalize.
5353
- "--algorithms cuvs_cagra": What algorithm(s) to use as a ; separated list, as well as any other argument to pass to `cuvs_bench.run`.
@@ -74,7 +74,7 @@ export DATA_FOLDER=path/to/store/results/and/data
7474
docker run --gpus all --rm -it \
7575
-v $DATA_FOLDER:/home/rapids/benchmarks \
7676
-u $(id -u) \
77-
rapidsai/cuvs-bench:25.04a-cuda12.5-py3.12 \
77+
rapidsai/cuvs-bench:25.04a-cuda12.8-py3.12 \
7878
--entrypoint /bin/bash
7979
```
8080

dockerhub-readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ There are two types:
3939

4040
The tag naming scheme for RAPIDS images incorporates key platform details into the tag as shown below:
4141
```
42-
25.04-cuda12.5-py3.12
42+
25.04-cuda12.8-py3.12
4343
^ ^ ^
4444
| | Python version
4545
| |
@@ -48,7 +48,7 @@ The tag naming scheme for RAPIDS images incorporates key platform details into t
4848
RAPIDS version
4949
```
5050

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

5353
## Usage
5454

@@ -81,7 +81,7 @@ $ docker run \
8181
-e EXTRA_CONDA_PACKAGES="jq" \
8282
-e EXTRA_PIP_PACKAGES="beautifulsoup4" \
8383
-p 8888:8888 \
84-
rapidsai/notebooks:25.04-cuda12.5-py3.12
84+
rapidsai/notebooks:25.04-cuda12.8-py3.12
8585
```
8686

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

112112
### Use JupyterLab to Explore the Notebooks

matrix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CUDA_VER: # Should be `<major>.<minor>.<patch>` (e.g. `12.5.1`)
1+
CUDA_VER: # Should be `<major>.<minor>.<patch>` (e.g. `12.8.0`)
22
- "11.8.0"
33
- "12.0.1"
44
- "12.8.0"

0 commit comments

Comments
 (0)