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.

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(BMZ): Relax model output validation kwargs; extract weights and config file following new spec and core release #279

Merged
merged 5 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions src/careamics/model_io/bioimage/model_description.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from typing import List, Optional, Tuple, Union

import numpy as np
from bioimageio.spec._internal.io import resolve_and_extract
from bioimageio.spec.model.v0_5 import (
ArchitectureFromLibraryDescr,
Author,
Expand Down Expand Up @@ -280,6 +281,16 @@ def create_model_description(
"https://careamics.github.io/latest/",
],
license="BSD-3-Clause",
config={
"bioimageio": {
"test_kwargs": {
"pytorch_state_dict": {
"absolute_tolerance": 1e-2,
"relative_tolerance": 1e-2,
}
}
}
},
version="0.1.0",
weights=weights_descr,
attachments=[FileDescr(source=config_path)],
Expand All @@ -304,15 +315,17 @@ def extract_model_path(model_desc: ModelDescr) -> tuple[Path, Path]:
"""
if model_desc.weights.pytorch_state_dict is None:
raise ValueError("No model weights found in model description.")
weights_path = model_desc.weights.pytorch_state_dict.download().path
weights_path = resolve_and_extract(
model_desc.weights.pytorch_state_dict.source
).path

for file in model_desc.attachments:
file_path = file.source if isinstance(file.source, Path) else file.source.path
if file_path is None:
continue
file_path = Path(file_path)
if file_path.name == "careamics.yaml":
config_path = file.download().path
config_path = resolve_and_extract(file.source).path
break
else:
raise ValueError("Configuration file not found.")
Expand Down
15 changes: 7 additions & 8 deletions src/careamics/model_io/bmz_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
create_env_text,
create_model_description,
extract_model_path,
get_unzip_path,
)


Expand Down Expand Up @@ -185,7 +184,12 @@ def export_to_bmz(
)

# test model description
summary: ValidationSummary = test_model(model_description)
test_kwargs = (
model_description.config.get("bioimageio", {})
.get("test_kwargs", {})
.get("pytorch_state_dict", {})
)
summary: ValidationSummary = test_model(model_description, **test_kwargs)
if summary.status == "failed":
raise ValueError(f"Model description test failed: {summary}")

Expand Down Expand Up @@ -219,14 +223,9 @@ def load_from_bmz(
# load description, this creates an unzipped folder next to the archive
model_desc = load_model_description(path)

# extract relative paths
# extract paths
weights_path, config_path = extract_model_path(model_desc)

# create folder path and absolute paths
unzip_path = get_unzip_path(path)
weights_path = unzip_path / weights_path
config_path = unzip_path / config_path

# load configuration
config = load_configuration(config_path)

Expand Down
Loading