Skip to content

Resolve forward merge conflicts #732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AyodeAwe merged 3 commits into from
Feb 12, 2025
Merged

Resolve forward merge conflicts #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f8cea7
Update to CUDA 12.8.0 (#728)
bdice Feb 3, 2025
edcacd1
avoid interactive prompts when updating from an environment.yaml (#727)
jameslamb Feb 3, 2025
6b8317b
Merge branch 'branch-25.02' into branch-25.04-merge-25.02
raydouglass Feb 10, 2025
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
2 changes: 1 addition & 1 deletion context/entrypoint.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions matrix-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
pull-request:
- { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'earliest' }
- { CUDA_VER: '12.0', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' }
- { CUDA_VER: '12.5', ARCH: 'amd64', PYTHON_VER: '3.12', GPU: 'v100', DRIVER: 'latest' }
- { CUDA_VER: '12.8', ARCH: 'amd64', PYTHON_VER: '3.12', GPU: 'v100', DRIVER: 'latest' }
branch:
- { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'earliest' }
- { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' }
- { CUDA_VER: '12.0', ARCH: 'amd64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' }
- { CUDA_VER: '12.0', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' }
- { CUDA_VER: '12.5', ARCH: 'amd64', PYTHON_VER: '3.12', GPU: 'v100', DRIVER: 'latest' }
- { CUDA_VER: '12.5', ARCH: 'arm64', PYTHON_VER: '3.12', GPU: 'a100', DRIVER: 'latest' }
- { CUDA_VER: '12.8', ARCH: 'amd64', PYTHON_VER: '3.12', GPU: 'v100', DRIVER: 'latest' }
- { CUDA_VER: '12.8', ARCH: 'arm64', PYTHON_VER: '3.12', GPU: 'a100', DRIVER: 'latest' }
4 changes: 2 additions & 2 deletions matrix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.5.1"
- "12.8.0"
PYTHON_VER:
- "3.10"
- "3.11"
Expand Down