Add client_algo.py, monai_algo.py and exchange_object.py (#4612) by Warvito · Pull Request #4675 · Project-MONAI/MONAI

Warvito · 2022-07-11T21:20:09Z

Description

Add client_algo, monai_algo and exchangeobject according to #4612 to make MONAI FL ready

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.

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

Signed-off-by: Warvito <[email protected]>

…2-add-fl-clientalgo # Conflicts: # monai/fl/utils/constants.py

Nic-Ma · 2022-07-13T23:50:26Z

Hi @Warvito ,

Thanks for your contribution!
Could you please help add some unit tests to verify the features?

Thanks.

Hroth/add monai algo unit tests

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

holgerroth · 2022-08-04T15:55:11Z

Unit tests for MonaiAlgo and ExchangeObject have been added.

Hroth/add monai algo unit tests

wyli

/black
Thanks, it looks good to me. the base class looks clear and the concrete implementation is tested.

Signed-off-by: Wenqi Li <[email protected]>

monai/fl/client/client_algo.py

monai/fl/client/monai_algo.py

ericspod · 2022-08-04T22:33:33Z

I had a few comments but looks good otherwise.

Nic-Ma

Thanks for the update.
Looks good to me, put some minor comments.

Thanks.

monai/fl/client/monai_algo.py

monai/fl/utils/constants.py

monai/fl/utils/exchange_object.py

Signed-off-by: Wenqi Li <[email protected]>

…t to be closer with moani terminology

4832 standardize monai algo

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

wyli · 2022-08-05T17:19:27Z

/black

Signed-off-by: monai-bot <[email protected]>

wyli · 2022-08-05T17:59:14Z

/build

Signed-off-by: Wenqi Li <[email protected]>

wyli · 2022-08-05T19:00:50Z

/build

wyli · 2022-08-05T20:18:23Z

/build

wyli · 2022-08-05T21:11:01Z

/build

Warvito and others added 4 commits July 11, 2022 22:13

Add client_algo.py, monai_algo.py and exchange_object.py (#4612)

8819351

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

627b549

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

Add client_algo.py, monai_algo.py and exchange_object.py

df19d9c

Signed-off-by: Warvito <[email protected]>

Merge remote-tracking branch 'origin/4612-add-fl-clientalgo' into 461…

cc923dc

…2-add-fl-clientalgo # Conflicts: # monai/fl/utils/constants.py

holgerroth added this to the Add MONAI FL client components [P0 v1.0] milestone Aug 3, 2022

This was linked to issues Aug 3, 2022

Add FL ClientAlgo and MONAI bundle reference implementation #4612

Closed

Add unit and integration tests for FL client components #4613

Closed

holgerroth and others added 5 commits August 3, 2022 16:19

add train test

b69c44c

test predict and get_weights

27f85e8

add test for exchange object

f128e79

Merge pull request #1 from Warvito/hroth/add_monai_algo_unit_tests

2ab4a2a

Hroth/add monai algo unit tests

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

0ade23b

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

holgerroth and others added 3 commits August 4, 2022 11:56

fix formatting

cb14ce6

Merge branch 'dev' into 4612-add-fl-clientalgo

8d81707

Merge pull request #2 from Warvito/hroth/add_monai_algo_unit_tests

df290e2

Hroth/add monai algo unit tests

wyli approved these changes Aug 4, 2022

View reviewed changes

wyli added 7 commits August 4, 2022 18:08

fixes style issues

2e6d30b

Signed-off-by: Wenqi Li <[email protected]>

Merge remote-tracking branch 'upstream' into 4612-add-fl-clientalgo

ae84074

Signed-off-by: Wenqi Li <[email protected]>

fixes style and doc

a7d6b45

Signed-off-by: Wenqi Li <[email protected]>

fixes style issue

22a69e9

Signed-off-by: Wenqi Li <[email protected]>

fixes flake8

4cf4ffb

Signed-off-by: Wenqi Li <[email protected]>

fixes unit tests

a85e7b6

Signed-off-by: Wenqi Li <[email protected]>

fixes tests

bc0c082

Signed-off-by: Wenqi Li <[email protected]>

wyli requested review from Nic-Ma, ericspod and rijobro August 4, 2022 22:19

ericspod reviewed Aug 4, 2022

View reviewed changes

monai/fl/client/client_algo.py Show resolved Hide resolved

ericspod reviewed Aug 4, 2022

View reviewed changes

monai/fl/client/monai_algo.py Outdated Show resolved Hide resolved

Nic-Ma approved these changes Aug 5, 2022

View reviewed changes

wyli added 2 commits August 5, 2022 12:13

update based on comments

1d734f4

Signed-off-by: Wenqi Li <[email protected]>

Merge remote-tracking branch 'upstream/dev' into 4612-add-fl-clientalgo

de1e37a

Signed-off-by: Wenqi Li <[email protected]>

holgerroth linked an issue Aug 5, 2022 that may be closed by this pull request

Follow standard monai bundle usage in MonaAlgo #4832

Closed

holgerroth and others added 8 commits August 5, 2022 12:35

combine config files using one parser; use evaluate instead of predic…

a186b56

…t to be closer with moani terminology

fix default return ids

975c8d5

allow standardized usage of bundle

2137689

Merge pull request #3 from Warvito/4832-standardize-monai-algo

0c0a141

4832 standardize monai algo

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

bc40e8a

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

remove comments

e0ef5c9

remove local path from configs

43c622a

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

d83a47f

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

monai-bot and others added 2 commits August 5, 2022 17:23

[MONAI] code formatting

1f570fc

Signed-off-by: monai-bot <[email protected]>

Merge branch 'dev' into 4612-add-fl-clientalgo

4a7ea2e

wyli enabled auto-merge (squash) August 5, 2022 18:06

fixes tests

2045d5c

Signed-off-by: Wenqi Li <[email protected]>

wyli merged commit df6979d into Project-MONAI:dev Aug 5, 2022

Conversation

Warvito commented Jul 11, 2022

Description

Status

Types of changes

Uh oh!

Nic-Ma commented Jul 13, 2022

Uh oh!

holgerroth commented Aug 4, 2022

Uh oh!

wyli left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ericspod commented Aug 4, 2022

Uh oh!

Nic-Ma left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wyli commented Aug 5, 2022

Uh oh!

wyli commented Aug 5, 2022

Uh oh!

wyli commented Aug 5, 2022

Uh oh!

wyli commented Aug 5, 2022

Uh oh!

wyli commented Aug 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

wyli left a comment •

edited

Loading