[REVIEW]Make dgl, pytorch optional imports for cugraph_dgl package by VibhuJawa · Pull Request #2936 · rapidsai/cugraph

VibhuJawa · 2022-11-15T23:15:07Z

This PR :

makes dgl and pytorch optional and makes them a run-time dependency to allow them to built cleanly in the DLFW container environment.
Verified locally as following (Can import cugraph_dgl in an environment without torch or dgl) :

>>> import cugraph_dgl
>>> import torch
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
ModuleNotFoundError: No module named 'torch'
>>> import dgl
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>

Add versioneer to align the source built packages tag with cugraph.

(cugraph_dev) vjawa@dgx11:~/dgl/cugraph/python/cugraph-dgl$ pip install -e .
.....
Installing collected packages: cugraph-dgl
  Running setup.py develop for cugraph-dgl
Successfully installed cugraph-dgl-22.12.0a0+118.gd5390c16a

Ensure that cugraph-dgl builds on py-3.8

Closes issue: #2939

Fix a pytest ordering issue based on upstream testing.

CC: @rlratzel

codecov-commenter · 2022-11-16T01:13:59Z

Codecov Report

Base: 60.80% // Head: 65.03% // Increases project coverage by +4.22% 🎉

Coverage data is based on head (6508135) compared to base (85c447b).
Patch has no changes to coverable lines.

Additional details and impacted files

@@               Coverage Diff                @@
##           branch-22.12    #2936      +/-   ##
================================================
+ Coverage         60.80%   65.03%   +4.22%     
================================================
  Files               122        5     -117     
  Lines              6891      163    -6728     
================================================
- Hits               4190      106    -4084     
+ Misses             2701       57    -2644

Impacted Files	Coverage Δ
python/cugraph/cugraph/link_prediction/sorensen.py
python/cugraph/cugraph/community/ecg.py
python/cugraph/cugraph/structure/graph_classes.py
python/cugraph/cugraph/dask/common/part_utils.py
python/cugraph/cugraph/structure/hypergraph.py
...graph/cugraph/centrality/betweenness_centrality.py
python/cugraph/cugraph/traversal/bfs.py
python/cugraph/cugraph/sampling/__init__.py
...n/cugraph/cugraph/dask/community/triangle_count.py
python/cugraph/cugraph/dask/cores/__init__.py
... and 107 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

VibhuJawa · 2022-11-16T01:43:47Z

python/cugraph-dgl/cugraph_dgl/_version.py

@@ -0,0 +1,693 @@
+# This file helps to compute a version number in source trees obtained from


Automatically generated file by versioneer.py following other sub-packages.

VibhuJawa · 2022-11-16T01:45:19Z

python/cugraph-dgl/setup.cfg

+versionfile_source = cugraph_dgl/_version.py
+versionfile_build = cugraph_dgl/_version.py
+tag_prefix = v
+parentdir_prefix = cugraph_dgl-


To create versions consitent with cugraph

VibhuJawa · 2022-11-16T01:46:01Z

python/cugraph-dgl/versioneer.py

@@ -0,0 +1,2205 @@
+
+# Version: 0.28


Automatically generated file by versionieer

VibhuJawa · 2022-11-16T03:09:56Z

python/cugraph-dgl/tests/test_cugraph_storage.py

+    # Assert same values sorted by src
+    exp_src_perm = exp_src.argsort()
+    exp_src = exp_src[exp_src_perm]
+    exp_dst = exp_dst[exp_src_perm]
+
+    cu_src_perm = cu_src.argsort()
+    cu_src = cu_src[cu_src_perm]
+    cu_dst = cu_dst[cu_src_perm]
+
    np.testing.assert_equal(exp_dst, cu_dst)
+    np.testing.assert_equal(exp_src, cu_src)


Sort based on dst and then verify same results.

python/cugraph-dgl/cugraph_dgl/cugraph_storage.py

python/cugraph-dgl/cugraph_dgl/utils/cugraph_storage_utils.py

python/cugraph-dgl/tests/test_cugraph_storage.py

