diff --git a/graphbench/_loader/_loader.py b/graphbench/_loader/_loader.py index 91020ba..c2f7ded 100644 --- a/graphbench/_loader/_loader.py +++ b/graphbench/_loader/_loader.py @@ -10,7 +10,7 @@ from graphbench._metadata import expand_dataset_names from ._dataset_registry import DatasetRegistry from ._split_strategies import AlgoReasSplitStrategy, FixedSplitStrategy, RatioSplitStrategy, TrainValTestSet -from graphbench.datasets._weatherforecasting import _prepare_weather_cache_once, EfficientWeatherGraphDataset +from graphbench.datasets._weatherforecasting import _prepare_weather_cache_once, WeatherforecastingDataset class Loader(): @@ -263,7 +263,7 @@ def _make_weather_dataset( #dataset = EfficientWeatherGraphDataset(root=root, pre_transform=None, transform=None) #hier noch den return anpassen - return EfficientWeatherGraphDataset( + return WeatherforecastingDataset( root=self.root, pre_filter=self.pre_filter, pre_transform=self.pre_transform, diff --git a/graphbench/datasets/__init__.py b/graphbench/datasets/__init__.py index 6f3e1b8..43259ac 100644 --- a/graphbench/datasets/__init__.py +++ b/graphbench/datasets/__init__.py @@ -5,7 +5,7 @@ from ._combinatorial_optimization import CODataset from ._electroniccircuits import ECDataset from ._sat import SATDataset -from ._weatherforecasting import EfficientWeatherGraphDataset +from ._weatherforecasting import WeatherforecastingDataset __all__ = [ @@ -16,5 +16,5 @@ "CODataset", "ECDataset", "SATDataset", - "EfficientWeatherGraphDataset", + "WeatherforecastingDataset", ] diff --git a/graphbench/datasets/_weatherforecasting.py b/graphbench/datasets/_weatherforecasting.py index c65f8d4..1ff4b26 100644 --- a/graphbench/datasets/_weatherforecasting.py +++ b/graphbench/datasets/_weatherforecasting.py @@ -59,7 +59,7 @@ def tqdm(iterable, *args, **kwargs): # Data files specific to each task (sourced from the task-specific repo). # weather_64.pt is the raw timestep data; saved as weather_dataset.pt which is -# what EfficientWeatherGraphDataset.process() expects. +# what WeatherforecastingDataset.process() expects. _HF_WEATHER_DATA_FILES = { "weather_64.pt": "weather_dataset.pt", } @@ -114,7 +114,7 @@ def _prepare_weather_cache_once(root: str, timeout_s: int, skip_cache_build: boo Raw component files (static_components.pkl, metadata.pkl, etc.) are downloaded from HuggingFace automatically when missing. """ - #from wf_utils import EfficientWeatherGraphDataset + #from wf_utils import WeatherforecastingDataset root_path = Path(root) processed_path = root_path /"weather" / "processed" / "weather_graph_data_processed.pt" @@ -137,7 +137,7 @@ def _prepare_weather_cache_once(root: str, timeout_s: int, skip_cache_build: boo elif not processed_path.exists(): _ensure_raw_weather_files(root, task_name) logger.info(f"Rank 0 building weather processed cache at {processed_path}") - EfficientWeatherGraphDataset(root=root, pre_transform=None, transform=None) + WeatherforecastingDataset(root=root, pre_transform=None, transform=None) else: logger.info(f"Rank 0 reusing existing weather processed cache at {processed_path}") @@ -412,7 +412,7 @@ def backmap(sorted_idx: np.ndarray) -> np.ndarray: return TemporalSplits(train_idx=train_idx, val_idx=val_idx, test_idx=test_idx) -class EfficientWeatherGraphDataset(InMemoryDataset): +class WeatherforecastingDataset(InMemoryDataset): """ Weather forecasting dataset.