resolve conflict

snap-stanford · Mar 23, 2020 · 059ef08 · 059ef08
2 parents 78b7aaa + 3719ada
commit 059ef08
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/examples/graphproppred/mol/main_pyg.py b/examples/graphproppred/mol/main_pyg.py
@@ -10,8 +10,6 @@
 import numpy as np
 
 ### importing OGB
-
-### for loading dataset and evaluator
 from ogb.graphproppred import PygGraphPropPredDataset, Evaluator
 
 cls_criterion = torch.nn.BCEWithLogitsLoss()
@@ -164,4 +162,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/examples/graphproppred/ppi/main_pyg.py b/examples/graphproppred/ppi/main_pyg.py
@@ -10,8 +10,6 @@
 import numpy as np
 
 ### importing OGB
-
-### for loading dataset and evaluator
 from ogb.graphproppred import PygGraphPropPredDataset, Evaluator
 
 multicls_criterion = torch.nn.CrossEntropyLoss()
@@ -147,4 +145,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/ogb/graphproppred/__init__.py b/ogb/graphproppred/__init__.py
@@ -8,5 +8,6 @@
 
 try:
     from .dataset_dgl import DglGraphPropPredDataset
+    from .dataset_dgl import collate_dgl
 except ImportError:
     pass