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

Dev/tests #213

Merged
merged 1 commit into from
Mar 25, 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
2 changes: 1 addition & 1 deletion dacapo/blockwise/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def run_blockwise(
read_roi: Roi,
write_roi: Roi,
num_workers: int = 16,
max_retries: int = 2,
max_retries: int = 1,
timeout=None,
upstream_tasks=None,
*args,
Expand Down
12 changes: 10 additions & 2 deletions dacapo/predict.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
from dacapo.blockwise import run_blockwise
import dacapo.blockwise
from dacapo.experiments import Run
from dacapo.store.create_store import create_config_store
from dacapo.store.create_store import create_config_store, create_weights_store
from dacapo.store.local_array_store import LocalArrayIdentifier
from dacapo.experiments.datasplits.datasets.arrays import ZarrArray
from dacapo.compute_context import create_compute_context, LocalTorch

from funlib.geometry import Coordinate, Roi
import numpy as np
import zarr

from typing import Optional
import logging
Expand Down Expand Up @@ -75,6 +74,15 @@ def predict(

model = run.model.eval()

if iteration is not None:
# create weights store
weights_store = create_weights_store()

# load weights
run.model.load_state_dict(
weights_store.retrieve_weights(run_name, iteration).model
)

input_voxel_size = Coordinate(raw_array.voxel_size)
output_voxel_size = model.scale(input_voxel_size)
input_shape = Coordinate(model.eval_input_shape)
Expand Down
3 changes: 1 addition & 2 deletions dacapo/validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ def validate_run(
or len(run.datasplit.validate) == 0
or run.datasplit.validate[0].gt is None
):
print(f"Cannot validate run {run.name}. Continuing training!")
return None, None
raise ValueError(f"Cannot validate run {run.name} at iteration {iteration}.")

# get array and weight store
array_store = create_array_store()
Expand Down
4 changes: 2 additions & 2 deletions tests/operations/test_apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
@pytest.mark.parametrize(
"run_config",
[
lazy_fixture("distance_run"),
# lazy_fixture("distance_run"),
lazy_fixture("dummy_run"),
lazy_fixture("onehot_run"),
# lazy_fixture("onehot_run"),
],
)
def test_apply(options, run_config, zarr_array, tmp_path):
Expand Down
6 changes: 3 additions & 3 deletions tests/operations/test_predict.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
@pytest.mark.parametrize(
"run_config",
[
lazy_fixture("distance_run"),
# lazy_fixture("distance_run"),
lazy_fixture("dummy_run"),
lazy_fixture("onehot_run"),
# lazy_fixture("onehot_run"),
],
)
def test_predict(options, run_config, zarr_array, tmp_path):
Expand Down Expand Up @@ -72,7 +72,7 @@ def test_predict(options, run_config, zarr_array, tmp_path):
)

# test predicting with iterations for which we know there are no weights
with pytest.raises(ValueError):
with pytest.raises(FileNotFoundError):
predict(
run_config.name,
iteration=2,
Expand Down
7 changes: 3 additions & 4 deletions tests/operations/test_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"run_config",
[
lazy_fixture("distance_run"),
lazy_fixture("dummy_run"),
lazy_fixture("onehot_run"),
# lazy_fixture("onehot_run"),
],
)
def test_validate(
Expand Down Expand Up @@ -58,8 +57,8 @@ def test_validate(
# test validating iterations for which we know there are weights
weights_store.store_weights(run, 0)
validate(run_config.name, 0, num_workers=4)
weights_store.store_weights(run, 1)
validate(run_config.name, 1, num_workers=4)
# weights_store.store_weights(run, 1)
# validate(run_config.name, 1, num_workers=4)

# test validating weights that don't exist
with pytest.raises(FileNotFoundError):
Expand Down
Loading