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.

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

Refactor RMAT #3662

Merged
merged 66 commits into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
b0247c8
add a plc implementation of the rmat generator following the CAPI path
Jun 21, 2023
90faff6
fix typo and import type
Jun 21, 2023
e896ce3
define a new type 'cugraph_data_type_id_t'
Jun 21, 2023
66c14a0
update sg rmat to follow the plc path and update docstings
Jun 21, 2023
23cb2eb
add argument 'dtype' and remove the hardcoded one
Jun 21, 2023
7fd1085
add check for 'rmat' arguments
Jun 21, 2023
fe97c89
update mg rmat to follow the plc path and update docstings
Jun 21, 2023
4ace049
add plc implementation of multi_rmat generator
Jun 22, 2023
7923a30
fix typo
Jun 22, 2023
bcceb73
update docstrings
Jun 22, 2023
fb84d73
refactor the python implementation of SG multi_rmat generator and upd…
Jun 22, 2023
a6bca54
fix style
Jun 22, 2023
ab41097
remove unsued import
Jun 22, 2023
d580117
remove outdated code
Jun 22, 2023
4101ed1
fix copyright
Jun 22, 2023
150efd5
Merge remote-tracking branch 'upstream/branch-23.08' into branch-23.0…
Jun 22, 2023
461ed7d
add type of cython variable
Jun 22, 2023
ece812b
enable rmat generator to support 'scramble_vertex_ids', update docstr…
Jun 24, 2023
d768ce7
enable 'scramble_vertex_ids' flag
Jun 25, 2023
88ec8fa
enable 'scramble_vertex_ids' flag and updaate docstrings
Jun 25, 2023
18ca603
fix bug
Jun 25, 2023
a932743
fix style
Jun 25, 2023
4ca5118
Merge remote-tracking branch 'upstream/branch-23.08' into branch-23.0…
Jun 25, 2023
7b99a16
pass default value of 'scramble_vertex_ids'
Jun 26, 2023
f863f21
update docstrings
Jun 26, 2023
851d85b
update tests for rmat generator
Jun 26, 2023
60aac18
fix style
Jun 26, 2023
6eb8520
fix style
Jun 26, 2023
d8ea008
update docs and consolidate parameter check's functions
Jun 28, 2023
eaa76a9
do not ignore deprecated warning
Jul 9, 2023
222a851
pass argument by keyword
Jul 9, 2023
b6da671
update tests docstrings
Jul 9, 2023
29f702a
rename variable
Jul 9, 2023
fad3d83
remove legacy rmat
Jul 9, 2023
083a8ac
remove cython.cu
Jul 9, 2023
e448ddd
fix style
Jul 9, 2023
79fcd8f
Merge remote-tracking branch 'upstream/branch-23.08' into branch-23.0…
Jul 9, 2023
9244fca
remove cython.cu from CMakeLists
Jul 10, 2023
046454a
update checks
Jul 10, 2023
be60f7b
update tests
Jul 10, 2023
d4bdbfe
remove generators from the CMakeLists
Jul 10, 2023
afdc879
update docstrings
Jul 10, 2023
aae2660
directly call 'init_subcomm' from 'partition_manager.hpp'
Jul 10, 2023
2223c75
rename argument
Jul 10, 2023
d8af027
fix style
Jul 10, 2023
63c9933
update docstrings and copyright
Jul 11, 2023
03c07d8
update, rename and leverage util function
Jul 11, 2023
8f493aa
update tests
Jul 11, 2023
f8517a1
update copyright
Jul 11, 2023
890b53b
remove reference of legacy wcc in plc layer
Jul 11, 2023
64fb07f
rename argument to match python API
Jul 11, 2023
745a385
remove unused import and variable
Jul 11, 2023
18cdb5e
add test coverage for rmat in the plc layer
Jul 11, 2023
ee628c1
remove outdated reference of cython.cu
Jul 11, 2023
962d931
remove unused import
Jul 11, 2023
58daee1
add support for string and rename function
Jul 12, 2023
12f55d6
remove unused import, undo function name change
Jul 12, 2023
426db2e
add support for string in 'dtype'
Jul 12, 2023
8e9bcbc
update tests
Jul 12, 2023
c1f1fc2
fix style
Jul 12, 2023
4495f9f
remove unused import
Jul 12, 2023
8c000d0
update copyright
Jul 12, 2023
4ebaf9b
clean up code
Jul 24, 2023
af58fa6
fix style
Jul 24, 2023
e374160
remove unused import
Jul 24, 2023
56a5ff2
fix merge conflict
Jul 24, 2023
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
1 change: 0 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ set(CUGRAPH_SOURCES
src/community/detail/mis_mg.cu
src/detail/utility_wrappers.cu
src/structure/graph_view_mg.cu
src/utilities/cython.cu
src/utilities/path_retrieval.cu
src/structure/legacy/graph.cu
src/linear_assignment/legacy/hungarian.cu
Expand Down
71 changes: 0 additions & 71 deletions cpp/include/cugraph/utilities/cython.hpp

This file was deleted.

167 changes: 0 additions & 167 deletions cpp/src/utilities/cython.cu

This file was deleted.

1 change: 0 additions & 1 deletion python/cugraph/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ add_subdirectory(cugraph/community)
add_subdirectory(cugraph/components)
add_subdirectory(cugraph/dask/comms)
add_subdirectory(cugraph/dask/structure)
add_subdirectory(cugraph/generators)
add_subdirectory(cugraph/internals)
add_subdirectory(cugraph/layout)
add_subdirectory(cugraph/linear_assignment)
Expand Down
10 changes: 4 additions & 6 deletions python/cugraph/cugraph/dask/comms/comms.pxd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2022, NVIDIA CORPORATION.
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand All @@ -18,8 +18,6 @@

from pylibraft.common.handle cimport *


cdef extern from "cugraph/utilities/cython.hpp" namespace "cugraph::cython":

cdef void init_subcomms(handle_t &handle,
size_t row_comm_size)
cdef extern from "cugraph/partition_manager.hpp" namespace "cugraph::partition_manager":
cdef void init_subcomm(handle_t &handle,
size_t row_comm_size)
6 changes: 3 additions & 3 deletions python/cugraph/cugraph/dask/comms/comms_wrapper.pyx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2022, NVIDIA CORPORATION.
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand All @@ -18,10 +18,10 @@


from pylibraft.common.handle cimport *
from cugraph.dask.comms.comms cimport init_subcomms as c_init_subcomms
from cugraph.dask.comms.comms cimport init_subcomm as c_init_subcomm


def init_subcomms(handle, row_comm_size):
cdef size_t handle_size_t = <size_t>handle.getHandle()
handle_ = <handle_t*>handle_size_t
c_init_subcomms(handle_[0], row_comm_size)
c_init_subcomm(handle_[0], row_comm_size)
22 changes: 0 additions & 22 deletions python/cugraph/cugraph/generators/CMakeLists.txt

This file was deleted.

53 changes: 0 additions & 53 deletions python/cugraph/cugraph/generators/rmat.pxd

This file was deleted.

Loading