VibhuJawa · 2022-11-16T19:25:54Z

@rlratzel , All reviews addressed , please feel free to review again.

rlratzel · 2022-11-16T23:05:04Z

@gpucibot merge

VibhuJawa added 5 commits November 15, 2022 08:28

Update meta.yaml

9c09754

Update setup.py

980d928

Update setup.py

124db92

modify setup.py

4689626

working optional import

2ae1cc2

VibhuJawa changed the title ~~Make dgl pytorch optional import~~ [WIP]Make dgl pytorch optional import Nov 15, 2022

restore meta to earlier version

d5ef5a7

Add version fixes

931c2ae

VibhuJawa commented Nov 16, 2022

View reviewed changes

Update setup.cfg

30c93f3

VibhuJawa commented Nov 16, 2022

View reviewed changes

python/cugraph-dgl/versioneer.py

@@ -0,0 +1,2205 @@

# Version: 0.28

Copy link

Member Author

VibhuJawa Nov 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automatically generated file by versionieer

VibhuJawa added 2 commits November 15, 2022 18:20

Make cugraph_dgl importable with missing dependecies

0b02a1a

Handle default imports

d5390c1

VibhuJawa added the non-breaking Non-breaking change label Nov 16, 2022

VibhuJawa changed the title ~~[WIP]Make dgl pytorch optional import~~ [REVIEW]Make dgl pytorch optional imports for cugraph_dgl package Nov 16, 2022

VibhuJawa added the improvement Improvement / enhancement to an existing function label Nov 16, 2022

VibhuJawa marked this pull request as ready for review November 16, 2022 02:39

VibhuJawa requested a review from a team as a code owner November 16, 2022 02:39

Add copyright

66c3181

VibhuJawa changed the title ~~[REVIEW]Make dgl pytorch optional imports for cugraph_dgl package~~ [REVIEW]Make dgl, pytorch optional imports for cugraph_dgl package Nov 16, 2022

fix a test based on upstream changes

6508135

VibhuJawa commented Nov 16, 2022

View reviewed changes

VibhuJawa added this to the 22.12 milestone Nov 16, 2022

rlratzel reviewed Nov 16, 2022

View reviewed changes

Address Reviews

60e4806

rlratzel approved these changes Nov 16, 2022

View reviewed changes

rapids-bot bot merged commit 435e1c3 into rapidsai:branch-22.12 Nov 16, 2022

VibhuJawa mentioned this pull request Nov 21, 2022

[BUG]: Ensure compatibility of cugraph_dgl with python=3.8 #2939

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[REVIEW]Make dgl, pytorch optional imports for cugraph_dgl package#2936

[REVIEW]Make dgl, pytorch optional imports for cugraph_dgl package#2936
rapids-bot[bot] merged 13 commits intorapidsai:branch-22.12from
VibhuJawa:make-dgl-pytorch-optional-import

VibhuJawa commented Nov 15, 2022 •

edited

Loading

Uh oh!

codecov-commenter commented Nov 16, 2022 •

edited

Loading

Uh oh!

VibhuJawa Nov 16, 2022

Uh oh!

VibhuJawa Nov 16, 2022

Uh oh!

VibhuJawa Nov 16, 2022

Uh oh!

VibhuJawa Nov 16, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VibhuJawa commented Nov 16, 2022

Uh oh!

rlratzel commented Nov 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -0,0 +1,693 @@
		# This file helps to compute a version number in source trees obtained from

Conversation

VibhuJawa commented Nov 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Nov 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

VibhuJawa Nov 16, 2022

Choose a reason for hiding this comment

Uh oh!

VibhuJawa Nov 16, 2022

Choose a reason for hiding this comment

Uh oh!

VibhuJawa Nov 16, 2022

Choose a reason for hiding this comment

Uh oh!

VibhuJawa Nov 16, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VibhuJawa commented Nov 16, 2022

Uh oh!

rlratzel commented Nov 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

VibhuJawa commented Nov 15, 2022 •

edited

Loading

codecov-commenter commented Nov 16, 2022 •

edited

Loading