Fix loader path for HF dataset

isonetpp_loader.py

@@ -6,7 +6,8 @@ from huggingface_hub import hf_hub_download
 
 from subiso_dataset import (
     SubgraphIsomorphismDataset,
-    TRAIN_MODE, VAL_MODE, TEST_MODE, BROAD_TEST_MODE,
+    # TRAIN_MODE, VAL_MODE, TEST_MODE, BROAD_TEST_MODE
+    TRAIN_MODE, VAL_MODE, TEST_MODE
 )
 
 # ----------------------------
@@ -58,14 +59,14 @@ def _ensure_paths(
     """
     folder = _folder_for_size(dataset_size)                # "large_dataset" or "small_dataset"
     base   = _normalize_name(dataset_name, dataset_size)   # e.g., "aids240k"
-    prefix, mode_dir = _mode_prefix_and_dir(mode)
+    # prefix, mode_dir = _mode_prefix_and_dir(mode)
 
-    query_fname  = f"{prefix}_{base}_query_subgraphs.pkl"
-    rel_fname    = f"{prefix}_{base}_rel_nx_is_subgraph_iso.pkl"
+    query_fname  = f"{mode}_{base}_query_subgraphs.pkl"
+    rel_fname    = f"{mode}_{base}_rel_nx_is_subgraph_iso.pkl"
     corpus_fname = f"{base}_corpus_subgraphs.pkl"
 
-    repo_query_path  = f"{folder}/splits/{mode_dir}/{query_fname}"
-    repo_rel_path    = f"{folder}/splits/{mode_dir}/{rel_fname}"
+    repo_query_path  = f"{folder}/splits/{mode}/{query_fname}"
+    repo_rel_path    = f"{folder}/splits/{mode}/{rel_fname}"
     repo_corpus_path = f"{folder}/corpus/{corpus_fname}"
 
     kwargs = dict(
@@ -91,17 +92,17 @@ def load_isonetpp_benchmark(
     dataset_name: str = "aids",     # "aids" or "aids240k" (same for mutag/ptc_*)
     dataset_size: str = "large",    # "small" | "large"
     batch_size: int = 128,
-    data_type: str = "pyg",         # "pyg" or "gmn"
+    data_type: str = "gmn",         # "pyg" or "gmn"
     device: Optional[str] = None,
     download_root: Optional[str] = None,
 ):
-    # Map to class constants
+    # Map to class constantss
     mode_map = {
         "train": TRAIN_MODE,
         "val": VAL_MODE,
         "test": TEST_MODE,
-        "extra_test_300": BROAD_TEST_MODE,
-        "Extra_test_300": BROAD_TEST_MODE,
+        # "extra_test_300": BROAD_TEST_MODE,
+        # "Extra_test_300": BROAD_TEST_MODE,
     }
     mode_norm = mode_map.get(mode, mode)
 
@@ -133,7 +134,7 @@ def load_isonetpp_benchmark(
         batch_size=batch_size,
         data_type=data_type,
         dataset_base_path=parent_dir,                    # parent of <folder>
-        dataset_path_override=_folder_for_size(dataset_size),  # "large_dataset"/"small_dataset"
+        dataset_path_override=None,#  _folder_for_size(dataset_size),  # "large_dataset"/"small_dataset"
         experiment=None,
         device=device,
     )

subiso_dataset.py

@@ -13,7 +13,7 @@ from torch_geometric.data import Data
 TRAIN_MODE = "train"
 VAL_MODE = "val"
 TEST_MODE = "test"
-BROAD_TEST_MODE = "Extra_test_300"
+# BROAD_TEST_MODE = "Extra_test_300"
 
 GMN_DATA_TYPE = "gmn"
 PYG_DATA_TYPE = "pyg"
@@ -25,7 +25,8 @@ GraphCollection = collections.namedtuple(
 
 class SubgraphIsomorphismDataset:
     def __init__(self, mode, dataset_name, dataset_size, batch_size, data_type, dataset_base_path, experiment, dataset_path_override=None, device=None):
-        assert mode in [TRAIN_MODE, VAL_MODE, TEST_MODE, BROAD_TEST_MODE]
+        # assert mode in [TRAIN_MODE, VAL_MODE, TEST_MODE, BROAD_TEST_MODE]
+        assert mode in [TRAIN_MODE, VAL_MODE, TEST_MODE]
         self.mode = mode
         self.dataset_name = dataset_name
         self.dataset_size = dataset_size