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

update validation epoch #7121

Merged
merged 6 commits into from
Oct 12, 2023
Merged

update validation epoch #7121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0640e2e
update validation epoch
wyli Oct 11, 2023
ca4488d
update
wyli Oct 12, 2023
87185e4
fixes test
wyli Oct 12, 2023
e0af817
update test
wyli Oct 12, 2023
9e188d0
fixes fuzzy download url
wyli Oct 12, 2023
4f31644
remove temp
wyli Oct 12, 2023
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: 2 additions & 0 deletions monai/apps/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ def download_url(
if urlparse(url).netloc == "drive.google.com":
if not has_gdown:
raise RuntimeError("To download files from Google Drive, please install the gdown dependency.")
if "fuzzy" not in gdown_kwargs:
gdown_kwargs["fuzzy"] = True # default to true for flexible url
gdown.download(url, f"{tmp_name}", quiet=not progress, **gdown_kwargs)
elif urlparse(url).netloc == "cloud-api.yandex.net":
with urlopen(url) as response:
Expand Down
2 changes: 1 addition & 1 deletion monai/engines/evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def run(self, global_epoch: int = 1) -> None: # type: ignore[override]

"""
# init env value for current validation process
self.state.max_epochs = global_epoch
self.state.max_epochs = max(global_epoch, 1) # at least one epoch of validation
self.state.epoch = global_epoch - 1
wyli marked this conversation as resolved.
Show resolved Hide resolved
self.state.iteration = 0
super().run()
Expand Down
6 changes: 4 additions & 2 deletions tests/test_handler_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

class TestEvaluator(Evaluator):
def _iteration(self, engine, batchdata):
pass
engine.state.output = "called"
return engine.state.output


class TestHandlerValidation(unittest.TestCase):
Expand All @@ -42,8 +43,9 @@ def _train_func(engine, batch):
ValidationHandler(interval=2, validator=evaluator, exec_at_start=True).attach(engine)
# test execution at start
engine.run(data, max_epochs=1)
self.assertEqual(evaluator.state.max_epochs, 0)
self.assertEqual(evaluator.state.max_epochs, 1)
self.assertEqual(evaluator.state.epoch_length, 8)
self.assertEqual(evaluator.state.output, "called")

engine.run(data, max_epochs=5)
self.assertEqual(evaluator.state.max_epochs, 4)
Expand Down