From e125ffafa4919f4ee6abbe9bdeb8f3493a71083b Mon Sep 17 00:00:00 2001 From: Peter Andreas Entschev Date: Mon, 22 Nov 2021 06:17:03 -0800 Subject: [PATCH 1/2] Update to UCX-Py 0.24 --- ci/benchmark/build.sh | 2 +- ci/gpu/build.sh | 2 +- conda/environments/cugraph_dev_cuda11.0.yml | 2 +- conda/environments/cugraph_dev_cuda11.2.yml | 2 +- conda/environments/cugraph_dev_cuda11.4.yml | 2 +- conda/environments/cugraph_dev_cuda11.5.yml | 2 +- conda/recipes/cugraph/meta.yaml | 4 ++-- conda/recipes/pylibcugraph/meta.yaml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 36d7c3eb9aa..a25cb99e318 100644 --- 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 index 190c2fe5163..c7680ed7c45 100755 --- 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 index 22e24269b00..ef9694d1928 100644 --- 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 index 1aed8216a99..d2147dae48b 100644 --- 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 index 7673d6a68f8..30c238be174 100644 --- 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 index ac5716f6401..50f29d34ab8 100644 --- a/conda/environments/cugraph_dev_cuda11.5.yml +++ b/conda/environments/cugraph_dev_cuda11.5.yml @@ -15,7 +15,7 @@ dependencies: - dask-cuda=21.12.* - dask-cudf=21.12.* - 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 index 176053d1b39..fed524809de 100644 --- 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 - distributed>=2021.09.1 - - 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 index 232e4388181..306864f0d4d 100644 --- 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: From c6d1301197ed1c20bad076f315ea90efc13033f1 Mon Sep 17 00:00:00 2001 From: Rick Ratzel Date: Fri, 3 Dec 2021 15:11:12 -0600 Subject: [PATCH 2/2] Adding preserve_order to renumber() calls since latest CI runs show tests failing due to out-of-order results. --- python/cugraph/cugraph/tests/test_renumber.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/python/cugraph/cugraph/tests/test_renumber.py b/python/cugraph/cugraph/tests/test_renumber.py index b9077b512bd..77c519937d1 100644 --- 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"]