Merge branch 'branch-24.02' into fix-explicit-pool-size

rapidsai · Jan 15, 2024 · 7ecdc4f · 7ecdc4f
2 parents 592975d + 9b2b723
commit 7ecdc4f
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 32 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -43,7 +43,7 @@ repos:
                 args: ["--config pyproject.toml"]
                 additional_dependencies: ["tomli"]
       - repo: https://github.com/rapidsai/dependency-file-generator
-        rev: v1.5.1
+        rev: v1.8.0
         hooks:
             - id: rapids-dependency-file-generator
               args: ["--clean"]

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -3,7 +3,11 @@
 
 set -euo pipefail
 
-source rapids-env-update
+rapids-configure-conda-channels
+
+source rapids-configure-sccache
+
+source rapids-date-string
 
 export CMAKE_GENERATOR=Ninja
 

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -3,7 +3,11 @@
 
 set -euo pipefail
 
-source rapids-env-update
+rapids-configure-conda-channels
+
+source rapids-configure-sccache
+
+source rapids-date-string
 
 export CMAKE_GENERATOR=Ninja
 

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -8,7 +8,8 @@ files:
     includes:
       - build_cpp
       - build_python
-      - cudatoolkit
+      - cuda
+      - cuda_version
       - develop
       - docs
       - py_version
@@ -23,18 +24,18 @@ files:
   test_cpp:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
   test_python:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - py_version
       - test_python_cuspatial
       - test_python_cuproj
   test_notebooks:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - depends_on_cuml
       - notebooks
       - py_version
@@ -46,7 +47,7 @@ files:
   docs:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - docs
       - py_version
   py_build_cuspatial:
@@ -155,7 +156,6 @@ dependencies:
           - matrix:
               cuda: "12.0"
             packages:
-              - cuda-version=12.0
               - cuda-nvcc
   build_cpp_cuproj:
     common:
@@ -200,7 +200,6 @@ dependencies:
           - matrix:
               cuda: "12.0"
             packages:
-              - cuda-version=12.0
               - cuda-nvcc
   build_python:
     common:
@@ -232,36 +231,43 @@ dependencies:
         packages:
           - wheel
           - setuptools
-  cudatoolkit:
+  cuda_version:
     specific:
       - output_types: conda
         matrices:
           - matrix:
-              cuda: "12.0"
+              cuda: "11.2"
             packages:
-              - cuda-version=12.0
-              - cuda-cudart-dev
-              - cuda-nvrtc-dev
-              - cuda-cupti-dev
+              - cuda-version=11.2
           - matrix:
-              cuda: "11.8"
+              cuda: "11.4"
             packages:
-              - cuda-version=11.8
-              - cudatoolkit
+              - cuda-version=11.4
           - matrix:
               cuda: "11.5"
             packages:
               - cuda-version=11.5
-              - cudatoolkit
           - matrix:
-              cuda: "11.4"
+              cuda: "11.8"
             packages:
-              - cuda-version=11.4
-              - cudatoolkit
+              - cuda-version=11.8
           - matrix:
-              cuda: "11.2"
+              cuda: "12.0"
+            packages:
+              - cuda-version=12.0
+  cuda:
+    specific:
+      - output_types: conda
+        matrices:
+          - matrix:
+              cuda: "12.*"
+            packages:
+              - cuda-cudart-dev
+              - cuda-cupti-dev
+              - cuda-nvrtc-dev
+          - matrix:
+              cuda: "11.*"
             packages:
-              - cuda-version=11.2
               - cudatoolkit
   develop:
     common:

diff --git a/python/cuspatial/cuspatial/core/_column/geocolumn.py b/python/cuspatial/cuspatial/core/_column/geocolumn.py
@@ -8,7 +8,7 @@
 import pyarrow as pa
 
 import cudf
-from cudf.core.column import ColumnBase, arange, as_column, build_list_column
+from cudf.core.column import ColumnBase, as_column, build_list_column
 
 from cuspatial.core._column.geometa import Feature_Enum, GeoMeta
 from cuspatial.utils.column_utils import empty_geometry_column
@@ -364,5 +364,5 @@ def _xy_as_variable_sized_list(xy: ColumnBase):
         raise ValueError("xy must have an even number of elements")
 
     num_points = len(xy) // 2
-    indices = arange(0, num_points * 2 + 1, 2, dtype="int32")
+    indices = as_column(range(0, num_points * 2 + 1, 2), dtype="int32")
     return build_list_column(indices=indices, elements=xy, size=num_points)
diff --git a/python/cuspatial/cuspatial/core/binops/distance_dispatch.py b/python/cuspatial/cuspatial/core/binops/distance_dispatch.py
@@ -1,5 +1,5 @@
 import cudf
-from cudf.core.column import arange, full
+from cudf.core.column import as_column, full
 
 from cuspatial._lib.distance import (
     pairwise_linestring_distance,
@@ -190,8 +190,8 @@ def __call__(self):
             float("nan"),
             dtype="float64",
         )
-        scatter_map = arange(
-            len(self._res_index), dtype="int32"
+        scatter_map = as_column(
+            range(len(self._res_index)), dtype="int32"
         ).apply_boolean_mask(self._non_null_mask)
 
         result[scatter_map] = dist

diff --git a/python/cuspatial/cuspatial/core/binops/intersection.py b/python/cuspatial/cuspatial/core/binops/intersection.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 import cudf
-from cudf.core.column import arange, build_list_column
+from cudf.core.column import as_column, build_list_column
 
 from cuspatial._lib.intersection import (
     pairwise_linestring_intersection as c_pairwise_linestring_intersection,
@@ -93,7 +93,7 @@ def pairwise_linestring_intersection(
     ]
 
     linestring_column = build_list_column(
-        indices=arange(0, len(segments) + 1, dtype="int32"),
+        indices=as_column(range(0, len(segments) + 1), dtype="int32"),
         elements=segments,
         size=len(segments),
     )