4563 Enhance the stats information of workflows by Nic-Ma · Pull Request #4888 · Project-MONAI/MONAI

Nic-Ma · 2022-08-10T07:35:36Z

Fixes #4563 .

Description

This PR enhanced the stats information of trainer and evaluator workflows.

Status

Ready

Types of changes

Non-breaking change (fix or new feature that would not break existing functionality).
Breaking change (fix or new feature that would cause existing functionality to change).
New tests added to cover the changes.
Integration tests passed locally by running ./runtests.sh -f -u --net --coverage.
Quick tests passed locally by running ./runtests.sh --quick --unittests --disttests.
In-line docstrings updated.
Documentation updated, tested make html command in the docs/ folder.

merge master

Signed-off-by: Nic Ma <[email protected]>

for more information, see https://pre-commit.ci

Signed-off-by: Nic Ma <[email protected]>

Nic-Ma · 2022-08-10T09:53:21Z

/black

Nic-Ma · 2022-08-10T09:53:28Z

/build

monai/engines/trainer.py

Signed-off-by: Nic Ma <[email protected]>

for more information, see https://pre-commit.ci

Nic-Ma · 2022-08-11T03:31:15Z

/black

Nic-Ma · 2022-08-11T03:31:22Z

/build

Nic-Ma · 2022-08-11T03:35:34Z

/build

Nic-Ma · 2022-08-11T13:58:46Z

/black

Nic-Ma · 2022-08-11T13:58:59Z

/build

Nic-Ma · 2022-08-11T14:18:13Z

/build

Signed-off-by: Nic Ma <[email protected]>

Nic-Ma · 2022-08-12T04:04:03Z

/build

monai/engines/evaluator.py

Signed-off-by: Nic Ma <[email protected]>

Nic-Ma · 2022-08-12T13:35:26Z

/build

holgerroth

LGTM

monai/fl/utils/constants.py

monai/engines/trainer.py

holgerroth

It looks good but I'm getting an error with the nvflare integration now:

Traceback (most recent call last):
  File "/home/hroth/Code2/nvflare/sim-project/yhwen-simulator/nvflare/app_common/pt/pt_file_model_persistor.py", line 199, in load_model
    data = self.model.state_dict() if self.model is not None else OrderedDict()
AttributeError: 'dict' object has no attribute 'state_dict'

found error while testing

Nic-Ma · 2022-08-13T09:38:36Z

Hi @holgerroth ,

Thanks for your review and test.
I see the error message is in NVFlare, could you please help provide more information on MONAI side?

Thanks.

holgerroth · 2022-08-15T14:29:39Z

The issue came from using an old UNet style config in the NVFlare configuration.

>>> net = UNet(
...     dimensions=2,
...     in_channels=1,
...     out_channels=2,
...     channels=(16, 32, 64, 128, 256),
...     strides=(2, 2, 2, 2),
...     num_res_units=2,
...     norm="batch"
... )
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: __init__() missing 1 required positional argument: 'spatial_dims'

Changing dimensions to spatial_dims solves the issue.

wyli · 2022-08-15T14:41:30Z

/build

Nic-Ma and others added 12 commits February 1, 2021 19:15

Merge pull request #19 from Project-MONAI/master

42a45e0

merge master

Merge pull request #32 from Project-MONAI/master

cd16a13

merge master

Merge pull request #180 from Project-MONAI/dev

6f87afd

merge master

Merge pull request #214 from Project-MONAI/dev

f398298

merge master

Merge pull request #397 from Project-MONAI/dev

ec463d6

merge master

Merge pull request #429 from Project-MONAI/dev

ca62306

merge master

Merge pull request #438 from Project-MONAI/dev

e275b1d

merge master

[DLMED] enhance stats

3e26656

Signed-off-by: Nic Ma <[email protected]>

[DLMED] add tests

963a8c4

Signed-off-by: Nic Ma <[email protected]>

[pre-commit.ci] auto fixes from pre-commit.com hooks

f017eb2

for more information, see https://pre-commit.ci

Merge branch 'dev' into 4563-enhance-get-stats

daac6fe

[DLMED] fix tests

4301210

Signed-off-by: Nic Ma <[email protected]>

