Skip to content

Remove mini_epoch backward compatibility #1582

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

Open
TillHae wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Remove mini_epoch backward compatibility #1582

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
15 changes: 2 additions & 13 deletions packages/common/src/weathergen/common/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,15 +240,9 @@ def get_model_results(run_id: str, mini_epoch: int, rank: int) -> Path:
Get the path to the model results zarr store from a given run_id and mini_epoch.
"""
run_results = Path(_load_private_conf(None)["path_shared_working_dir"]) / f"results/{run_id}"
zarr_path = run_results / f"validation_chkpt{mini_epoch:05d}_rank{rank:04d}.zarr"

zarr_path_new = run_results / f"validation_chkpt{mini_epoch:05d}_rank{rank:04d}.zarr"
zarr_path_old = run_results / f"validation_epoch{mini_epoch:05d}_rank{rank:04d}.zarr"

if zarr_path_new.exists() or zarr_path_new.is_dir():
zarr_path = zarr_path_new
elif zarr_path_old.exists() or zarr_path_old.is_dir():
zarr_path = zarr_path_old
else:
if not (zarr_path.exists() or zarr_path.is_dir()):
raise FileNotFoundError(
f"Zarr file with run_id {run_id}, mini_epoch {mini_epoch} and rank {rank} does not "
f"exist or is not a directory."
Expand Down Expand Up @@ -341,11 +335,6 @@ def load_merge_configs(
assert isinstance(c, Config)
c = _add_interpolation(c)

# Ensure the config has mini-epoch notation
if hasattr(c, "samples_per_epoch"):
c.samples_per_mini_epoch = c.samples_per_epoch
c.num_mini_epochs = c.num_epochs

return c


Expand Down
10 changes: 1 addition & 9 deletions packages/evaluate/src/weathergen/evaluate/io/wegen_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,9 @@ def __init__(self, eval_cfg: dict, run_id: str, private_paths: dict | None = Non
self.eval_cfg.get("metrics_dir", self.metrics_base_dir / self.run_id / "evaluation")
)

fname_zarr_new = self.results_dir.joinpath(
self.fname_zarr = self.results_dir.joinpath(
f"validation_chkpt{self.mini_epoch:05d}_rank{self.rank:04d}.zarr"
)
fname_zarr_old = self.results_dir.joinpath(
f"validation_epoch{self.mini_epoch:05d}_rank{self.rank:04d}.zarr"
)

if fname_zarr_new.exists() or fname_zarr_new.is_dir():
self.fname_zarr = fname_zarr_new
else:
self.fname_zarr = fname_zarr_old

if not self.fname_zarr.exists() or not self.fname_zarr.is_dir():
_logger.error(f"Zarr file {self.fname_zarr} does not exist.")
Expand Down
4 changes: 0 additions & 4 deletions src/weathergen/model/model_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,6 @@ def load_model(cf, model, device, run_id: str, mini_epoch=-1):
)
filename = f"{run_id}_{mini_epoch_id}.chkpt"

if not (path_run / filename).exists():
mini_epoch_id = f"epoch{mini_epoch:05d}"
filename = f"{run_id}_{mini_epoch_id}.chkpt"

params = torch.load(
path_run / filename, map_location=torch.device("cpu"), mmap=True, weights_only=True
)
Expand Down
Loading