Unpin dask and distributed for development and fix merge_labels…

… test (#1574)

This PR unpins `dask` and `distributed` to `>=2023.5.1` for `23.08` development.

xref: rapidsai/cudf#13508

The offending test was using an rmm::device_scalar for some memory that should have been a vector. Not sure how this didn't fail in the past but these changes fix it.

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Corey J. Nolet (https://github.com/cjnolet)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Corey J. Nolet (https://github.com/cjnolet)

URL: #1574

.github/workflows/pr.yaml

@@ -100,7 +100,7 @@ jobs:
       build_type: pull-request
       package-name: raft_dask
       # Always want to test against latest dask/distributed.
-      test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
-      test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
+      test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
+      test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
       test-unittest: "python -m pytest ./python/raft-dask/raft_dask/test"
       test-smoketest: "python ./ci/wheel_smoke_test_raft_dask.py"

.github/workflows/test.yaml

@@ -49,6 +49,6 @@ jobs:
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
       package-name: raft_dask
-      test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
-      test-before-arm64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
+      test-before-amd64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
+      test-before-arm64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
       test-unittest: "python -m pytest ./python/raft-dask/raft_dask/test"

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

@@ -18,10 +18,10 @@ dependencies:
 - cupy>=12.0.0
 - cxx-compiler
 - cython>=0.29,<0.30
-- dask-core==2023.3.2
+- dask-core>=2023.5.1
 - dask-cuda==23.8.*
-- dask==2023.3.2
-- distributed==2023.3.2.1
+- dask>=2023.5.1
+- distributed>=2023.5.1
 - doxygen>=1.8.20
 - gcc_linux-64=11.*
 - gmock>=1.13.0

conda/recipes/raft-dask/meta.yaml

@@ -46,10 +46,10 @@ requirements:
   run:
     - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
     - cuda-python >=11.7.1,<12.0
-    - dask ==2023.3.2
-    - dask-core ==2023.3.2
+    - dask >=2023.5.1
+    - dask-core >=2023.5.1
     - dask-cuda ={{ minor_version }}
-    - distributed ==2023.3.2.1
+    - distributed >=2023.5.1
     - joblib >=0.11
     - nccl >=2.9.9
     - pylibraft {{ version }}

cpp/test/label/merge_labels.cu

@@ -75,7 +75,9 @@ class MergeLabelsTest : public ::testing::TestWithParam<MergeLabelsInputs<Index_
 
   MergeLabelsInputs<Index_> params;
   rmm::device_uvector<Index_> labels_a, labels_b, expected, R;
-  rmm::device_scalar<bool> mask, m;
+  rmm::device_uvector<bool> mask;
+
+  rmm::device_scalar<bool> m;
 };
 
 using MergeLabelsTestI = MergeLabelsTest<int>;

dependencies.yaml

@@ -270,16 +270,16 @@ dependencies:
     common:
       - output_types: [conda, pyproject]
         packages:
-          - dask==2023.3.2
+          - dask>=2023.5.1
           - dask-cuda==23.8.*
-          - distributed==2023.3.2.1
+          - distributed>=2023.5.1
           - joblib>=0.11
           - numba>=0.57
           - *numpy
           - ucx-py==0.33.*
       - output_types: conda
         packages:
-          - dask-core==2023.3.2
+          - dask-core>=2023.5.1
           - ucx>=1.13.0
           - ucx-proc=*=gpu
       - output_types: pyproject

python/raft-dask/pyproject.toml

@@ -35,8 +35,8 @@ license = { text = "Apache 2.0" }
 requires-python = ">=3.9"
 dependencies = [
     "dask-cuda==23.8.*",
-    "dask==2023.3.2",
-    "distributed==2023.3.2.1",
+    "dask>=2023.5.1",
+    "distributed>=2023.5.1",
     "joblib>=0.11",
     "numba>=0.57",
     "numpy>=1.21",