Nic-Ma changed the title ~~[WIP] 4563 Enhance the stats information of workflows~~ 4563 Enhance the stats information of workflows Aug 10, 2022

Nic-Ma marked this pull request as ready for review August 10, 2022 09:54

Nic-Ma requested review from Warvito, ericspod, holgerroth, rijobro and wyli August 10, 2022 09:54

Nic-Ma mentioned this pull request Aug 10, 2022

4846 send weight differences #4876

Merged

7 tasks

ericspod reviewed Aug 10, 2022

View reviewed changes

monai/engines/trainer.py Outdated Show resolved Hide resolved

ericspod reviewed Aug 10, 2022

View reviewed changes

monai/engines/trainer.py Outdated Show resolved Hide resolved

Nic-Ma added 2 commits August 11, 2022 11:05

[DLMED] update according to comments

ecff67a

Signed-off-by: Nic Ma <[email protected]>

[DLMED] correct code folder

ba8b6ea

Signed-off-by: Nic Ma <[email protected]>

Nic-Ma force-pushed the 4563-enhance-get-stats branch from 647c309 to ba8b6ea Compare August 11, 2022 03:29

Nic-Ma and others added 2 commits August 11, 2022 11:29

Merge branch 'dev' into 4563-enhance-get-stats

c2b40cc

[pre-commit.ci] auto fixes from pre-commit.com hooks

7db149f

for more information, see https://pre-commit.ci

Nic-Ma requested a review from ericspod August 11, 2022 10:58

Merge branch 'dev' into 4563-enhance-get-stats

8b796b2

Merge branch 'dev' into 4563-enhance-get-stats

6aecdf8

Nic-Ma added 2 commits August 12, 2022 11:05

Merge branch 'dev' into 4563-enhance-get-stats

dff183d

[DLMED] keep backward compatible

ff50b56

Signed-off-by: Nic Ma <[email protected]>

wyli reviewed Aug 12, 2022

View reviewed changes

monai/engines/evaluator.py Outdated Show resolved Hide resolved

Nic-Ma added 2 commits August 12, 2022 21:22

[DLMED] update according to comments

65db8b6

Signed-off-by: Nic Ma <[email protected]>

Merge branch 'dev' into 4563-enhance-get-stats

c4ef703

Nic-Ma enabled auto-merge (squash) August 12, 2022 15:53

Merge branch 'dev' into 4563-enhance-get-stats

3d8cff6

holgerroth previously approved these changes Aug 12, 2022

View reviewed changes

monai/fl/utils/constants.py Outdated Show resolved Hide resolved

monai/engines/trainer.py Show resolved Hide resolved

holgerroth reviewed Aug 12, 2022

View reviewed changes

holgerroth mentioned this pull request Aug 12, 2022

[WIP] 4563 enhance get stats #4904

Closed

7 tasks

holgerroth approved these changes Aug 15, 2022

View reviewed changes

Merge branch 'dev' into 4563-enhance-get-stats

aef03bd

Nic-Ma merged commit 4deb765 into Project-MONAI:dev Aug 15, 2022

Conversation

Nic-Ma commented Aug 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Status

Types of changes

Uh oh!

Nic-Ma commented Aug 10, 2022

Uh oh!

Nic-Ma commented Aug 10, 2022

Uh oh!

Uh oh!

Uh oh!

Nic-Ma commented Aug 11, 2022

Uh oh!

Nic-Ma commented Aug 11, 2022

Uh oh!

Nic-Ma commented Aug 11, 2022

Uh oh!

Nic-Ma commented Aug 11, 2022

Uh oh!

Nic-Ma commented Aug 11, 2022

Uh oh!

Nic-Ma commented Aug 11, 2022

Uh oh!

Nic-Ma commented Aug 12, 2022

Uh oh!

Uh oh!

Nic-Ma commented Aug 12, 2022

Uh oh!

holgerroth left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

holgerroth left a comment

Choose a reason for hiding this comment

Uh oh!

Nic-Ma commented Aug 13, 2022

Uh oh!

holgerroth commented Aug 15, 2022

Uh oh!

wyli commented Aug 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Nic-Ma commented Aug 10, 2022 •

edited

Loading