From 45af1ceb08f757d24b543177c3a6f625f800eb60 Mon Sep 17 00:00:00 2001
From: Ray Douglass <ray@raydouglass.com>
Date: Mon, 20 May 2024 17:43:35 -0400
Subject: [PATCH 1/6] DOC v24.08 Updates [skip ci]

---
 Dockerfile                    |  4 ++--
 dockerhub-readme.md           | 10 +++++-----
 raft-ann-bench/README.md      |  8 ++++----
 raft-ann-bench/cpu/Dockerfile |  2 +-
 raft-ann-bench/gpu/Dockerfile |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 52a4647e..37fab11b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG LINUX_DISTRO=ubuntu
 ARG LINUX_DISTRO_VER=22.04
 ARG LINUX_VER=${LINUX_DISTRO}${LINUX_DISTRO_VER}
 
-ARG RAPIDS_VER=24.06
+ARG RAPIDS_VER=24.08
 ARG DASK_SQL_VER=2024.3.0
 
 # Gather dependency information
@@ -127,7 +127,7 @@ LABEL com.nvidia.workbench.application.jupyterlab.webapp.url-cmd="jupyter lab li
 LABEL com.nvidia.workbench.cuda-version="$CUDA_VER"
 LABEL com.nvidia.workbench.description="RAPIDS with CUDA ${CUDA_VER}"
 LABEL com.nvidia.workbench.entrypoint-script="/home/rapids/entrypoint.sh"
-LABEL com.nvidia.workbench.image-version="24.04.00"
+LABEL com.nvidia.workbench.image-version="24.08.00"
 LABEL com.nvidia.workbench.labels="cuda${CUDA_VER}"
 LABEL com.nvidia.workbench.name="RAPIDS with CUDA ${CUDA_VER}"
 LABEL com.nvidia.workbench.os-distro-release="$LINUX_DISTRO_VER"
diff --git a/dockerhub-readme.md b/dockerhub-readme.md
index 9541b992..032df1c1 100644
--- a/dockerhub-readme.md
+++ b/dockerhub-readme.md
@@ -9,7 +9,7 @@ The RAPIDS suite of software libraries gives you the freedom to execute end-to-e
 **NOTE:** Review our [system requirements](https://docs.rapids.ai/install#system-req) to ensure you have a compatible system!
 
 
-### Current Version - RAPIDS v24.06
+### Current Version - RAPIDS v24.08
 
 RAPIDS Libraries included in the images:
 - `cuDF`
@@ -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.06-cuda11.8-py3.11
+24.08-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.06a-cuda11.8-py3.11`)**
+**Note: Nightly builds of the images have the RAPIDS version appended with an `a` (ie `24.08a-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.06-cuda11.8-py3.11
+    rapidsai/notebooks:24.08-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.06-cuda11.8-py3.11
+    rapidsai/base:24.08-cuda11.8-py3.11
 ```
 
 ### Use JupyterLab to Explore the Notebooks
diff --git a/raft-ann-bench/README.md b/raft-ann-bench/README.md
index 56937858..8f611f0c 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.06a-cuda11.8-py3.11 \
+    rapidsai/raft-ann-bench:24.08a-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.06a-cuda11.8-py3.11 \ # <- image to use, either `raft-ann-bench` or `raft-ann-bench-datasets`
+    rapidsai/raft-ann-bench:24.08a-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.06a-py3.11 \
+    rapidsai/raft-ann-bench-cpu:24.08a-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.06a-cuda11.8-py3.11 \
+    rapidsai/raft-ann-bench:24.08a-cuda11.8-py3.11 \
     --entrypoint /bin/bash
 ```
 
diff --git a/raft-ann-bench/cpu/Dockerfile b/raft-ann-bench/cpu/Dockerfile
index 500bb0b7..ca2fb84e 100644
--- a/raft-ann-bench/cpu/Dockerfile
+++ b/raft-ann-bench/cpu/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG PYTHON_VER=3.11
-ARG RAPIDS_VER=24.06
+ARG RAPIDS_VER=24.08
 
 FROM condaforge/mambaforge:23.3.1-0 as raft-ann-bench-cpu
 ARG RAPIDS_VER
diff --git a/raft-ann-bench/gpu/Dockerfile b/raft-ann-bench/gpu/Dockerfile
index c1e93bdf..acbf7c81 100644
--- a/raft-ann-bench/gpu/Dockerfile
+++ b/raft-ann-bench/gpu/Dockerfile
@@ -4,7 +4,7 @@ ARG CUDA_VER=12.0.1
 ARG PYTHON_VER=3.11
 ARG LINUX_VER=ubuntu22.04
 
-ARG RAPIDS_VER=24.06
+ARG RAPIDS_VER=24.08
 
 FROM rapidsai/miniforge-cuda:cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER} as raft-ann-bench
 ARG CUDA_VER

