Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to UCX-Py 0.24 #1962

Merged
merged 4 commits into from
Dec 4, 2021
Merged

Update to UCX-Py 0.24 #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e125ffa
Update to UCX-Py 0.24
pentschev Nov 22, 2021
f7cc5a6
Merge remote-tracking branch 'upstream/branch-22.02' into update-ucx-…
pentschev Nov 22, 2021
f4b54f7
Merge remote-tracking branch 'upstream/branch-22.02' into update-ucx-…
rlratzel Dec 3, 2021
c6d1301
Adding preserve_order to renumber() calls since latest CI runs show t…
rlratzel Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/benchmark/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*" \
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda11.4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda11.5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cugraph/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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') }}

Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/pylibcugraph/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 10 additions & 5 deletions python/cugraph/cugraph/tests/test_renumber.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand All @@ -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"]
Expand All @@ -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"]
Expand Down