Merge branch 'master' into relgraphconv

dmlc · Oct 16, 2024 · 28c81a0 · 28c81a0
2 parents 418af1b + d92c98d
commit 28c81a0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/python/dgl/distributed/partition.py b/python/dgl/distributed/partition.py
@@ -334,6 +334,27 @@ def load_partition(part_config, part_id, load_feats=True, use_graphbolt=False):
         "part-{}".format(part_id) in part_metadata
     ), "part-{} does not exist".format(part_id)
     part_files = part_metadata["part-{}".format(part_id)]
+
+    exist_dgl_graph = exist_graphbolt_graph = False
+    if os.path.exists(os.path.join(config_path, f"part{part_id}", "graph.dgl")):
+        use_graphbolt = False
+        exist_dgl_graph = True
+    if os.path.exists(
+        os.path.join(
+            config_path, f"part{part_id}", "fused_csc_sampling_graph.pt"
+        )
+    ):
+        use_graphbolt = True
+        exist_graphbolt_graph = True
+
+    # Check if both DGL graph and GraphBolt graph exist or not exist. Make sure only one exists.
+    if not exist_dgl_graph and not exist_graphbolt_graph:
+        raise ValueError("The graph object doesn't exist.")
+    if exist_dgl_graph and exist_graphbolt_graph:
+        raise ValueError(
+            "Both DGL graph and GraphBolt graph exist. Please remove one."
+        )
+
     if use_graphbolt:
         part_graph_field = "part_graph_graphbolt"
     else:

diff --git a/tests/distributed/test_partition.py b/tests/distributed/test_partition.py
@@ -990,6 +990,7 @@ def test_dgl_partition_to_graphbolt_homo(
             orig_g = dgl.load_graphs(
                 os.path.join(test_dir, f"part{part_id}/graph.dgl")
             )[0][0]
+            os.remove(os.path.join(test_dir, f"part{part_id}/graph.dgl"))
             new_g = load_partition(
                 part_config, part_id, load_feats=False, use_graphbolt=True
             )[0]
@@ -1067,6 +1068,7 @@ def test_dgl_partition_to_graphbolt_hetero(
             orig_g = dgl.load_graphs(
                 os.path.join(test_dir, f"part{part_id}/graph.dgl")
             )[0][0]
+            os.remove(os.path.join(test_dir, f"part{part_id}/graph.dgl"))
             new_g = load_partition(
                 part_config, part_id, load_feats=False, use_graphbolt=True
             )[0]