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

Fix DLWP-Healpix coupled dataloader not supporting extracting specific channels for constants array #715

Merged
merged 7 commits into from
Dec 3, 2024
Merged

Fix DLWP-Healpix coupled dataloader not supporting extracting specific channels for constants array #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bbdfb4
Add extracting channels for constants array in healpix dataset
ivanauyeung Nov 18, 2024
cd8e0ef
Add extracting channels for constants array in healpix dataset
ivanauyeung Nov 18, 2024
855b2cd
Merge branch 'main' into dlwp_dataloader_constants
daviddpruitt Dec 3, 2024
c29af8a
fix for constant test
daviddpruitt Dec 3, 2024
0d3e0c7
Merge branch 'main' into dlwp_dataloader_constants
daviddpruitt Dec 3, 2024
a306a66
update test to correctly select constants
daviddpruitt Dec 3, 2024
bf26ee4
Merge branch 'dlwp_dataloader_constants' of github.com:ivanauyeung/mo…
daviddpruitt Dec 3, 2024
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
6 changes: 6 additions & 0 deletions modulus/datapipes/healpix/data_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,9 @@ def setup(self) -> None:
batch_size=self.batch_size,
)

if self.constants is not None:
dataset = dataset.sel(channel_c=list(self.constants.values()))

if self.splits is not None and self.forecast_init_times is None:
self.train_dataset = TimeSeriesDataset(
dataset.sel(
Expand Down Expand Up @@ -1033,6 +1036,9 @@ def setup(self) -> None:
batch_size=self.batch_size,
)

if self.constants is not None:
dataset = dataset.sel(channel_c=list(self.constants.values()))

if self.splits is not None and self.forecast_init_times is None:
self.train_dataset = CoupledTimeSeriesDataset(
dataset.sel(
Expand Down
5 changes: 4 additions & 1 deletion test/datapipes/test_healpix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,10 @@ def test_TimeSeriesDataModule_get_constants(
# open our test dataset
ds_path = Path(data_dir, dataset_name + ".zarr")
zarr_ds = xr.open_zarr(ds_path)
expected = np.transpose(zarr_ds.constants.values, axes=(1, 0, 2, 3))
expected = np.transpose(
zarr_ds.constants.sel(channel_c=list(constants.keys())).values,
axes=(1, 0, 2, 3),
)

assert np.array_equal(
timeseries_dm.get_constants(),
Expand Down
5 changes: 4 additions & 1 deletion test/datapipes/test_healpix_couple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,10 @@ def test_CoupledTimeSeriesDataModule_get_constants(
# open our test dataset
ds_path = Path(data_dir, dataset_name + ".zarr")
zarr_ds = xr.open_zarr(ds_path)
expected = np.transpose(zarr_ds.constants.values, axes=(1, 0, 2, 3))
expected = np.transpose(
zarr_ds.constants.sel(channel_c=list(constants.keys())).values,
axes=(1, 0, 2, 3),
)

assert np.array_equal(
timeseries_dm.get_constants(),
Expand Down