Merge branch 'branch-24.04' into test-cuda-12.2

VERSION

@@ -1 +1 @@
-24.02.00
+24.04.00

ci/build_docs.sh

@@ -23,7 +23,7 @@ rapids-mamba-retry install \
     --channel "${PYTHON_CHANNEL}" \
     dask-cuda
 
-export RAPIDS_VERSION_NUMBER="24.02"
+export RAPIDS_VERSION_NUMBER="24.04"
 export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
 rapids-logger "Build Python docs"

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
 

conda/environments/all_cuda-114_arch-x86_64.yaml

@@ -10,10 +10,10 @@ dependencies:
 - click >=8.1
 - cuda-version=11.4
 - cudatoolkit
-- cudf==24.2.*
-- dask-cudf==24.2.*
-- distributed-ucxx==0.36.*
-- kvikio==24.2.*
+- cudf==24.4.*
+- dask-cudf==24.4.*
+- distributed-ucxx==0.37.*
+- kvikio==24.4.*
 - numactl-devel-cos7-x86_64
 - numba>=0.57
 - numpy>=1.21
@@ -24,13 +24,13 @@ dependencies:
 - pytest
 - pytest-cov
 - python>=3.9,<3.11
-- rapids-dask-dependency==24.2.*
+- rapids-dask-dependency==24.4.*
 - setuptools>=64.0.0
 - sphinx
 - sphinx-click>=2.7.1
 - sphinx-rtd-theme>=0.5.1
 - ucx-proc=*=gpu
-- ucx-py==0.36.*
-- ucxx==0.36.*
+- ucx-py==0.37.*
+- ucxx==0.37.*
 - zict>=2.0.0
 name: all_cuda-114_arch-x86_64

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -10,10 +10,10 @@ dependencies:
 - click >=8.1
 - cuda-version=11.8
 - cudatoolkit
-- cudf==24.2.*
-- dask-cudf==24.2.*
-- distributed-ucxx==0.36.*
-- kvikio==24.2.*
+- cudf==24.4.*
+- dask-cudf==24.4.*
+- distributed-ucxx==0.37.*
+- kvikio==24.4.*
 - numactl-devel-cos7-x86_64
 - numba>=0.57
 - numpy>=1.21
@@ -24,13 +24,13 @@ dependencies:
 - pytest
 - pytest-cov
 - python>=3.9,<3.11
-- rapids-dask-dependency==24.2.*
+- rapids-dask-dependency==24.4.*
 - setuptools>=64.0.0
 - sphinx
 - sphinx-click>=2.7.1
 - sphinx-rtd-theme>=0.5.1
 - ucx-proc=*=gpu
-- ucx-py==0.36.*
-- ucxx==0.36.*
+- ucx-py==0.37.*
+- ucxx==0.37.*
 - zict>=2.0.0
 name: all_cuda-118_arch-x86_64

conda/environments/all_cuda-122_arch-x86_64.yaml

@@ -25,13 +25,13 @@ dependencies:
 - pytest
 - pytest-cov
 - python>=3.9,<3.11
-- rapids-dask-dependency==24.2.*
+- rapids-dask-dependency==24.4.*
 - setuptools>=64.0.0
 - sphinx
 - sphinx-click>=2.7.1
 - sphinx-rtd-theme>=0.5.1
 - ucx-proc=*=gpu
-- ucx-py==0.36.*
-- ucxx==0.36.*
+- ucx-py==0.37.*
+- ucxx==0.37.*
 - zict>=2.0.0
 name: all_cuda-122_arch-x86_64

dask_cuda/get_device_memory_objects.py

@@ -124,6 +124,10 @@ def get_device_memory_objects_cudf_index(obj):
     def get_device_memory_objects_cudf_multiindex(obj):
         return dispatch(obj._columns)
 
+    @dispatch.register(cudf.core.column.ColumnBase)
+    def get_device_memory_objects_cudf_column(obj):
+        return dispatch(obj.data) + dispatch(obj.children) + dispatch(obj.mask)
+
 
 @sizeof.register_lazy("cupy")
 def register_cupy():  # NB: this overwrites dask.sizeof.register_cupy()

dask_cuda/tests/test_proxify_host_file.py

@@ -302,13 +302,24 @@ def test_dataframes_share_dev_mem(root_dir):
 def test_cudf_get_device_memory_objects():
     cudf = pytest.importorskip("cudf")
     objects = [
-        cudf.DataFrame({"a": range(10), "b": range(10)}, index=reversed(range(10))),
+        cudf.DataFrame(
+            {"a": [0, 1, 2, 3, None, 5, 6, 7, 8, 9], "b": range(10)},
+            index=reversed(range(10)),
+        ),
         cudf.MultiIndex(
             levels=[[1, 2], ["blue", "red"]], codes=[[0, 0, 1, 1], [1, 0, 1, 0]]
         ),
     ]
     res = get_device_memory_ids(objects)
-    assert len(res) == 4, "We expect four buffer objects"
+    # Buffers are:
+    # 1. int data for objects[0].a
+    # 2. mask data for objects[0].a
+    # 3. int data for objects[0].b
+    # 4. int data for objects[0].index
+    # 5. int data for objects[1].levels[0]
+    # 6. char data for objects[1].levels[1]
+    # 7. offset data for objects[1].levels[1]
+    assert len(res) == 7, "We expect seven buffer objects"
 
 
 def test_externals(root_dir):

dependencies.yaml

@@ -152,23 +152,23 @@ dependencies:
           - numpy>=1.21
           - pandas>=1.3,<1.6.0.dev0
           - pynvml>=11.0.0,<11.5
-          - rapids-dask-dependency==24.2.*
+          - rapids-dask-dependency==24.4.*
           - zict>=2.0.0
   test_python:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - cudf==24.2.*
-          - dask-cudf==24.2.*
-          - kvikio==24.2.*
+          - cudf==24.4.*
+          - dask-cudf==24.4.*
+          - kvikio==24.4.*
           - pytest
           - pytest-cov
-          - ucx-py==0.36.*
+          - ucx-py==0.37.*
       - output_types: [conda]
         packages:
-          - distributed-ucxx==0.36.*
+          - distributed-ucxx==0.37.*
           - ucx-proc=*=gpu
-          - ucxx==0.36.*
+          - ucxx==0.37.*
     specific:
       - output_types: conda
         matrices:

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "numpy>=1.21",
     "pandas>=1.3,<1.6.0.dev0",
     "pynvml>=11.0.0,<11.5",
-    "rapids-dask-dependency==24.2.*",
+    "rapids-dask-dependency==24.4.*",
     "zict>=2.0.0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
@@ -49,12 +49,12 @@ docs = [
     "sphinx-rtd-theme>=0.5.1",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
 test = [
-    "cudf==24.2.*",
-    "dask-cudf==24.2.*",
-    "kvikio==24.2.*",
+    "cudf==24.4.*",
+    "dask-cudf==24.4.*",
+    "kvikio==24.4.*",
     "pytest",
     "pytest-cov",
-    "ucx-py==0.36.*",
+    "ucx-py==0.37.*",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [project.urls]