diff --git a/Dockerfile b/Dockerfile index a96b769e..0710819b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG CUDA_VER=12.0.1 -ARG PYTHON_VER=3.10 +ARG PYTHON_VER=3.11 ARG LINUX_VER=ubuntu22.04 ARG RAPIDS_VER=24.04 diff --git a/dockerhub-readme.md b/dockerhub-readme.md index 414bc27f..bd4b863c 100644 --- a/dockerhub-readme.md +++ b/dockerhub-readme.md @@ -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.04-cuda11.8-py3.10 +24.04-cuda11.8-py3.11 ^ ^ ^ | | Python version | | @@ -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.04a-cuda11.8-py3.10`)** +**Note: Nightly builds of the images have the RAPIDS version appended with an `a` (ie `24.04a-cuda11.8-py3.11`)** ## Usage @@ -81,7 +81,7 @@ $ docker run \ -e EXTRA_CONDA_PACKAGES="jq" \ -e EXTRA_PIP_PACKAGES="beautifulsoup4" \ -p 8888:8888 \ - rapidsai/notebooks:24.04-cuda11.8-py3.10 + rapidsai/notebooks:24.04-cuda11.8-py3.11 ``` ### Bind Mounts @@ -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.04-cuda11.8-py3.10 + rapidsai/base:24.04-cuda11.8-py3.11 ``` ### Use JupyterLab to Explore the Notebooks diff --git a/matrix-test.yaml b/matrix-test.yaml index 5588f97b..d57f63a7 100644 --- a/matrix-test.yaml +++ b/matrix-test.yaml @@ -3,11 +3,11 @@ pull-request: - { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' } - { CUDA_VER: '12.0', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' } - - { CUDA_VER: '12.2', ARCH: 'arm64', PYTHON_VER: '3.10', GPU: 'a100', DRIVER: 'latest' } + - { CUDA_VER: '12.2', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' } branch: - { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' } - { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.9', 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.2', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' } - - { CUDA_VER: '12.2', ARCH: 'arm64', PYTHON_VER: '3.10', GPU: 'a100', DRIVER: 'latest' } + - { CUDA_VER: '12.2', ARCH: 'amd64', PYTHON_VER: '3.11', GPU: 'v100', DRIVER: 'latest' } + - { CUDA_VER: '12.2', ARCH: 'arm64', PYTHON_VER: '3.11', GPU: 'a100', DRIVER: 'latest' } diff --git a/matrix.yaml b/matrix.yaml index b5924311..e5ae5620 100644 --- a/matrix.yaml +++ b/matrix.yaml @@ -5,5 +5,6 @@ CUDA_VER: # Should be `..` (e.g. `11.2.2`) PYTHON_VER: - "3.9" - "3.10" + - "3.11" DASK_SQL_VER: - "2024.1.0" diff --git a/raft-ann-bench/README.md b/raft-ann-bench/README.md index 4cc67abf..092073b1 100644 --- a/raft-ann-bench/README.md +++ b/raft-ann-bench/README.md @@ -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.04a-cuda11.8-py3.10 \ + rapidsai/raft-ann-bench:24.04a-cuda11.8-py3.11 \ "--dataset deep-image-96-angular" \ "--normalize" \ "--algorithms raft_cagra" \ @@ -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.04a-cuda11.8-py3.10 \ # <- image to use, either `raft-ann-bench` or `raft-ann-bench-datasets` + rapidsai/raft-ann-bench:24.04a-cuda11.8-py3.11 \ # <- 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` @@ -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.04a-py3.10 \ + rapidsai/raft-ann-bench-cpu:24.04a-py3.11 \ "--dataset deep-image-96-angular" \ "--normalize" \ "--algorithms raft_cagra" \ @@ -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.04a-cuda11.8-py3.10 \ + rapidsai/raft-ann-bench:24.04a-cuda11.8-py3.11 \ --entrypoint /bin/bash ``` diff --git a/raft-ann-bench/cpu/Dockerfile b/raft-ann-bench/cpu/Dockerfile index b0a32cce..51e9df10 100644 --- a/raft-ann-bench/cpu/Dockerfile +++ b/raft-ann-bench/cpu/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VER=3.10 +ARG PYTHON_VER=3.11 ARG RAPIDS_VER=24.04 FROM condaforge/mambaforge:23.3.1-0 as raft-ann-bench-cpu diff --git a/raft-ann-bench/gpu/Dockerfile b/raft-ann-bench/gpu/Dockerfile index dfc99faf..2b1d7c8b 100644 --- a/raft-ann-bench/gpu/Dockerfile +++ b/raft-ann-bench/gpu/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG CUDA_VER=12.0.1 -ARG PYTHON_VER=3.10 +ARG PYTHON_VER=3.11 ARG LINUX_VER=ubuntu22.04 ARG RAPIDS_VER=24.04