Update to UCX-Py 0.24 (#1962)

Authors: - Peter Andreas Entschev (https://github.com/pentschev) - Rick Ratzel (https://github.com/rlratzel) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - Rick Ratzel (https://github.com/rlratzel) URL: #1962
rapidsai · Dec 4, 2021 · 86896ea · 86896ea
1 parent 9ddea03
commit 86896ea
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh
@@ -74,7 +74,7 @@ gpuci_conda_retry install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-for
       "cudatoolkit=$CUDA_REL" \
       "dask-cudf=${MINOR_VERSION}" \
       "dask-cuda=${MINOR_VERSION}" \
-      "ucx-py=0.23.*" \
+      "ucx-py=0.24.*" \
       "ucx-proc=*=gpu" \
       "rapids-build-env=${MINOR_VERSION}" \
       rapids-pytest-benchmark

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -63,7 +63,7 @@ gpuci_mamba_retry install -y \
       "cudatoolkit=$CUDA_REL" \
       "dask-cudf=${MINOR_VERSION}" \
       "dask-cuda=${MINOR_VERSION}" \
-      "ucx-py=0.23.*" \
+      "ucx-py=0.24.*" \
       "ucx-proc=*=gpu" \
       "rapids-build-env=$MINOR_VERSION.*" \
       "rapids-notebook-env=$MINOR_VERSION.*" \

diff --git a/conda/environments/cugraph_dev_cuda11.0.yml b/conda/environments/cugraph_dev_cuda11.0.yml
@@ -15,7 +15,7 @@ dependencies:
 - dask-cuda=22.02.*
 - dask-cudf=22.02.*
 - nccl>=2.9.9
-- ucx-py=0.23.*
+- ucx-py=0.24.*
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1

diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml
@@ -15,7 +15,7 @@ dependencies:
 - dask-cuda=22.02.*
 - dask-cudf=22.02.*
 - nccl>=2.9.9
-- ucx-py=0.23.*
+- ucx-py=0.24.*
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1

diff --git a/conda/environments/cugraph_dev_cuda11.4.yml b/conda/environments/cugraph_dev_cuda11.4.yml
@@ -15,7 +15,7 @@ dependencies:
 - dask-cuda=22.02.*
 - dask-cudf=22.02.*
 - nccl>=2.9.9
-- ucx-py=0.23.*
+- ucx-py=0.24.*
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1

diff --git a/conda/environments/cugraph_dev_cuda11.5.yml b/conda/environments/cugraph_dev_cuda11.5.yml
@@ -15,7 +15,7 @@ dependencies:
 - dask-cuda=22.02.*
 - dask-cudf=22.02.*
 - nccl>=2.9.9
-- ucx-py=0.23.*
+- ucx-py=0.24.*
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1

diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
@@ -29,7 +29,7 @@ requirements:
     - cython>=0.29,<0.30
     - libcugraph={{ version }}
     - cudf={{ minor_version }}
-    - ucx-py 0.23
+    - ucx-py 0.24
     - ucx-proc=*=gpu
     - cudatoolkit {{ cuda_version }}.*
   run:
@@ -40,7 +40,7 @@ requirements:
     - dask-cuda {{ minor_version }}
     - dask>=2021.09.1,<=2021.11.2
     - distributed>=2021.09.1,<=2021.11.2
-    - ucx-py 0.23
+    - ucx-py 0.24
     - ucx-proc=*=gpu
     - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
 

diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml
@@ -28,7 +28,7 @@ requirements:
     - python x.x
     - cython>=0.29,<0.30
     - libcugraph={{ version }}
-    - ucx-py 0.23
+    - ucx-py 0.24
     - ucx-proc=*=gpu
     - cudatoolkit {{ cuda_version }}.*
   run:

diff --git a/python/cugraph/cugraph/tests/test_renumber.py b/python/cugraph/cugraph/tests/test_renumber.py
@@ -47,7 +47,8 @@ def test_renumber_ips():
 
     renumbered_gdf, renumber_map = NumberMap.renumber(gdf,
                                                       "source_as_int",
-                                                      "dest_as_int")
+                                                      "dest_as_int",
+                                                      preserve_order=True)
 
     check_src = renumber_map.from_internal_vertex_id(renumbered_gdf['src']
                                                      )["0"]
@@ -82,7 +83,8 @@ def test_renumber_ips_cols():
 
     renumbered_gdf, renumber_map = NumberMap.renumber(gdf,
                                                       ["source_as_int"],
-                                                      ["dest_as_int"])
+                                                      ["dest_as_int"],
+                                                      preserve_order=True)
 
     check_src = renumber_map.from_internal_vertex_id(renumbered_gdf['src']
                                                      )["0"]
@@ -115,7 +117,8 @@ def test_renumber_ips_str_cols():
 
     renumbered_gdf, renumber_map = NumberMap.renumber(gdf,
                                                       ["source_as_int"],
-                                                      ["dest_as_int"])
+                                                      ["dest_as_int"],
+                                                      preserve_order=True)
 
     check_src = renumber_map.from_internal_vertex_id(renumbered_gdf['src']
                                                      )["0"]
@@ -136,7 +139,8 @@ def test_renumber_negative():
 
     renumbered_gdf, renumber_map = NumberMap.renumber(gdf,
                                                       "source_list",
-                                                      "dest_list")
+                                                      "dest_list",
+                                                      preserve_order=True)
 
     check_src = renumber_map.from_internal_vertex_id(renumbered_gdf['src']
                                                      )["0"]
@@ -157,7 +161,8 @@ def test_renumber_negative_col():
 
     renumbered_gdf, renumber_map = NumberMap.renumber(gdf,
                                                       "source_list",
-                                                      "dest_list")
+                                                      "dest_list",
+                                                      preserve_order=True)
 
     check_src = renumber_map.from_internal_vertex_id(renumbered_gdf['src']
                                                      )["0"]