3482 3829 Add `ConfigParser` to recursively parse config content #3822

Nic-Ma · 2022-02-19T04:31:10Z

Task step 3-2 of #3482 .
Fixes #3829

Description

This PR added the ConfigParser to recursively parse config content.

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 <nma@nvidia.com>

Nic-Ma · 2022-02-19T04:32:02Z

/black

Nic-Ma · 2022-02-19T04:32:09Z

/build

Nic-Ma · 2022-02-19T13:26:57Z

/build

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma · 2022-02-20T00:28:51Z

/black

Nic-Ma · 2022-02-20T00:28:59Z

/build

Nic-Ma · 2022-02-20T00:32:23Z

Hi @wyli @ericspod ,

I have simplified the parse logic and removed self.parsed status flag.
And added 3 levels operations for the lazy config in the doc-string of ConfigParser:
get_config, get_config_item(resolve=True/False), get_resolved_content

Could you please help review it again?

Thanks in advance.

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma · 2022-02-21T07:57:26Z

/black

Nic-Ma · 2022-02-21T07:57:36Z

/build

Nic-Ma · 2022-02-21T09:23:29Z

/build

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma · 2022-02-21T10:12:44Z

/black

Nic-Ma · 2022-02-21T10:12:52Z

/build

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma · 2022-02-21T14:17:07Z

/black

Nic-Ma · 2022-02-24T06:08:04Z

/build

Nic-Ma · 2022-02-24T06:12:11Z

/build

Nic-Ma · 2022-02-24T08:29:16Z

/build

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma · 2022-02-24T10:51:27Z

/build

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

Nic-Ma · 2022-02-25T00:45:31Z

/build

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

Nic-Ma · 2022-02-25T14:18:49Z

/black

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

Nic-Ma · 2022-02-25T16:05:06Z

/build

Nic-Ma · 2022-02-27T15:25:53Z

/build

Nic-Ma · 2022-02-28T03:49:01Z

/build

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma · 2022-03-01T02:38:16Z

/black

Nic-Ma · 2022-03-01T02:39:07Z

Hi @wyli @ericspod ,

I have updated the module name from monai.apps.manifest to monai.bundle, could you please help double confirm it again?

Thanks in advance.

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma · 2022-03-01T02:52:29Z

/black

monai/bundle/config_parser.py

Nic-Ma and others added 6 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 #373 from Project-MONAI/dev

85604cf

merge master

[DLMED] add config parser

a3193ba

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma requested review from ericspod, rijobro and wyli February 19, 2022 04:32

Nic-Ma mentioned this pull request Feb 19, 2022

Develop MVP of model bundle #3482

Closed

17 tasks

[DLMED] simplify parse logic

04e3ee7

Signed-off-by: Nic Ma <nma@nvidia.com>

[DLMED] add more function tests

9abb571

Signed-off-by: Nic Ma <nma@nvidia.com>

Merge branch 'dev' into 3482-add-config-parser

32aac56

wyli mentioned this pull request Feb 21, 2022

tests.test_config_item #3829

Closed

[DLMED] fix torchvision tests

fe3f7c2

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma changed the title ~~3482 Add ConfigParser to recursively parse config content~~ 3482 3829 Add ConfigParser to recursively parse config content Feb 21, 2022

Nic-Ma added 2 commits February 21, 2022 21:45

Merge branch 'dev' into 3482-add-config-parser

d4cb4b0

[DLMED] enhance update_config to support multiple items

886b607

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma enabled auto-merge (squash) February 24, 2022 03:45

Nic-Ma force-pushed the 3482-add-config-parser branch from e70d663 to 4492a91 Compare February 24, 2022 10:06

wyli force-pushed the 3482-add-config-parser branch from ab21c3f to 43ce0e5 Compare February 24, 2022 10:22

Nic-Ma added 2 commits February 24, 2022 18:28

[DLMED] update code

b86f897

Signed-off-by: Nic Ma <nma@nvidia.com>

[DLMED] update doc

28c5c07

Signed-off-by: Nic Ma <nma@nvidia.com>

wyli force-pushed the 3482-add-config-parser branch from a9c984c to 33b0239 Compare February 24, 2022 11:04

Nic-Ma mentioned this pull request Feb 24, 2022

3482 add run API for common training, evaluation and inference #3832

Merged

7 tasks

update usage

7d2903f

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

wyli force-pushed the 3482-add-config-parser branch from 7583a4e to f5db958 Compare February 24, 2022 23:36

wyli added 2 commits February 24, 2022 23:44

update regex for <args>

337c51d

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

revise docstring

5b693bb

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

wyli force-pushed the 3482-add-config-parser branch from f5db958 to 5b693bb Compare February 24, 2022 23:44

refactor to not hard code special chars

4aadb09

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

flag to switch eval expr

eabfff0

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

[DLMED] change apps.manifest to bundle

5b1fae6

Signed-off-by: Nic Ma <nma@nvidia.com>

[DLMED] add missing component

b6020d9

Signed-off-by: Nic Ma <nma@nvidia.com>

Nic-Ma commented Mar 1, 2022

View reviewed changes

monai/bundle/config_parser.py Show resolved Hide resolved

Nic-Ma merged commit dbd3da3 into Project-MONAI:dev Mar 1, 2022

3482 3829 Add ConfigParser to recursively parse config content #3822

3482 3829 Add ConfigParser to recursively parse config content #3822

Uh oh!

Conversation

Nic-Ma commented Feb 19, 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 Feb 19, 2022

Uh oh!

Nic-Ma commented Feb 19, 2022

Uh oh!

Nic-Ma commented Feb 19, 2022

Uh oh!

Nic-Ma commented Feb 20, 2022

Uh oh!

Nic-Ma commented Feb 20, 2022

Uh oh!

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

Uh oh!

Uh oh!

Nic-Ma commented Feb 21, 2022

Uh oh!

Nic-Ma commented Feb 21, 2022

Uh oh!

Nic-Ma commented Feb 21, 2022

Uh oh!

Nic-Ma commented Feb 21, 2022

Uh oh!

Nic-Ma commented Feb 21, 2022

Uh oh!

Nic-Ma commented Feb 21, 2022

Uh oh!

Nic-Ma commented Feb 24, 2022

Uh oh!

Nic-Ma commented Feb 24, 2022

Uh oh!

Nic-Ma commented Feb 24, 2022

Uh oh!

Nic-Ma commented Feb 24, 2022

Uh oh!

Nic-Ma commented Feb 25, 2022

Uh oh!

Nic-Ma commented Feb 25, 2022

Uh oh!

Nic-Ma commented Feb 25, 2022

Uh oh!

Nic-Ma commented Feb 27, 2022

Uh oh!

Nic-Ma commented Feb 28, 2022

Uh oh!

Nic-Ma commented Mar 1, 2022

Uh oh!

Nic-Ma commented Mar 1, 2022

Uh oh!

Nic-Ma commented Mar 1, 2022

Uh oh!

Uh oh!

Uh oh!

3482 3829 Add `ConfigParser` to recursively parse config content #3822

3482 3829 Add `ConfigParser` to recursively parse config content #3822

Nic-Ma commented Feb 19, 2022 •

edited

Loading

Nic-Ma commented Feb 20, 2022 •

edited

Loading