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

Replace PropertyGraph in cugraph-PyG with FeatureStore #3159

Merged
merged 380 commits into from
Jan 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
380 commits
Select commit Hold shift + click to select a range
a106169
Merge branch 'branch-22.12' of https://github.com/rapidsai/cugraph in…
alexbarghi-nv Nov 23, 2022
290d5d6
fix bug with empty weight list
alexbarghi-nv Nov 23, 2022
1ab8c22
fix style
alexbarghi-nv Nov 23, 2022
b0ebc43
remove unwanted files
alexbarghi-nv Nov 23, 2022
5f5bc22
revert tests
alexbarghi-nv Nov 23, 2022
7ffb895
remove unwanted files
alexbarghi-nv Nov 23, 2022
4b6ab32
run pre-commit
alexbarghi-nv Nov 23, 2022
24c962e
Added server extensions for benchmarks and testing which are packaged…
rlratzel Nov 23, 2022
0a95b74
Updates to support initial RemoteGraph runs, still WIP.
rlratzel Nov 24, 2022
810cfac
Updates to use strings instead of objects for making benchmark report…
rlratzel Nov 27, 2022
319e2b6
Revert unintentional changes to scripts
alexbarghi-nv Nov 28, 2022
5c2bcdb
change compute_required to is_delayed
alexbarghi-nv Nov 28, 2022
591f4de
remove rmm pool
alexbarghi-nv Nov 28, 2022
732c151
add exception if unable to process array
alexbarghi-nv Nov 28, 2022
4dde9a5
add bool variable for module installation
alexbarghi-nv Nov 28, 2022
daade97
add cudf installed variable
alexbarghi-nv Nov 28, 2022
03c1bbd
updated run-dask-process for newer CLI args for UCX, added support fo…
rlratzel Nov 29, 2022
3b382bc
Merge remote-tracking branch 'upstream/branch-23.02' into branch-23.0…
rlratzel Nov 29, 2022
2d3f608
t
alexbarghi-nv Nov 29, 2022
398fe93
draft of API change
ChuckHastings Nov 29, 2022
c7dea6d
p
alexbarghi-nv Nov 29, 2022
2c2e999
Merge remote-tracking branch 'upstream/branch-23.02' into branch-23.0…
rlratzel Nov 30, 2022
7683ea4
cugraph store
alexbarghi-nv Nov 30, 2022
5a305c6
Added check for server subprocess exitcode while waiting for it to st…
rlratzel Nov 30, 2022
adb764a
Merge branch 'branch-23.02' into cp-offsets
alexbarghi-nv Nov 30, 2022
67308bf
Merge branch 'branch-23.02-cugraph_service_test_error_output' of http…
alexbarghi-nv Nov 30, 2022
123eb0c
update remote graph tests
alexbarghi-nv Nov 30, 2022
72294ca
update test_e2e
alexbarghi-nv Nov 30, 2022
e9c8cc8
interim checkin to move machines
ChuckHastings Dec 2, 2022
b10346f
Re-organizing top-level benchmarks dir to better accommodate more ben…
rlratzel Dec 5, 2022
948bb45
cgs
alexbarghi-nv Dec 5, 2022
79beaae
Merge branch 'branch-23.02' of https://github.com/rapidsai/cugraph in…
alexbarghi-nv Dec 5, 2022
b39e3a4
reorg tests
alexbarghi-nv Dec 5, 2022
878d32b
Moving uniform_neighbor_sampling benchmarks and params to new common …
rlratzel Dec 5, 2022
9489483
Added PLC standalone benchmark not committed before, renamed pytest d…
rlratzel Dec 5, 2022
a013a6c
Moved params out of benchmark file into separate params.py file so ti…
rlratzel Dec 5, 2022
d5bcfa8
Further refactorings to separate local from remote: removed unneeded …
rlratzel Dec 6, 2022
5d02856
Additional updates for moving genFixtureParamsProduct to PLC, added m…
rlratzel Dec 6, 2022
e354057
Updated parameterization to match perf tracking spreadsheet, added ex…
rlratzel Dec 6, 2022
fbf7792
Merge remote-tracking branch 'upstream/branch-23.02' into branch-23.0…
rlratzel Dec 6, 2022
e6e1c4e
Copyright updates for current year.
rlratzel Dec 6, 2022
719c3f6
Merge branch 'branch-23.02' into cp-offsets
alexbarghi-nv Dec 6, 2022
85680b5
Always build without isolation.
vyasr Dec 6, 2022
f21c9d0
various changes to get tests to pass
alexbarghi-nv Dec 6, 2022
0c35cfd
Merge branch 'fix/devel_build_isolation' of https://github.com/vyasr/…
alexbarghi-nv Dec 6, 2022
93fac88
Added temporary debug prints, changed param names to be more accurate…
rlratzel Dec 8, 2022
a54d898
test updates
alexbarghi-nv Dec 8, 2022
cc1b8d8
benchmark
alexbarghi-nv Dec 9, 2022
fdf4808
first successful debugging run
ChuckHastings Dec 9, 2022
d5b92f7
fix clang-format issues
ChuckHastings Dec 10, 2022
aff8baf
c
alexbarghi-nv Dec 12, 2022
43848db
remove unwanted files
alexbarghi-nv Dec 12, 2022
0cfe4a9
Merge remote-tracking branch 'upstream/branch-23.02' into branch-23.0…
rlratzel Dec 13, 2022
a7373b1
Merge branch 'update_uniform_sampling_api' of https://github.com/chuc…
alexbarghi-nv Dec 13, 2022
a0792e9
plc
alexbarghi-nv Dec 13, 2022
f650429
Using MultiGraph instead of Graph for benchmarks, added additional RM…
rlratzel Dec 14, 2022
5d0bd77
Merge remote-tracking branch 'upstream/branch-23.02' into branch-23.0…
rlratzel Dec 14, 2022
b85f9fd
fixes
alexbarghi-nv Dec 14, 2022
3bcdbb3
fix merge conflict
alexbarghi-nv Dec 14, 2022
c9b30c4
persist
alexbarghi-nv Dec 14, 2022
e1e410d
remove unwanted files
alexbarghi-nv Dec 14, 2022
296fdfa
update result object creation
alexbarghi-nv Dec 15, 2022
4c87528
fix style
alexbarghi-nv Dec 15, 2022
67b464b
fix broken mg sampling test
alexbarghi-nv Dec 15, 2022
447d9ee
fix sg pyg tests
alexbarghi-nv Dec 15, 2022
96e2ac3
config pyg, dgl work
alexbarghi-nv Dec 15, 2022
af57f08
update
alexbarghi-nv Dec 15, 2022
f563945
print array size for debugging
alexbarghi-nv Dec 15, 2022
19376b5
fix merge conflict
alexbarghi-nv Dec 15, 2022
d513a86
Added cugraph+UCX build instructions
VibhuJawa Dec 19, 2022
cb791ac
pg dtype bugfix
alexbarghi-nv Dec 19, 2022
1af9495
fix mg dtype bug:
alexbarghi-nv Dec 19, 2022
5670bed
fix formatting issue
alexbarghi-nv Dec 19, 2022
6d6dfea
add ci test skip
alexbarghi-nv Dec 19, 2022
16fc189
fix renumbering test
alexbarghi-nv Dec 19, 2022
6bd78e6
fix tests
alexbarghi-nv Dec 19, 2022
99029b0
Merge branch 'branch-23.02' of https://github.com/rapidsai/cugraph in…
alexbarghi-nv Dec 19, 2022
2f99d6e
ADD DGL benchmarks
VibhuJawa Dec 19, 2022
9c41ece
Revert "ADD DGL benchmarks"
VibhuJawa Dec 19, 2022
91c1a3a
remove unwanted files
alexbarghi-nv Dec 20, 2022
8475792
remove debug code
alexbarghi-nv Dec 20, 2022
2679be0
drop persist from get_vertex_data, change dtype only if necessary
alexbarghi-nv Dec 20, 2022
6b1dbd8
propagate change to get_edge_data
alexbarghi-nv Dec 20, 2022
8734e31
add type check, explanatory comments
alexbarghi-nv Dec 20, 2022
88dac25
docstring fix
alexbarghi-nv Dec 20, 2022
bef36ba
drop old index
alexbarghi-nv Dec 20, 2022
8e7122d
drop old index
alexbarghi-nv Dec 20, 2022
b744a8a
remove type check
alexbarghi-nv Dec 20, 2022
61be6bc
remove dtype check
alexbarghi-nv Dec 20, 2022
ea5d49c
remove persist again
alexbarghi-nv Dec 20, 2022
1b7f68f
revert cmake changes as problem should be resolved
alexbarghi-nv Dec 20, 2022
abc2e92
add patch for c++ neighbor sample
alexbarghi-nv Dec 20, 2022
2356600
fix sampler test
alexbarghi-nv Dec 21, 2022
d8aef40
add latest fixes
alexbarghi-nv Dec 21, 2022
1827fa5
remove unwanted files
alexbarghi-nv Dec 21, 2022
90fa02b
fix merge conflicts
alexbarghi-nv Dec 21, 2022
f00d001
Merge branch 'ucx_benchmarking' of https://github.com/vibhujawa/cugra…
alexbarghi-nv Dec 21, 2022
1b68e2c
fix merge conflict
alexbarghi-nv Dec 21, 2022
005675d
updates and fixes for cugraph_store to support edge info
alexbarghi-nv Dec 22, 2022
0edf263
remove debug code
alexbarghi-nv Dec 22, 2022
29d128b
resolve merge conflicts
alexbarghi-nv Dec 22, 2022
8c7a690
Merge branch 'cp-offsets' into pyg-benchmarks
alexbarghi-nv Dec 22, 2022
73f807d
minor fix
alexbarghi-nv Dec 22, 2022
7376720
resolve merge conflict
alexbarghi-nv Dec 22, 2022
2e1c5c2
drop selection due to bug
alexbarghi-nv Dec 23, 2022
430412d
t
alexbarghi-nv Dec 23, 2022
26f986f
r
alexbarghi-nv Dec 27, 2022
93e92c7
add updates for comparison
alexbarghi-nv Dec 28, 2022
e97d6cb
latest updates
alexbarghi-nv Dec 28, 2022
e33ec80
remove log file
alexbarghi-nv Dec 28, 2022
534c121
Merge branch 'branch-23.02' into update_uniform_sampling_api
ChuckHastings Jan 3, 2023
4772a05
Merge branch 'branch-23.02' into cp-offsets
alexbarghi-nv Jan 3, 2023
aead9a6
update copyright year
alexbarghi-nv Jan 3, 2023
36aa538
initial write
alexbarghi-nv Jan 3, 2023
3802fd7
pull in required pg changes
alexbarghi-nv Jan 3, 2023
87559d2
clean up property graph, mg property graph
alexbarghi-nv Jan 3, 2023
297f55f
Merge branch 'branch-23.02' into update_uniform_sampling_api
ChuckHastings Jan 4, 2023
e9c7bff
batch of PR requested updates
ChuckHastings Jan 4, 2023
d03b241
Merge branch 'branch-23.02' into update_uniform_sampling_api
ChuckHastings Jan 5, 2023
b528fff
update conftest
alexbarghi-nv Jan 5, 2023
8e679ab
clarify docstring
alexbarghi-nv Jan 5, 2023
eada08e
remove print statement
alexbarghi-nv Jan 5, 2023
81a8676
do merge
alexbarghi-nv Jan 5, 2023
5e4b054
remove additions from graph api
alexbarghi-nv Jan 5, 2023
0310f39
Merge branch 'branch-23.02' into cp-offsets
alexbarghi-nv Jan 5, 2023
d02fb4f
fix style
alexbarghi-nv Jan 5, 2023
e0b367d
merge
alexbarghi-nv Jan 5, 2023
f3d1d51
update cugraph store
alexbarghi-nv Jan 5, 2023
8cdae58
fix cugraph store
alexbarghi-nv Jan 5, 2023
d47539b
address most PR comments
ChuckHastings Jan 5, 2023
cd07a11
fixes
alexbarghi-nv Jan 6, 2023
035498e
merge
alexbarghi-nv Jan 6, 2023
6d0f7f0
do merge
alexbarghi-nv Jan 6, 2023
87bb91b
merge offsets
alexbarghi-nv Jan 6, 2023
65dc4df
remove test code
alexbarghi-nv Jan 6, 2023
456ab7f
type annotations
alexbarghi-nv Jan 6, 2023
8d6da9c
finished addressing PR comments
ChuckHastings Jan 6, 2023
f4cb88e
remove unused import
alexbarghi-nv Jan 6, 2023
4420751
update copyright
alexbarghi-nv Jan 6, 2023
8b5be47
update copyright year
alexbarghi-nv Jan 6, 2023
4ef2b2b
update copyright year
alexbarghi-nv Jan 6, 2023
d1079ea
update copyright year
alexbarghi-nv Jan 6, 2023
f715d14
update copyright year
alexbarghi-nv Jan 6, 2023
694b23e
update copyright year
alexbarghi-nv Jan 6, 2023
8179b1f
update copyright year
alexbarghi-nv Jan 6, 2023
bc6974e
update copyright year
alexbarghi-nv Jan 6, 2023
79abf44
update copyright year
alexbarghi-nv Jan 6, 2023
7af9b69
remove unused import
alexbarghi-nv Jan 6, 2023
db036ca
do merge
alexbarghi-nv Jan 9, 2023
2646563
update c++ code
alexbarghi-nv Jan 10, 2023
eec3510
Merge branch 'branch-23.02' into update_uniform_sampling_api
ChuckHastings Jan 11, 2023
472f090
fix typing
alexbarghi-nv Jan 11, 2023
f04e00e
resolve merge conflict
alexbarghi-nv Jan 11, 2023
52b2a4d
fix array construction
alexbarghi-nv Jan 11, 2023
cbd5c70
Merge branch 'short-circuit-and-type-indices' of https://github.com/a…
alexbarghi-nv Jan 11, 2023
ebb2014
fix type offsets
alexbarghi-nv Jan 11, 2023
a2120b6
fix index for non-cudf
alexbarghi-nv Jan 11, 2023
6c29705
concatenate fix
alexbarghi-nv Jan 11, 2023
426b529
fix cupy api issue
alexbarghi-nv Jan 11, 2023
3f7b0f6
latest changes, added SG unit test that caught @alexbarghi-nv found, …
ChuckHastings Jan 12, 2023
1886cd1
address a few more PR comments
ChuckHastings Jan 12, 2023
83233f7
add MG testing to the new sampling algorithm
ChuckHastings Jan 12, 2023
6a9ef77
Merge branch 'branch-23.02' into update_uniform_sampling_api
ChuckHastings Jan 12, 2023
3561c61
Merge branch 'branch-23.02' into update_uniform_sampling_api
ChuckHastings Jan 12, 2023
f557750
indexing fix
alexbarghi-nv Jan 13, 2023
3338edf
resolve merge conflicts
alexbarghi-nv Jan 13, 2023
44d5c18
debugging MG issue, shuffling needs to include the edge id/type
ChuckHastings Jan 14, 2023
1c72cf8
merge
alexbarghi-nv Jan 14, 2023
cdf6ae8
update copyright header, update labels logic
ChuckHastings Jan 14, 2023
adf19c7
fix tests, merge conflict
alexbarghi-nv Jan 14, 2023
e3f1d65
latest update
alexbarghi-nv Jan 14, 2023
6c749d1
remove print statement
alexbarghi-nv Jan 14, 2023
f6b97b3
update mg test
alexbarghi-nv Jan 14, 2023
6147cab
Adding first version
VibhuJawa Jan 15, 2023
7f659e3
fix shuffle bug I introduced
ChuckHastings Jan 15, 2023
9e0fb5d
address PR comments
ChuckHastings Jan 15, 2023
dcd5525
fix format
ChuckHastings Jan 15, 2023
bcce588
Merge branch 'branch-23.02' into update_uniform_sampling_api
ChuckHastings Jan 15, 2023
72b8b64
Merge branch 'update_uniform_sampling_api' of https://github.com/chuc…
alexbarghi-nv Jan 16, 2023
e13d443
merge in chuck's changes, remove expensive gather
alexbarghi-nv Jan 16, 2023
28929c7
Working sampling unit-test
VibhuJawa Jan 16, 2023
bdcfbba
Working sampling unit-test
VibhuJawa Jan 16, 2023
e00e40f
Working sampling hetrographs
VibhuJawa Jan 16, 2023
fd1f84a
Working sampling unit-test
VibhuJawa Jan 16, 2023
8a4ff56
Fix minor API access error
VibhuJawa Jan 16, 2023
f50ee91
Working dataloader
VibhuJawa Jan 17, 2023
d6750e0
add self loop tests
alexbarghi-nv Jan 17, 2023
81b4d8b
remove benchmarks
alexbarghi-nv Jan 17, 2023
69ce806
revert changes to dockerfile
alexbarghi-nv Jan 17, 2023
6281cc9
revert pyg changes again
alexbarghi-nv Jan 17, 2023
cc3250e
revert changes to CGS
alexbarghi-nv Jan 17, 2023
2ba8a18
remove debug file
alexbarghi-nv Jan 17, 2023
3a84322
revert script changes
alexbarghi-nv Jan 17, 2023
2f2d32e
update conftest
alexbarghi-nv Jan 17, 2023
bd5d2b8
resolve merge conflict
alexbarghi-nv Jan 17, 2023
d879116
fix style
alexbarghi-nv Jan 17, 2023
71cfe86
fix style
alexbarghi-nv Jan 17, 2023
ba02995
Add scale testing
VibhuJawa Jan 17, 2023
9b30115
resolve conflicts
alexbarghi-nv Jan 17, 2023
687df82
revert file
alexbarghi-nv Jan 17, 2023
a0a863c
remove extra files
alexbarghi-nv Jan 17, 2023
02a6bf4
remove added files
alexbarghi-nv Jan 17, 2023
54bf513
fix illegal deletion
alexbarghi-nv Jan 17, 2023
c4ecb11
Added DLGSampler Tests
VibhuJawa Jan 17, 2023
c6aa9eb
add fix for batch id bug
alexbarghi-nv Jan 17, 2023
83f531b
allow non-dask inputs
alexbarghi-nv Jan 17, 2023
1a2b870
switch_to_fs
VibhuJawa Jan 17, 2023
8bb6ede
Merge branch 'branch-23.02' into switch_to_fs
VibhuJawa Jan 17, 2023
095ab72
Fix pytest
VibhuJawa Jan 18, 2023
54d2117
Merge branch 'switch_to_fs' of https://github.com/VibhuJawa/cugraph i…
VibhuJawa Jan 18, 2023
5093887
intial write
alexbarghi-nv Jan 18, 2023
b901005
style fix
alexbarghi-nv Jan 18, 2023
22ff192
remove create with edge info
alexbarghi-nv Jan 18, 2023
b98f0b3
fix style
alexbarghi-nv Jan 18, 2023
472afe2
fix tests
alexbarghi-nv Jan 18, 2023
90679a4
update test, fix style
alexbarghi-nv Jan 18, 2023
5ff6ef0
drop seed arg, add rng state in plc layer
alexbarghi-nv Jan 18, 2023
7612640
Update python/cugraph-dgl/cugraph_dgl/convert.py
VibhuJawa Jan 18, 2023
f43e8f5
Update convert.py
VibhuJawa Jan 18, 2023
dcccc79
Fix Style problems
VibhuJawa Jan 19, 2023
0e3cc82
Update convert.py
VibhuJawa Jan 19, 2023
a9660d7
final improvement to random seeding
alexbarghi-nv Jan 19, 2023
fc626cf
fix style
alexbarghi-nv Jan 19, 2023
55acecd
Merge branch 'branch-23.02' into remove-pg
alexbarghi-nv Jan 19, 2023
e534ae9
Merge branch 'switch_to_fs' of https://github.com/vibhujawa/cugraph i…
alexbarghi-nv Jan 19, 2023
498b3fb
fix merge conflicts
alexbarghi-nv Jan 19, 2023
9d7b630
pull in new c++/python api changes
alexbarghi-nv Jan 19, 2023
83b262b
write the refactor
alexbarghi-nv Jan 19, 2023
780ca0d
remove old api
alexbarghi-nv Jan 19, 2023
5e1bd83
cleanup
alexbarghi-nv Jan 19, 2023
5dc521b
fix style
alexbarghi-nv Jan 19, 2023
a2fb8c5
fixes, test updates
alexbarghi-nv Jan 19, 2023
95ff288
test updates, fixes to cugraph store
alexbarghi-nv Jan 20, 2023
46377c8
t
alexbarghi-nv Jan 20, 2023
e005d6d
test, sampling fixes
alexbarghi-nv Jan 20, 2023
f1846e2
resolve merge conflicts
alexbarghi-nv Jan 23, 2023
4a1856e
revert pg changes
alexbarghi-nv Jan 23, 2023
55a9b5a
revert pg changes
alexbarghi-nv Jan 23, 2023
f4bed86
clean up imports
alexbarghi-nv Jan 23, 2023
32f016a
cleanup imports
alexbarghi-nv Jan 23, 2023
b5fc40c
update branch
alexbarghi-nv Jan 25, 2023
f271085
remove debug code
alexbarghi-nv Jan 26, 2023
1ed1f61
change cupy dlpack call
alexbarghi-nv Jan 26, 2023
531f965
Merge branch 'remove-pg' of https://github.com/alexbarghi-nv/cugraph …
alexbarghi-nv Jan 26, 2023
6d92f2c
style fix
alexbarghi-nv Jan 26, 2023
139de54
remove dlpack usage
alexbarghi-nv Jan 26, 2023
b7b574d
correction to asarray
alexbarghi-nv Jan 26, 2023
dd48bcb
update array conversion
alexbarghi-nv Jan 26, 2023
ea2c643
fix copyright
alexbarghi-nv Jan 27, 2023
78b7e57
Merge branch 'branch-23.02' into remove-pg
alexbarghi-nv Jan 27, 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
4 changes: 1 addition & 3 deletions python/cugraph-pyg/cugraph_pyg/data/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019-2022, NVIDIA CORPORATION.
# Copyright (c) 2022-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 @@ -14,7 +14,5 @@
from cugraph_pyg.utilities.api_tools import experimental_warning_wrapper

from cugraph_pyg.data.cugraph_store import EXPERIMENTAL__CuGraphStore
from cugraph_pyg.data.cugraph_store import EXPERIMENTAL__to_pyg

CuGraphStore = experimental_warning_wrapper(EXPERIMENTAL__CuGraphStore)
to_pyg = experimental_warning_wrapper(EXPERIMENTAL__to_pyg)
Loading