Skip to content

Commit

Permalink
add Python 3.12 images, default to Python 3.12 and CUDA 12.5 in docs (#…
Browse files Browse the repository at this point in the history
…711)

Contributes to rapidsai/build-planning#40.

* adds Python 3.12 images
* defaults to latest Python (3.12) and CUDA (12.5[.1]) in docs and comments

## Notes for Reviewers

Builds here will fail until all RAPIDS libraries are supporting Python 3.12, but figured we don't need to wait on that to come to an agreement about the building and testing matrices.

Blocked by:

* [x] rapidsai/cuml#6060
* [x] rapidsai/cugraph#4647
* [x] rapidsai/integration#719

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: #711
  • Loading branch information
jameslamb authored Sep 17, 2024
1 parent 1ab0231 commit 75eae84
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
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:
```
24.10-cuda11.8-py3.11
24.10-cuda12.5-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 `24.10a-cuda11.8-py3.11`)**
**Note: Nightly builds of the images have the RAPIDS version appended with an `a` (ie `24.10a-cuda12.5-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:24.10-cuda11.8-py3.11
rapidsai/notebooks:24.10-cuda12.5-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:24.10-cuda11.8-py3.11
rapidsai/base:24.10-cuda12.5-py3.12
```

### Use JupyterLab to Explore the Notebooks
Expand Down
12 changes: 6 additions & 6 deletions matrix-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

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.10', GPU: 'a100', DRIVER: 'latest' }
- { CUDA_VER: '12.5', 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' }
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.10', GPU: 'v100', DRIVER: 'latest' }
- { CUDA_VER: '12.0', ARCH: 'arm64', PYTHON_VER: '3.10', GPU: 'a100', DRIVER: 'latest' }
- { CUDA_VER: '12.5', ARCH: 'amd64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' }
- { CUDA_VER: '12.5', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', 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' }
3 changes: 2 additions & 1 deletion matrix.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
CUDA_VER: # Should be `<major>.<minor>.<patch>` (e.g. `11.2.2`)
CUDA_VER: # Should be `<major>.<minor>.<patch>` (e.g. `12.5.1`)
- "11.8.0"
- "12.0.1"
- "12.5.1"
PYTHON_VER:
- "3.10"
- "3.11"
- "3.12"
8 changes: 4 additions & 4 deletions raft-ann-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/raft-ann-bench:24.10a-cuda11.8-py3.11 \
rapidsai/raft-ann-bench:24.10a-cuda12.5-py3.12 \
"--dataset deep-image-96-angular" \
"--normalize" \
"--algorithms raft_cagra" \
Expand All @@ -50,7 +50,7 @@ export DATA_FOLDER=path/to/store/results/and/data # <- Results and datasets will
docker run --gpus all --rm -it \
-v $DATA_FOLDER:/home/rapids/benchmarks \ # <- local folder to store datasets and results
-u $(id -u) \ # <- this flag allows the container to use the host user for permissions
rapidsai/raft-ann-bench:24.10a-cuda11.8-py3.11 \ # <- image to use, either `raft-ann-bench` or `raft-ann-bench-datasets`
rapidsai/raft-ann-bench:24.10a-cuda12.5-py3.12 \ # <- image to use, either `raft-ann-bench` or `raft-ann-bench-datasets`
"--dataset deep-image-96-angular" \ # <- dataset name
"--normalize" \ # <- whether to normalize the dataset, leave string empty ("") to not normalize.
"--algorithms raft_cagra" \ # <- what algorithm(s) to use as a ; separated list, as well as any other argument to pass to `raft_ann_benchmarks.run`
Expand All @@ -63,7 +63,7 @@ export DATA_FOLDER=path/to/store/results/and/data
docker run all --rm -it \
-v $DATA_FOLDER:/home/rapids/benchmarks \
-u $(id -u) \ # <- this flag allows the container to use the host user for permissions
rapidsai/raft-ann-bench-cpu:24.10a-py3.11 \
rapidsai/raft-ann-bench-cpu:24.10a-py3.12 \
"--dataset deep-image-96-angular" \
"--normalize" \
"--algorithms raft_cagra" \
Expand All @@ -77,7 +77,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/raft-ann-bench:24.10a-cuda11.8-py3.11 \
rapidsai/raft-ann-bench:24.10a-cuda12.5-py3.12 \
--entrypoint /bin/bash
```

Expand Down
4 changes: 2 additions & 2 deletions raft-ann-bench/cpu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG PYTHON_VER=3.11
ARG RAPIDS_VER=24.10
ARG PYTHON_VER=unset
ARG RAPIDS_VER=unset

FROM condaforge/mambaforge:23.3.1-0 AS raft-ann-bench-cpu
ARG RAPIDS_VER
Expand Down
8 changes: 4 additions & 4 deletions raft-ann-bench/gpu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# syntax=docker/dockerfile:1

ARG CUDA_VER=12.0.1
ARG PYTHON_VER=3.11
ARG LINUX_VER=ubuntu22.04
ARG CUDA_VER=unset
ARG PYTHON_VER=unset
ARG LINUX_VER=unset

ARG RAPIDS_VER=24.10
ARG RAPIDS_VER=unset

FROM rapidsai/miniforge-cuda:cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER} AS raft-ann-bench
ARG CUDA_VER
Expand Down

0 comments on commit 75eae84

Please sign in to comment.