From 01efafd803bab8e1a0b0e189890fb757db7fb920 Mon Sep 17 00:00:00 2001
From: Divye Gala <divyegala@gmail.com>
Date: Fri, 24 May 2024 09:14:59 -0400
Subject: [PATCH 2/6] Change `raft-ann-bench` package name to `raft_ann_bench`
 (#671)

Depends on https://github.com/rapidsai/raft/pull/2333

Authors:
  - Divye Gala (https://github.com/divyegala)

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

URL: https://github.com/rapidsai/docker/pull/671
---
 context/raft-ann-bench/get_datasets.sh             | 14 +++++++-------
 context/raft-ann-bench/run_benchmark.sh            |  8 ++++----
 .../run_benchmarks_preloaded_datasets.sh           |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/context/raft-ann-bench/get_datasets.sh b/context/raft-ann-bench/get_datasets.sh
index dee3e6be..6b728eb3 100755
--- a/context/raft-ann-bench/get_datasets.sh
+++ b/context/raft-ann-bench/get_datasets.sh
@@ -5,10 +5,10 @@ set -eo pipefail
 
 export CONDA_PREFIX=/opt/conda
 
-python -m raft-ann-bench.get_dataset --dataset deep-image-96-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset fashion-mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset glove-50-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset glove-100-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset nytimes-256-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset sift-128-euclidean --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset deep-image-96-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset fashion-mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset glove-50-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset glove-100-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset nytimes-256-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset sift-128-euclidean --dataset-path /home/rapids/preloaded_datasets
diff --git a/context/raft-ann-bench/run_benchmark.sh b/context/raft-ann-bench/run_benchmark.sh
index 6538866f..04d85c6c 100644
--- a/context/raft-ann-bench/run_benchmark.sh
+++ b/context/raft-ann-bench/run_benchmark.sh
@@ -21,7 +21,7 @@ export RUN_ARGS=$3
 export PLOT_ARGS=$4
 
 # (1) prepare dataset.
-python -m raft-ann-bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path /data/benchmarks/datasets
+python -m raft_ann_bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path /data/benchmarks/datasets
 
 if [[ "$DATASET_ARG" == *"angular"* ]]; then
   export DATASET_ARG=${DATASET_ARG/angular/inner}
@@ -30,10 +30,10 @@ if [[ "$DATASET_ARG" == *"angular"* ]]; then
 fi
 
 # (2) build and search index
-python -m raft-ann-bench.run  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets --force ${RUN_ARGS}
+python -m raft_ann_bench.run  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets --force ${RUN_ARGS}
 
 # (3) export data
-python -m raft-ann-bench.data_export  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets
+python -m raft_ann_bench.data_export  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets
 
 # Extract the algorithms from the run command to use in the plot command
 ALGOS=$(grep -oP "algorithms\s+\K(\w+,?\w+)" <<< "$RUN_ARGS")
@@ -44,4 +44,4 @@ fi
 # (4) plot results
 mkdir -p /data/benchmarks/datasets/result
 cd /data/benchmarks/datasets/result
-python -m raft-ann-bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path /data/benchmarks/datasets --build --search
+python -m raft_ann_bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path /data/benchmarks/datasets --build --search
diff --git a/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh b/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh
index bb383ff6..9ef91741 100644
--- a/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh
+++ b/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh
@@ -27,7 +27,7 @@ case $DATASET_ARG in
     export DATASET_PATH=/home/rapids/preloaded_datasets ;;
    *)
     export DATASET_PATH=/data/benchmarks/datasets
-    python -m raft-ann-bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path $DATASET_PATH ;;
+    python -m raft_ann_bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path $DATASET_PATH ;;
 esac
 
 if [[ "$DATASET_ARG" == *"angular"* ]]; then
@@ -37,10 +37,10 @@ if [[ "$DATASET_ARG" == *"angular"* ]]; then
 fi
 
 # (2) build and search index
-python -m raft-ann-bench.run  ${DATASET_ARG} --dataset-path $DATASET_PATH ${RUN_ARGS}
+python -m raft_ann_bench.run  ${DATASET_ARG} --dataset-path $DATASET_PATH ${RUN_ARGS}
 
 # (3) export data
-python -m raft-ann-bench.data_export  ${DATASET_ARG} --dataset-path $DATASET_PATH
+python -m raft_ann_bench.data_export  ${DATASET_ARG} --dataset-path $DATASET_PATH
 
 # Extract the algorithms from the run command to use in the plot command
 ALGOS=$(grep -oP "algorithms\s+\K(\w+,?\w+)" <<< "$RUN_ARGS")
@@ -51,4 +51,4 @@ fi
 # (4) plot results
 mkdir -p $DATASET_PATH/result
 cd $DATASET_PATH/result
-python -m raft-ann-bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path $DATASET_PATH
+python -m raft_ann_bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path $DATASET_PATH

From 812302fb9c8986b2cf1688651b29e5552c8fa0eb Mon Sep 17 00:00:00 2001
From: Till Korten <webmaster@korten.at>
Date: Fri, 24 May 2024 15:19:45 +0200
Subject: [PATCH 3/6] Fix links to docker hub in README.md (#662)

The links to docker hub still pointed to the deprecated images. This pull request updates the links to point to the current images.

Fixes issue #661

Authors:
  - Till Korten (https://github.com/thawn)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: https://github.com/rapidsai/docker/pull/662
---
 CONTRIBUTING.md | 4 ++--
 README.md       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 89559043..af1d5474 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,9 +6,9 @@ Building the images requires `docker` `>=18.09` with [`buildkit`](https://docs.d
 
 ## Building
 
-To build the `notebooks` image with default arguments: `docker buildx build --pull -f Dockerfile -t rapidsai/rapidsai-notebooks context/`
+To build the `notebooks` image with default arguments: `docker buildx build --pull -f Dockerfile -t rapidsai/notebooks context/`
 
-To build just the `base` image with default arguments: `docker buildx build --pull -f Dockerfile -t rapidsai/rapidsai --target=base context/`
+To build just the `base` image with default arguments: `docker buildx build --pull -f Dockerfile -t rapidsai/base --target=base context/`
 
 ### Build arguments
 
diff --git a/README.md b/README.md
index 9e938579..4c675847 100644
--- a/README.md
+++ b/README.md
@@ -5,17 +5,17 @@ This repository contains the end-user docker images for [RAPIDS](https://rapids.
 
 ## Image types
 
-There are two image types: `base` ([`rapidsai/rapidsai`](https://hub.docker.com/r/rapidsai/rapidsai)) and `notebooks` ([`rapidsai/rapidsai-notebooks`](https://hub.docker.com/r/rapidsai/rapidsai-notebooks)).
+There are two image types: `base` ([`rapidsai/base`](https://hub.docker.com/r/rapidsai/base)) and `notebooks` ([`rapidsai/notebooks`](https://hub.docker.com/r/rapidsai/notebooks)).
 
 ### Base image
 
-This image can be found here: https://hub.docker.com/r/rapidsai/rapidsai
+This image can be found here: https://hub.docker.com/r/rapidsai/base
 
 It contains the basic installation of RAPIDS and [`dask-sql`](https://github.com/dask-contrib/dask-sql). By default it starts an `ipython` REPL.
 
 ### Notebooks image
 
-This image can be found here: https://hub.docker.com/r/rapidsai/rapidsai-notebooks
+This image can be found here: https://hub.docker.com/r/rapidsai/notebooks
 
 It extends the `base` images to include RAPIDS notebooks and a [`jupyterlab` server](https://jupyter.org/) which starts automatically.
 

From 952df2505a866d8f74e93f44bcc6f0763fe1d99a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 16:29:04 +0000
Subject: [PATCH 4/6] Update `DASK_SQL_VERSION` to `2024.5.0` (#674)

A new stable dask-sql version has been detected.

Updated all config files and READMEs to use `2024.5.0`.

Authors:
  - https://github.com/apps/github-actions

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: https://github.com/rapidsai/docker/pull/674
---
 Dockerfile  | 2 +-
 matrix.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 52a4647e..41aabdc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG LINUX_DISTRO_VER=22.04
 ARG LINUX_VER=${LINUX_DISTRO}${LINUX_DISTRO_VER}
 
 ARG RAPIDS_VER=24.06
-ARG DASK_SQL_VER=2024.3.0
+ARG DASK_SQL_VER=2024.5.0
 
 # Gather dependency information
 FROM rapidsai/ci-conda:latest AS dependencies
diff --git a/matrix.yaml b/matrix.yaml
index efae8aec..59e62dd6 100644
--- a/matrix.yaml
+++ b/matrix.yaml
@@ -7,4 +7,4 @@ PYTHON_VER:
   - "3.10"
   - "3.11"
 DASK_SQL_VER:
-  - "2024.3.0"
+  - "2024.5.0"

From 76e7227fe13cdfb67f7bf16ee71895f73b45a4f0 Mon Sep 17 00:00:00 2001
From: Ray Douglass <3107146+raydouglass@users.noreply.github.com>
Date: Thu, 6 Jun 2024 12:42:55 -0400
Subject: [PATCH 5/6] Add cuvs to list of libraries (#656)

---
 dockerhub-readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockerhub-readme.md b/dockerhub-readme.md
index 9541b992..bf1c0509 100644
--- a/dockerhub-readme.md
+++ b/dockerhub-readme.md
@@ -15,6 +15,7 @@ RAPIDS Libraries included in the images:
 - `cuDF`
 - `cuML`
 - `cuGraph`
+- `cuVS`
 - `RMM`
 - `RAFT`
 - `cuSpatial`

From 306dbe162db2e768051b01ce3cfd5665248983bb Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Fri, 7 Jun 2024 15:02:05 -0500
Subject: [PATCH 6/6] Adopt packaging codeowners (#682)

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 828ccb36..c7393fe7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-#ops code owners
-*       @rapidsai/ops-codeowners
+# packaging code owners
+* @rapidsai/packaging-codeowners