From b983143ce63a21477005864983cbccf6dbcb7d3c Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 11 Oct 2024 16:04:18 -0500
Subject: [PATCH 01/25] test wheel-build sccache fixes

---
 .github/workflows/pr.yaml | 95 +--------------------------------------
 ci/build_wheel.sh         |  4 ++
 2 files changed, 5 insertions(+), 94 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 5f1278333..69543faa8 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,80 +12,12 @@ concurrency:
 jobs:
   pr-builder:
     needs:
-      - checks
-      - conda-cpp-build
-      - conda-cpp-checks
-      - conda-cpp-tests
-      - conda-python-build
-      - conda-python-tests
-      - conda-notebook-tests
-      - docs-build
       - wheel-build-cuspatial
       - wheel-build-libcuspatial
-      - wheel-tests-cuspatial
       - wheel-build-cuproj
-      - wheel-tests-cuproj
-      - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
-  checks:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
-    with:
-      enable_check_generated_files: false
-  conda-cpp-build:
-    needs: checks
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-cpp-checks:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      enable_check_symbols: true
-  conda-cpp-tests:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-build:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-notebook-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/test_notebooks.sh"
-  docs-build:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
-    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
@@ -94,40 +26,15 @@ jobs:
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
   wheel-build-cuspatial:
-    needs: [checks, wheel-build-libcuspatial]
+    needs: [wheel-build-libcuspatial]
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuspatial.sh
-  wheel-tests-cuspatial:
-    needs: wheel-build-cuspatial
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuspatial.sh
   wheel-build-cuproj:
-    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuproj.sh
-  wheel-tests-cuproj:
-    needs: [wheel-build-cuspatial, wheel-build-cuproj]
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuproj.sh
-  devcontainer:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
-    with:
-      arch: '["amd64"]'
-      cuda: '["12.5"]'
-      build_command: |
-        sccache -z;
-        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
-        sccache -s;
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 75328d272..a6f37f0ff 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -44,3 +44,7 @@ python -m auditwheel repair \
     dist/*
 
 RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 "${package_type}" final_dist
+
+sccache \
+  --show-stats \
+  --show-adv-stats

From 9e2ceef004844cad18c24d930e41fc34cf831594 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 11 Oct 2024 16:15:53 -0500
Subject: [PATCH 02/25] fiddle with options

---
 ci/build_wheel.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index a6f37f0ff..083962d22 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -46,5 +46,7 @@ python -m auditwheel repair \
 RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 "${package_type}" final_dist
 
 sccache \
-  --show-stats \
+  --show-stats
+
+sccache \
   --show-adv-stats

From 8c747f5240345001ffa66d67811c65f120906fdc Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 11 Oct 2024 16:23:35 -0500
Subject: [PATCH 03/25] run fewer build jobs

---
 .github/workflows/pr.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 69543faa8..f39dd1167 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -21,10 +21,10 @@ jobs:
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
-      # build for every combination of arch and CUDA version, but only for the latest Python
-      matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
+      # This selects the latest supported Python + CUDA
+      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
   wheel-build-cuspatial:
     needs: [wheel-build-libcuspatial]
     secrets: inherit
@@ -32,9 +32,13 @@ jobs:
     with:
       build_type: pull-request
       script: ci/build_wheel_cuspatial.sh
+      # This selects the latest supported Python + CUDA
+      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
   wheel-build-cuproj:
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuproj.sh
+      # This selects the latest supported Python + CUDA
+      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]

From 7cf37ee451b25e6b3e1d4a79c6c4e151b2b6d6e1 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 11 Oct 2024 15:13:44 -0700
Subject: [PATCH 04/25] build with --no-build-isolation

---
 ci/build_wheel.sh | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 083962d22..385a5da20 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -35,7 +35,37 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
 cd "${package_dir}"
 
-python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check
+rapids-logger "Generating build requirements"
+declare -r matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
+
+rapids-dependency-file-generator \
+  --output requirements \
+  --file-key "py_build_${package_name}" \
+  --matrix "${matrix_selectors}" \
+| tee /tmp/requirements-build.txt
+
+rapids-dependency-file-generator \
+  --output requirements \
+  --file-key "py_rapids_build_${package_name}" \
+  --matrix "${matrix_selectors}" \
+| tee -a /tmp/requirements-build.txt
+
+rapids-logger "Installing build requirements"
+python -m pip install \
+    -v \
+    --prefer-binary \
+    -r /tmp/requirements-build.txt
+
+rapids-logger "Building '${package_name}' wheel"
+python -m pip wheel \
+    -w dist \
+    -v \
+    --no-build-isolation \
+    --no-deps \
+    --disable-pip-version-check \
+    .
+
+sccache --show-adv-stats
 
 mkdir -p final_dist
 python -m auditwheel repair \
@@ -44,9 +74,3 @@ python -m auditwheel repair \
     dist/*
 
 RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 "${package_type}" final_dist
-
-sccache \
-  --show-stats
-
-sccache \
-  --show-adv-stats

From 4477b70597cc70062a98a1ede3675645579dff89 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 11 Oct 2024 15:25:44 -0700
Subject: [PATCH 05/25] paths

---
 ci/build_wheel.sh           | 12 +++++++++++-
 ci/build_wheel_cuspatial.sh | 11 -----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 385a5da20..80685c6a8 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -33,7 +33,14 @@ rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-cd "${package_dir}"
+touch /tmp/build-constraints.txt
+
+if [[ "${package_name}" == "cuspatial" ]]; then
+  # Downloads libcuspatial wheel from this current build,
+  # then ensures 'cuspatial' wheel builds always use the 'libcuspatial' just built in the same CI run.
+  RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuspatial_dist
+  echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" > /tmp/constraints-build.txt
+fi
 
 rapids-logger "Generating build requirements"
 declare -r matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
@@ -54,8 +61,11 @@ rapids-logger "Installing build requirements"
 python -m pip install \
     -v \
     --prefer-binary \
+    --constraint /tmp/constraints-build.txt \
     -r /tmp/requirements-build.txt
 
+cd "${package_dir}"
+
 rapids-logger "Building '${package_name}' wheel"
 python -m pip wheel \
     -w dist \
diff --git a/ci/build_wheel_cuspatial.sh b/ci/build_wheel_cuspatial.sh
index e581a3e76..171bfa6a4 100755
--- a/ci/build_wheel_cuspatial.sh
+++ b/ci/build_wheel_cuspatial.sh
@@ -3,15 +3,4 @@
 
 set -euo pipefail
 
-RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
-
-# Downloads libcuspatial wheel from this current build,
-# then ensures 'cuspatial' wheel builds always use the 'libcuspatial' just built in the same CI run.
-#
-# Using env variable PIP_CONSTRAINT is necessary to ensure the constraints
-# are used when creating the isolated build environment.
-RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuspatial_dist
-echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" > /tmp/constraints.txt
-export PIP_CONSTRAINT="/tmp/constraints.txt"
-
 ci/build_wheel.sh cuspatial python/cuspatial python

From d6f05c64839b0ff9f67230c418642571e1533a43 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 11 Oct 2024 15:38:35 -0700
Subject: [PATCH 06/25] more paths

---
 ci/build_wheel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 80685c6a8..f595d16a4 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -33,7 +33,7 @@ rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-touch /tmp/build-constraints.txt
+touch /tmp/constraints-build.txt
 
 if [[ "${package_name}" == "cuspatial" ]]; then
   # Downloads libcuspatial wheel from this current build,

From 6c64e737db75d29c8c11f83e0914d7bc09c4a102 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 11 Oct 2024 17:51:50 -0500
Subject: [PATCH 07/25] restore all CI

---
 .github/workflows/pr.yaml | 103 +++++++++++++++++++++++++++++++++++---
 1 file changed, 96 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index f39dd1167..5f1278333 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,33 +12,122 @@ concurrency:
 jobs:
   pr-builder:
     needs:
+      - checks
+      - conda-cpp-build
+      - conda-cpp-checks
+      - conda-cpp-tests
+      - conda-python-build
+      - conda-python-tests
+      - conda-notebook-tests
+      - docs-build
       - wheel-build-cuspatial
       - wheel-build-libcuspatial
+      - wheel-tests-cuspatial
       - wheel-build-cuproj
+      - wheel-tests-cuproj
+      - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
+  checks:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
+    with:
+      enable_check_generated_files: false
+  conda-cpp-build:
+    needs: checks
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-cpp-checks:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      enable_check_symbols: true
+  conda-cpp-tests:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-build:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-notebook-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/test_notebooks.sh"
+  docs-build:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
+    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
+      # build for every combination of arch and CUDA version, but only for the latest Python
+      matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
-      # This selects the latest supported Python + CUDA
-      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
   wheel-build-cuspatial:
-    needs: [wheel-build-libcuspatial]
+    needs: [checks, wheel-build-libcuspatial]
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuspatial.sh
-      # This selects the latest supported Python + CUDA
-      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
+  wheel-tests-cuspatial:
+    needs: wheel-build-cuspatial
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      script: ci/test_wheel_cuspatial.sh
   wheel-build-cuproj:
+    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuproj.sh
-      # This selects the latest supported Python + CUDA
-      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
+  wheel-tests-cuproj:
+    needs: [wheel-build-cuspatial, wheel-build-cuproj]
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      script: ci/test_wheel_cuproj.sh
+  devcontainer:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
+    with:
+      arch: '["amd64"]'
+      cuda: '["12.5"]'
+      build_command: |
+        sccache -z;
+        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
+        sccache -s;

From cbfaf85fc497d40271a678949f9584db5f8a8d38 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 14 Oct 2024 08:22:02 -0700
Subject: [PATCH 08/25] only pre-install build backend

---
 ci/build_wheel.sh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index f595d16a4..66acafe20 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -33,36 +33,31 @@ rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-touch /tmp/constraints-build.txt
+# Using env variable PIP_CONSTRAINT is necessary to ensure the constraints
+# are used when installing build dependencies.
+export PIP_CONSTRAINT="/tmp/constraints.txt"
+touch "${PIP_CONSTRAINT}"
 
 if [[ "${package_name}" == "cuspatial" ]]; then
   # Downloads libcuspatial wheel from this current build,
   # then ensures 'cuspatial' wheel builds always use the 'libcuspatial' just built in the same CI run.
   RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuspatial_dist
-  echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" > /tmp/constraints-build.txt
+  echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" >> "${PIP_CONSTRAINT}"
 fi
 
-rapids-logger "Generating build requirements"
+rapids-logger "Generating build backend requirements"
 declare -r matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
 
 rapids-dependency-file-generator \
   --output requirements \
   --file-key "py_build_${package_name}" \
   --matrix "${matrix_selectors}" \
-| tee /tmp/requirements-build.txt
+| tee /tmp/requirements-build-backend.txt
 
-rapids-dependency-file-generator \
-  --output requirements \
-  --file-key "py_rapids_build_${package_name}" \
-  --matrix "${matrix_selectors}" \
-| tee -a /tmp/requirements-build.txt
-
-rapids-logger "Installing build requirements"
+rapids-logger "Installing build backend requirements"
 python -m pip install \
     -v \
-    --prefer-binary \
-    --constraint /tmp/constraints-build.txt \
-    -r /tmp/requirements-build.txt
+    -r /tmp/requirements-build-backend.txt
 
 cd "${package_dir}"
 
@@ -71,7 +66,6 @@ python -m pip wheel \
     -w dist \
     -v \
     --no-build-isolation \
-    --no-deps \
     --disable-pip-version-check \
     .
 

From 8256e35c50098c536cb02c680819f388f1a21591 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 14 Oct 2024 08:23:47 -0700
Subject: [PATCH 09/25] only run wheel builds

---
 .github/workflows/pr.yaml | 94 +--------------------------------------
 1 file changed, 1 insertion(+), 93 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 5f1278333..4aad08ca1 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,80 +12,12 @@ concurrency:
 jobs:
   pr-builder:
     needs:
-      - checks
-      - conda-cpp-build
-      - conda-cpp-checks
-      - conda-cpp-tests
-      - conda-python-build
-      - conda-python-tests
-      - conda-notebook-tests
-      - docs-build
       - wheel-build-cuspatial
       - wheel-build-libcuspatial
-      - wheel-tests-cuspatial
       - wheel-build-cuproj
-      - wheel-tests-cuproj
-      - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
-  checks:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
-    with:
-      enable_check_generated_files: false
-  conda-cpp-build:
-    needs: checks
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-cpp-checks:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      enable_check_symbols: true
-  conda-cpp-tests:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-build:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-notebook-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/test_notebooks.sh"
-  docs-build:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
-    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
@@ -94,19 +26,12 @@ jobs:
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
   wheel-build-cuspatial:
-    needs: [checks, wheel-build-libcuspatial]
+    needs: [wheel-build-libcuspatial]
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuspatial.sh
-  wheel-tests-cuspatial:
-    needs: wheel-build-cuspatial
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuspatial.sh
   wheel-build-cuproj:
     needs: checks
     secrets: inherit
@@ -114,20 +39,3 @@ jobs:
     with:
       build_type: pull-request
       script: ci/build_wheel_cuproj.sh
-  wheel-tests-cuproj:
-    needs: [wheel-build-cuspatial, wheel-build-cuproj]
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuproj.sh
-  devcontainer:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
-    with:
-      arch: '["amd64"]'
-      cuda: '["12.5"]'
-      build_command: |
-        sccache -z;
-        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
-        sccache -s;

From 28e34ebbaa342b54aaa4cf5d6a99de7b8ca60fcb Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 14 Oct 2024 08:26:01 -0700
Subject: [PATCH 10/25] GHA fix

---
 .github/workflows/pr.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 4aad08ca1..69543faa8 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -33,7 +33,6 @@ jobs:
       build_type: pull-request
       script: ci/build_wheel_cuspatial.sh
   wheel-build-cuproj:
-    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:

From 8251aaa2081a09ce47e6423422a02d610a1623e7 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 14 Oct 2024 08:46:57 -0700
Subject: [PATCH 11/25] go back to installing everything

---
 ci/build_wheel.sh | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 66acafe20..f595d16a4 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -33,31 +33,36 @@ rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-# Using env variable PIP_CONSTRAINT is necessary to ensure the constraints
-# are used when installing build dependencies.
-export PIP_CONSTRAINT="/tmp/constraints.txt"
-touch "${PIP_CONSTRAINT}"
+touch /tmp/constraints-build.txt
 
 if [[ "${package_name}" == "cuspatial" ]]; then
   # Downloads libcuspatial wheel from this current build,
   # then ensures 'cuspatial' wheel builds always use the 'libcuspatial' just built in the same CI run.
   RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuspatial_dist
-  echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" >> "${PIP_CONSTRAINT}"
+  echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" > /tmp/constraints-build.txt
 fi
 
-rapids-logger "Generating build backend requirements"
+rapids-logger "Generating build requirements"
 declare -r matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
 
 rapids-dependency-file-generator \
   --output requirements \
   --file-key "py_build_${package_name}" \
   --matrix "${matrix_selectors}" \
-| tee /tmp/requirements-build-backend.txt
+| tee /tmp/requirements-build.txt
 
-rapids-logger "Installing build backend requirements"
+rapids-dependency-file-generator \
+  --output requirements \
+  --file-key "py_rapids_build_${package_name}" \
+  --matrix "${matrix_selectors}" \
+| tee -a /tmp/requirements-build.txt
+
+rapids-logger "Installing build requirements"
 python -m pip install \
     -v \
-    -r /tmp/requirements-build-backend.txt
+    --prefer-binary \
+    --constraint /tmp/constraints-build.txt \
+    -r /tmp/requirements-build.txt
 
 cd "${package_dir}"
 
@@ -66,6 +71,7 @@ python -m pip wheel \
     -w dist \
     -v \
     --no-build-isolation \
+    --no-deps \
     --disable-pip-version-check \
     .
 

From 130e7617e432de4f154457e02a624ffaa2a770bc Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 14 Oct 2024 08:49:12 -0700
Subject: [PATCH 12/25] re-enable all CI

---
 .github/workflows/pr.yaml | 95 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 94 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 69543faa8..5f1278333 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,12 +12,80 @@ concurrency:
 jobs:
   pr-builder:
     needs:
+      - checks
+      - conda-cpp-build
+      - conda-cpp-checks
+      - conda-cpp-tests
+      - conda-python-build
+      - conda-python-tests
+      - conda-notebook-tests
+      - docs-build
       - wheel-build-cuspatial
       - wheel-build-libcuspatial
+      - wheel-tests-cuspatial
       - wheel-build-cuproj
+      - wheel-tests-cuproj
+      - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
+  checks:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
+    with:
+      enable_check_generated_files: false
+  conda-cpp-build:
+    needs: checks
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-cpp-checks:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      enable_check_symbols: true
+  conda-cpp-tests:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-build:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-notebook-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/test_notebooks.sh"
+  docs-build:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
+    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
@@ -26,15 +94,40 @@ jobs:
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
   wheel-build-cuspatial:
-    needs: [wheel-build-libcuspatial]
+    needs: [checks, wheel-build-libcuspatial]
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuspatial.sh
+  wheel-tests-cuspatial:
+    needs: wheel-build-cuspatial
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      script: ci/test_wheel_cuspatial.sh
   wheel-build-cuproj:
+    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: ci/build_wheel_cuproj.sh
+  wheel-tests-cuproj:
+    needs: [wheel-build-cuspatial, wheel-build-cuproj]
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      script: ci/test_wheel_cuproj.sh
+  devcontainer:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
+    with:
+      arch: '["amd64"]'
+      cuda: '["12.5"]'
+      build_command: |
+        sccache -z;
+        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
+        sccache -s;

From 29b005edb4d96a826ce8e6b03cabcb6ab5998124 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 14 Oct 2024 17:10:30 -0500
Subject: [PATCH 13/25] move PIP_CONSTRAINT stuff back, remove 'declare'

---
 ci/build_wheel.sh           | 12 +-----------
 ci/build_wheel_cuspatial.sh | 11 +++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index f595d16a4..91a2836b6 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -33,17 +33,8 @@ rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-touch /tmp/constraints-build.txt
-
-if [[ "${package_name}" == "cuspatial" ]]; then
-  # Downloads libcuspatial wheel from this current build,
-  # then ensures 'cuspatial' wheel builds always use the 'libcuspatial' just built in the same CI run.
-  RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuspatial_dist
-  echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" > /tmp/constraints-build.txt
-fi
-
 rapids-logger "Generating build requirements"
-declare -r matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
+matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
 
 rapids-dependency-file-generator \
   --output requirements \
@@ -61,7 +52,6 @@ rapids-logger "Installing build requirements"
 python -m pip install \
     -v \
     --prefer-binary \
-    --constraint /tmp/constraints-build.txt \
     -r /tmp/requirements-build.txt
 
 cd "${package_dir}"
diff --git a/ci/build_wheel_cuspatial.sh b/ci/build_wheel_cuspatial.sh
index 171bfa6a4..e581a3e76 100755
--- a/ci/build_wheel_cuspatial.sh
+++ b/ci/build_wheel_cuspatial.sh
@@ -3,4 +3,15 @@
 
 set -euo pipefail
 
+RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
+
+# Downloads libcuspatial wheel from this current build,
+# then ensures 'cuspatial' wheel builds always use the 'libcuspatial' just built in the same CI run.
+#
+# Using env variable PIP_CONSTRAINT is necessary to ensure the constraints
+# are used when creating the isolated build environment.
+RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuspatial_dist
+echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" > /tmp/constraints.txt
+export PIP_CONSTRAINT="/tmp/constraints.txt"
+
 ci/build_wheel.sh cuspatial python/cuspatial python

From cb6b07d6a05f2f2acb1d997158485b404d4aa5aa Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 16 Oct 2024 14:33:12 -0500
Subject: [PATCH 14/25] only use an un-isolated build for libcuspatial

---
 ci/build_wheel.sh              | 22 ----------------------
 ci/build_wheel_libcuspatial.sh | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 91a2836b6..363d10d42 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -33,34 +33,12 @@ rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-rapids-logger "Generating build requirements"
-matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
-
-rapids-dependency-file-generator \
-  --output requirements \
-  --file-key "py_build_${package_name}" \
-  --matrix "${matrix_selectors}" \
-| tee /tmp/requirements-build.txt
-
-rapids-dependency-file-generator \
-  --output requirements \
-  --file-key "py_rapids_build_${package_name}" \
-  --matrix "${matrix_selectors}" \
-| tee -a /tmp/requirements-build.txt
-
-rapids-logger "Installing build requirements"
-python -m pip install \
-    -v \
-    --prefer-binary \
-    -r /tmp/requirements-build.txt
-
 cd "${package_dir}"
 
 rapids-logger "Building '${package_name}' wheel"
 python -m pip wheel \
     -w dist \
     -v \
-    --no-build-isolation \
     --no-deps \
     --disable-pip-version-check \
     .
diff --git a/ci/build_wheel_libcuspatial.sh b/ci/build_wheel_libcuspatial.sh
index 742a58caa..010ab1c32 100755
--- a/ci/build_wheel_libcuspatial.sh
+++ b/ci/build_wheel_libcuspatial.sh
@@ -3,4 +3,28 @@
 
 set -euo pipefail
 
+rapids-logger "Generating build requirements"
+matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
+
+rapids-dependency-file-generator \
+  --output requirements \
+  --file-key "py_build_${package_name}" \
+  --matrix "${matrix_selectors}" \
+| tee /tmp/requirements-build.txt
+
+rapids-dependency-file-generator \
+  --output requirements \
+  --file-key "py_rapids_build_${package_name}" \
+  --matrix "${matrix_selectors}" \
+| tee -a /tmp/requirements-build.txt
+
+rapids-logger "Installing build requirements"
+python -m pip install \
+    -v \
+    --prefer-binary \
+    -r /tmp/requirements-build.txt
+
+# build with '--no-build-isolation', for better sccache hit rate
+export PIP_NO_BUILD_ISOLATION=true
+
 ci/build_wheel.sh libcuspatial python/libcuspatial cpp

From f59a0678d788f3592976cab660af62f1ec2d0932 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 10:37:18 -0500
Subject: [PATCH 15/25] test with new rapids-dependency-file-generator

---
 .github/workflows/pr.yaml      | 138 ++++++++++++++++-----------------
 ci/build_wheel_libcuspatial.sh |  15 ++--
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 5f1278333..cf27f895d 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -13,19 +13,19 @@ jobs:
   pr-builder:
     needs:
       - checks
-      - conda-cpp-build
-      - conda-cpp-checks
-      - conda-cpp-tests
-      - conda-python-build
-      - conda-python-tests
-      - conda-notebook-tests
-      - docs-build
+      # - conda-cpp-build
+      # - conda-cpp-checks
+      # - conda-cpp-tests
+      # - conda-python-build
+      # - conda-python-tests
+      # - conda-notebook-tests
+      # - docs-build
       - wheel-build-cuspatial
       - wheel-build-libcuspatial
       - wheel-tests-cuspatial
       - wheel-build-cuproj
       - wheel-tests-cuproj
-      - devcontainer
+      # - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
   checks:
@@ -33,57 +33,57 @@ jobs:
     uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
     with:
       enable_check_generated_files: false
-  conda-cpp-build:
-    needs: checks
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-cpp-checks:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      enable_check_symbols: true
-  conda-cpp-tests:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-build:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-notebook-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/test_notebooks.sh"
-  docs-build:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/build_docs.sh"
+  # conda-cpp-build:
+  #   needs: checks
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
+  #   with:
+  #     build_type: pull-request
+  # conda-cpp-checks:
+  #   needs: conda-cpp-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
+  #   with:
+  #     build_type: pull-request
+  #     enable_check_symbols: true
+  # conda-cpp-tests:
+  #   needs: conda-cpp-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
+  #   with:
+  #     build_type: pull-request
+  # conda-python-build:
+  #   needs: conda-cpp-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
+  #   with:
+  #     build_type: pull-request
+  # conda-python-tests:
+  #   needs: conda-python-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
+  #   with:
+  #     build_type: pull-request
+  # conda-notebook-tests:
+  #   needs: conda-python-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+  #   with:
+  #     build_type: pull-request
+  #     node_type: "gpu-v100-latest-1"
+  #     arch: "amd64"
+  #     container_image: "rapidsai/ci-conda:latest"
+  #     run_script: "ci/test_notebooks.sh"
+  # docs-build:
+  #   needs: conda-python-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+  #   with:
+  #     build_type: pull-request
+  #     node_type: "gpu-v100-latest-1"
+  #     arch: "amd64"
+  #     container_image: "rapidsai/ci-conda:latest"
+  #     run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
     needs: checks
     secrets: inherit
@@ -121,13 +121,13 @@ jobs:
     with:
       build_type: pull-request
       script: ci/test_wheel_cuproj.sh
-  devcontainer:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
-    with:
-      arch: '["amd64"]'
-      cuda: '["12.5"]'
-      build_command: |
-        sccache -z;
-        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
-        sccache -s;
+  # devcontainer:
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
+  #   with:
+  #     arch: '["amd64"]'
+  #     cuda: '["12.5"]'
+  #     build_command: |
+  #       sccache -z;
+  #       build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
+  #       sccache -s;
diff --git a/ci/build_wheel_libcuspatial.sh b/ci/build_wheel_libcuspatial.sh
index 010ab1c32..a3f19a808 100755
--- a/ci/build_wheel_libcuspatial.sh
+++ b/ci/build_wheel_libcuspatial.sh
@@ -3,20 +3,23 @@
 
 set -euo pipefail
 
+git clone \
+  --branch multiple-file-keys \
+  https://github.com/jameslamb/dependency-file-generator.git \
+  /tmp/rapids-dependency-file-generator
+
+pip uninstall --yes rapids-dependency-file-generator
+pip install /tmp/rapids-dependency-file-generator
+
 rapids-logger "Generating build requirements"
 matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
 
 rapids-dependency-file-generator \
   --output requirements \
   --file-key "py_build_${package_name}" \
-  --matrix "${matrix_selectors}" \
-| tee /tmp/requirements-build.txt
-
-rapids-dependency-file-generator \
-  --output requirements \
   --file-key "py_rapids_build_${package_name}" \
   --matrix "${matrix_selectors}" \
-| tee -a /tmp/requirements-build.txt
+| tee /tmp/requirements-build.txt
 
 rapids-logger "Installing build requirements"
 python -m pip install \

From 1199e31d03adcf8e3cb118ebfff0ffcd4a8f24d2 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 10:42:28 -0500
Subject: [PATCH 16/25] enable all CI

---
 .github/workflows/pr.yaml | 138 +++++++++++++++++++-------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index cf27f895d..5f1278333 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -13,19 +13,19 @@ jobs:
   pr-builder:
     needs:
       - checks
-      # - conda-cpp-build
-      # - conda-cpp-checks
-      # - conda-cpp-tests
-      # - conda-python-build
-      # - conda-python-tests
-      # - conda-notebook-tests
-      # - docs-build
+      - conda-cpp-build
+      - conda-cpp-checks
+      - conda-cpp-tests
+      - conda-python-build
+      - conda-python-tests
+      - conda-notebook-tests
+      - docs-build
       - wheel-build-cuspatial
       - wheel-build-libcuspatial
       - wheel-tests-cuspatial
       - wheel-build-cuproj
       - wheel-tests-cuproj
-      # - devcontainer
+      - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
   checks:
@@ -33,57 +33,57 @@ jobs:
     uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
     with:
       enable_check_generated_files: false
-  # conda-cpp-build:
-  #   needs: checks
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
-  #   with:
-  #     build_type: pull-request
-  # conda-cpp-checks:
-  #   needs: conda-cpp-build
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
-  #   with:
-  #     build_type: pull-request
-  #     enable_check_symbols: true
-  # conda-cpp-tests:
-  #   needs: conda-cpp-build
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
-  #   with:
-  #     build_type: pull-request
-  # conda-python-build:
-  #   needs: conda-cpp-build
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
-  #   with:
-  #     build_type: pull-request
-  # conda-python-tests:
-  #   needs: conda-python-build
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
-  #   with:
-  #     build_type: pull-request
-  # conda-notebook-tests:
-  #   needs: conda-python-build
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-  #   with:
-  #     build_type: pull-request
-  #     node_type: "gpu-v100-latest-1"
-  #     arch: "amd64"
-  #     container_image: "rapidsai/ci-conda:latest"
-  #     run_script: "ci/test_notebooks.sh"
-  # docs-build:
-  #   needs: conda-python-build
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-  #   with:
-  #     build_type: pull-request
-  #     node_type: "gpu-v100-latest-1"
-  #     arch: "amd64"
-  #     container_image: "rapidsai/ci-conda:latest"
-  #     run_script: "ci/build_docs.sh"
+  conda-cpp-build:
+    needs: checks
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-cpp-checks:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      enable_check_symbols: true
+  conda-cpp-tests:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-build:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-notebook-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/test_notebooks.sh"
+  docs-build:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
     needs: checks
     secrets: inherit
@@ -121,13 +121,13 @@ jobs:
     with:
       build_type: pull-request
       script: ci/test_wheel_cuproj.sh
-  # devcontainer:
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
-  #   with:
-  #     arch: '["amd64"]'
-  #     cuda: '["12.5"]'
-  #     build_command: |
-  #       sccache -z;
-  #       build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
-  #       sccache -s;
+  devcontainer:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
+    with:
+      arch: '["amd64"]'
+      cuda: '["12.5"]'
+      build_command: |
+        sccache -z;
+        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
+        sccache -s;

From 5e5422538e35e7f937409b710029ec2e3ab3944d Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 10:48:46 -0500
Subject: [PATCH 17/25] shell variable

---
 ci/build_wheel_libcuspatial.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/build_wheel_libcuspatial.sh b/ci/build_wheel_libcuspatial.sh
index a3f19a808..a92be1f34 100755
--- a/ci/build_wheel_libcuspatial.sh
+++ b/ci/build_wheel_libcuspatial.sh
@@ -3,6 +3,8 @@
 
 set -euo pipefail
 
+package_name="libcuspatial"
+
 git clone \
   --branch multiple-file-keys \
   https://github.com/jameslamb/dependency-file-generator.git \
@@ -30,4 +32,4 @@ python -m pip install \
 # build with '--no-build-isolation', for better sccache hit rate
 export PIP_NO_BUILD_ISOLATION=true
 
-ci/build_wheel.sh libcuspatial python/libcuspatial cpp
+ci/build_wheel.sh "${package_name}" python/libcuspatial cpp

From 9f979b5932e63768d91eb9ffc52b925e72a71cd9 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 11:21:34 -0500
Subject: [PATCH 18/25] actually turn off build isolation

---
 ci/build_wheel_libcuspatial.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/build_wheel_libcuspatial.sh b/ci/build_wheel_libcuspatial.sh
index a92be1f34..d9f0de441 100755
--- a/ci/build_wheel_libcuspatial.sh
+++ b/ci/build_wheel_libcuspatial.sh
@@ -30,6 +30,7 @@ python -m pip install \
     -r /tmp/requirements-build.txt
 
 # build with '--no-build-isolation', for better sccache hit rate
-export PIP_NO_BUILD_ISOLATION=true
+# 0 really means "add --no-build-isolation" (ref: https://github.com/pypa/pip/issues/5735)
+export PIP_NO_BUILD_ISOLATION=0
 
 ci/build_wheel.sh "${package_name}" python/libcuspatial cpp

From aa62971e5ca703fd5941645a765cb8bfaab58e23 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 11:58:44 -0500
Subject: [PATCH 19/25] more fiddling with PIP_NO_BUILD_ISOLATION

---
 ci/build_wheel_libcuspatial.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci/build_wheel_libcuspatial.sh b/ci/build_wheel_libcuspatial.sh
index d9f0de441..07794f712 100755
--- a/ci/build_wheel_libcuspatial.sh
+++ b/ci/build_wheel_libcuspatial.sh
@@ -30,7 +30,6 @@ python -m pip install \
     -r /tmp/requirements-build.txt
 
 # build with '--no-build-isolation', for better sccache hit rate
-# 0 really means "add --no-build-isolation" (ref: https://github.com/pypa/pip/issues/5735)
-export PIP_NO_BUILD_ISOLATION=0
+export PIP_NO_BUILD_ISOLATION=1
 
 ci/build_wheel.sh "${package_name}" python/libcuspatial cpp

From b4cd177a0f5c30b2659af0f3ffde8593d68214ac Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 12:57:01 -0500
Subject: [PATCH 20/25] ugh ok yeah it really is PIP_NO_BUILD_ISOLATION=0

---
 ci/build_wheel_libcuspatial.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/build_wheel_libcuspatial.sh b/ci/build_wheel_libcuspatial.sh
index 07794f712..d9f0de441 100755
--- a/ci/build_wheel_libcuspatial.sh
+++ b/ci/build_wheel_libcuspatial.sh
@@ -30,6 +30,7 @@ python -m pip install \
     -r /tmp/requirements-build.txt
 
 # build with '--no-build-isolation', for better sccache hit rate
-export PIP_NO_BUILD_ISOLATION=1
+# 0 really means "add --no-build-isolation" (ref: https://github.com/pypa/pip/issues/5735)
+export PIP_NO_BUILD_ISOLATION=0
 
 ci/build_wheel.sh "${package_name}" python/libcuspatial cpp

From 69fa9e8c552d9e5be73529cb8c7606a9470327dd Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 13:48:25 -0500
Subject: [PATCH 21/25] try more libcuspatial builds

---
 .github/workflows/pr.yaml | 111 +++-----------------------------------
 1 file changed, 7 insertions(+), 104 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 5f1278333..c7531a4a5 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,80 +12,11 @@ concurrency:
 jobs:
   pr-builder:
     needs:
-      - checks
-      - conda-cpp-build
-      - conda-cpp-checks
-      - conda-cpp-tests
-      - conda-python-build
-      - conda-python-tests
-      - conda-notebook-tests
-      - docs-build
-      - wheel-build-cuspatial
       - wheel-build-libcuspatial
-      - wheel-tests-cuspatial
-      - wheel-build-cuproj
-      - wheel-tests-cuproj
-      - devcontainer
+      - wheel-build-libcuspatial2
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
-  checks:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
-    with:
-      enable_check_generated_files: false
-  conda-cpp-build:
-    needs: checks
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-cpp-checks:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      enable_check_symbols: true
-  conda-cpp-tests:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-build:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-python-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
-    with:
-      build_type: pull-request
-  conda-notebook-tests:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/test_notebooks.sh"
-  docs-build:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
-    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
@@ -93,41 +24,13 @@ jobs:
       matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
-  wheel-build-cuspatial:
-    needs: [checks, wheel-build-libcuspatial]
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      script: ci/build_wheel_cuspatial.sh
-  wheel-tests-cuspatial:
-    needs: wheel-build-cuspatial
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuspatial.sh
-  wheel-build-cuproj:
-    needs: checks
+  wheel-build-libcuspatial2:
+    needs: wheel-build-libcuspatial
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
+      # build for every combination of arch and CUDA version, but only for the latest Python
+      matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
       build_type: pull-request
-      script: ci/build_wheel_cuproj.sh
-  wheel-tests-cuproj:
-    needs: [wheel-build-cuspatial, wheel-build-cuproj]
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuproj.sh
-  devcontainer:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
-    with:
-      arch: '["amd64"]'
-      cuda: '["12.5"]'
-      build_command: |
-        sccache -z;
-        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
-        sccache -s;
+      script: ci/build_wheel_libcuspatial.sh
+

From 8b841c26c5ba048f2028bb36b4e594fecc44d880 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 17 Oct 2024 14:03:43 -0500
Subject: [PATCH 22/25] restore all CI

---
 .github/workflows/pr.yaml | 111 +++++++++++++++++++++++++++++++++++---
 1 file changed, 104 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index c7531a4a5..5f1278333 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,11 +12,80 @@ concurrency:
 jobs:
   pr-builder:
     needs:
+      - checks
+      - conda-cpp-build
+      - conda-cpp-checks
+      - conda-cpp-tests
+      - conda-python-build
+      - conda-python-tests
+      - conda-notebook-tests
+      - docs-build
+      - wheel-build-cuspatial
       - wheel-build-libcuspatial
-      - wheel-build-libcuspatial2
+      - wheel-tests-cuspatial
+      - wheel-build-cuproj
+      - wheel-tests-cuproj
+      - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
+  checks:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
+    with:
+      enable_check_generated_files: false
+  conda-cpp-build:
+    needs: checks
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-cpp-checks:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      enable_check_symbols: true
+  conda-cpp-tests:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-build:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-python-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
+    with:
+      build_type: pull-request
+  conda-notebook-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/test_notebooks.sh"
+  docs-build:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
+    needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
@@ -24,13 +93,41 @@ jobs:
       matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
-  wheel-build-libcuspatial2:
-    needs: wheel-build-libcuspatial
+  wheel-build-cuspatial:
+    needs: [checks, wheel-build-libcuspatial]
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
     with:
-      # build for every combination of arch and CUDA version, but only for the latest Python
-      matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
       build_type: pull-request
-      script: ci/build_wheel_libcuspatial.sh
-
+      script: ci/build_wheel_cuspatial.sh
+  wheel-tests-cuspatial:
+    needs: wheel-build-cuspatial
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      script: ci/test_wheel_cuspatial.sh
+  wheel-build-cuproj:
+    needs: checks
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      script: ci/build_wheel_cuproj.sh
+  wheel-tests-cuproj:
+    needs: [wheel-build-cuspatial, wheel-build-cuproj]
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
+    with:
+      build_type: pull-request
+      script: ci/test_wheel_cuproj.sh
+  devcontainer:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
+    with:
+      arch: '["amd64"]'
+      cuda: '["12.5"]'
+      build_command: |
+        sccache -z;
+        build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;
+        sccache -s;

From e5d02b95ddde9b7093be0e88b664a980767c9e1f Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Tue, 22 Oct 2024 09:15:04 -0500
Subject: [PATCH 23/25] use published rapids-dependency-file-generator packages

---
 .pre-commit-config.yaml        | 2 +-
 ci/build_wheel_libcuspatial.sh | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3949b4c3d..bd10e977a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -48,7 +48,7 @@ repos:
             - id: verify-copyright
             - id: verify-alpha-spec
       - repo: https://github.com/rapidsai/dependency-file-generator
-        rev: v1.13.11
+        rev: v1.16.0
         hooks:
             - id: rapids-dependency-file-generator
               args: ["--clean"]
diff --git a/ci/build_wheel_libcuspatial.sh b/ci/build_wheel_libcuspatial.sh
index d9f0de441..ed3822207 100755
--- a/ci/build_wheel_libcuspatial.sh
+++ b/ci/build_wheel_libcuspatial.sh
@@ -5,14 +5,6 @@ set -euo pipefail
 
 package_name="libcuspatial"
 
-git clone \
-  --branch multiple-file-keys \
-  https://github.com/jameslamb/dependency-file-generator.git \
-  /tmp/rapids-dependency-file-generator
-
-pip uninstall --yes rapids-dependency-file-generator
-pip install /tmp/rapids-dependency-file-generator
-
 rapids-logger "Generating build requirements"
 matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
 

From dd7a7a6c1bdcb1ab5f69f467f6d529905351c193 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Tue, 22 Oct 2024 09:39:40 -0500
Subject: [PATCH 24/25] run another build, hopefully with better cache hit rate


From 336bc27bd7afeea439a330ceda11404a36cb4e32 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Tue, 22 Oct 2024 12:55:47 -0500
Subject: [PATCH 25/25] print sccache stats for conda builds

---
 ci/build_cpp.sh    | 4 ++++
 ci/build_python.sh | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
index c23dac174..effab796d 100755
--- a/ci/build_cpp.sh
+++ b/ci/build_cpp.sh
@@ -15,7 +15,11 @@ rapids-print-env
 
 rapids-logger "Begin cpp build"
 
+sccache --zero-stats
+
 RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \
     conda/recipes/libcuspatial
 
+sccache --show-adv-stats
+
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_python.sh b/ci/build_python.sh
index fc1066fc7..e0ff96639 100755
--- a/ci/build_python.sh
+++ b/ci/build_python.sh
@@ -21,6 +21,8 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
 rapids-logger "Begin py build cuSpatial"
 
+sccache --zero-stats
+
 # TODO: Remove `--no-test` flag once importing on a CPU
 # node works correctly
 RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \
@@ -28,8 +30,12 @@ RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \
   --channel "${CPP_CHANNEL}" \
   conda/recipes/cuspatial
 
+sccache --show-adv-stats
+
 rapids-logger "Begin py build cuProj"
 
+sccache --zero-stats
+
 # TODO: Remove `--no-test` flag once importing on a CPU
 # node works correctly
 RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \
@@ -37,4 +43,6 @@ RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \
   --channel "${CPP_CHANNEL}" \
   conda/recipes/cuproj
 
+sccache --show-adv-stats
+
 rapids-upload-conda-to-s3 python