Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace ConcatDataset with EnsembleDataset #481

Merged
merged 1 commit into from
Apr 14, 2023
Merged

Replace ConcatDataset with EnsembleDataset #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/graphnet/data/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@
Iterable,
)

from tqdm import tqdm
import numpy as np
import torch
from torch.utils.data import ConcatDataset
from torch_geometric.data import Data

from graphnet.constants import GRAPHNET_ROOT_DIR
Expand Down Expand Up @@ -46,9 +44,9 @@ def from_config( # type: ignore[override]
source: Union[DatasetConfig, str],
) -> Union[
"Dataset",
ConcatDataset,
"EnsembleDataset",
Dict[str, "Dataset"],
Dict[str, ConcatDataset],
Dict[str, "EnsembleDataset"],
]:
"""Construct `Dataset` instance from `source` configuration."""
if isinstance(source, str):
Expand All @@ -75,9 +73,9 @@ def from_config( # type: ignore[override]
def concatenate(
cls,
datasets: List["Dataset"],
) -> ConcatDataset:
) -> "EnsembleDataset":
"""Concatenate multiple `Dataset`s into one instance."""
return ConcatDataset(datasets)
return EnsembleDataset(datasets)

@classmethod
def _construct_datasets_from_dict(
Expand All @@ -90,7 +88,7 @@ def _construct_datasets_from_dict(
for key, selection in selections.items():
config.selection = selection
dataset = Dataset.from_config(config)
assert isinstance(dataset, (Dataset, ConcatDataset))
assert isinstance(dataset, (Dataset, EnsembleDataset))
datasets[key] = dataset

# Reset `selections`.
Expand Down
4 changes: 2 additions & 2 deletions src/graphnet/utilities/config/dataset_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ def __init__(self, **data: Any) -> None:
(...)
}
>>> dataset.config.dump("dataset.yml")
>>> datasets: Dict[str, ConcatDataset] = Dataset.from_config(
>>> datasets: Dict[str, EnsembleDataset] = Dataset.from_config(
"dataset.yml"
)
>>> datasets
{
"train": ConcatDataset(...),
"train": EnsembleDataset(...),
(...)
}

Expand Down