6676 port losses from monai-generative #6729

marksgraham · 2023-07-14T19:56:19Z

Work towards addressing issue #6676

Description

This PR ports spectral, perceptual and patch adversial losses from MONAI Generative.

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.

marksgraham · 2023-07-19T13:25:33Z

This PR requires a new package, lpips. I've updated requirements-dev.txt, but all the automated checks fails because the package isn't found. I'm not sure how to fix this - any tips @wyli or @mingxin-zheng ?

wyli · 2023-07-19T13:44:45Z

sure, probably there are a few places to be updated with the new package, please see https://github.com/Project-MONAI/MONAI/blob/dev/CONTRIBUTING.md#adding-new-optional-dependencies

mingxin-zheng · 2023-07-19T14:17:07Z

Hi @marksgraham the min and package tests do not install packages in requirements-dev.txt, because they are just doing "fast" checks. So, the first step to try is to exclude the new tests in this PR from the min tests in this file.

…nd uses optional_import to import it

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

Signed-off-by: Mark Graham <[email protected]>

I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: a21c7f1 I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 79a3784 I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 89c4e83 I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 3faaca5 I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 086b8a9 I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 105c3b8 I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 700096d I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: cd01b59 I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: a5e092e Signed-off-by: Mark Graham <[email protected]>

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

…MONAI into 6676_port_generative_losses

I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 36d7ed6 Signed-off-by: Mark Graham <[email protected]>

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

wyli · 2023-07-31T16:21:51Z

/build

wyli · 2023-07-31T16:22:23Z

/build

wyli

thanks, it looks good to me, there's a minor issue about the torch.hub.set_dir usage

monai/losses/perceptual.py

tests/test_perceptual_loss.py

Signed-off-by: Mark Graham <[email protected]>

…MONAI into 6676_port_generative_losses

Signed-off-by: Mark Graham <[email protected]>

monai/losses/adversarial_loss.py

monai/losses/perceptual.py

mingxin-zheng · 2023-08-02T16:16:03Z

Hi @marksgraham , none of my commented items is critical to fix. Please feel free to skip and close them as you see fit.

… version Signed-off-by: Mark Graham <[email protected]>

Signed-off-by: Mark Graham <[email protected]>

wyli · 2023-08-03T13:19:19Z

/build

monai/losses/spectral_loss.py

marksgraham added 3 commits July 14, 2023 13:29

Adds losses

a21c7f1

Adds LPIPS as a requirement

79a3784

Updates docstrings

89c4e83

marksgraham marked this pull request as ready for review July 19, 2023 13:20

marksgraham changed the title ~~[WIP] 6676 port losses from monai-generative~~ 6676 port losses from monai-generative Jul 19, 2023

marksgraham and others added 15 commits July 19, 2023 15:22

Adds external dependency to relevant files, excludes from min tests a…

3faaca5

…nd uses optional_import to import it

Uses optional_import for torchvision too

086b8a9

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

f500f4a

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

Fixes typing issues in perceptual loss

105c3b8

Fixes typing issues in adversarial loss

700096d

Fixes merge conflicts

ea158ca

Merge branch 'dev' into 6676_port_generative_losses

4b1d801

Signed-off-by: Mark Graham <[email protected]>

Fixes more typing errors

cd01b59

Formatting fix

a5e092e

Empty commit workaround undo

36d7ed6

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

d9d1140

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

Merge branch '6676_port_generative_losses' of github.com:marksgraham/…

413f394

…MONAI into 6676_port_generative_losses

DCO Remediation Commit for Mark Graham <[email protected]>

c118d10

I, Mark Graham <[email protected]>, hereby add my Signed-off-by to this commit: 36d7ed6 Signed-off-by: Mark Graham <[email protected]>

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

f8f1a3f

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

marksgraham requested review from wyli and mingxin-zheng July 31, 2023 15:34

Merge branch 'dev' into 6676_port_generative_losses

6260984

wyli approved these changes Jul 31, 2023

View reviewed changes

monai/losses/perceptual.py Show resolved Hide resolved

wyli reviewed Jul 31, 2023

View reviewed changes

tests/test_perceptual_loss.py Show resolved Hide resolved

marksgraham added 3 commits August 2, 2023 16:24

Fix errors with earlier torchvision versions

a4e16c8

Signed-off-by: Mark Graham <[email protected]>

Merge branch '6676_port_generative_losses' of github.com:marksgraham/…

569e4e2

…MONAI into 6676_port_generative_losses

Adds warning if user specifies cache_dir

42414ff

Signed-off-by: Mark Graham <[email protected]>

mingxin-zheng reviewed Aug 2, 2023

View reviewed changes

marksgraham and others added 4 commits August 3, 2023 13:05

Reverts to warivto for modelhub and changes perceptual test decorator…

cfb24b4

… version Signed-off-by: Mark Graham <[email protected]>

Addresses comments from mingxin-zheng

ebfe2ef

Signed-off-by: Mark Graham <[email protected]>

Fixes codeformat list comprehension error

840e5cc

Signed-off-by: Mark Graham <[email protected]>

Merge branch 'dev' into 6676_port_generative_losses

345d82c

wyli enabled auto-merge (squash) August 3, 2023 13:19

mingxin-zheng approved these changes Aug 3, 2023

View reviewed changes

wyli merged commit 6f5cea3 into Project-MONAI:dev Aug 3, 2023
25 of 30 checks passed

mingxin-zheng reviewed Aug 4, 2023

View reviewed changes

monai/losses/spectral_loss.py Show resolved Hide resolved

marksgraham mentioned this pull request Jul 6, 2023

Move MONAI Generative into core #6676

Closed

7 tasks

marksgraham mentioned this pull request Nov 3, 2023

[WIP]Ports generative networks #7196

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

6676 port losses from monai-generative #6729

6676 port losses from monai-generative #6729

marksgraham commented Jul 14, 2023 •

edited

Loading

marksgraham commented Jul 19, 2023

wyli commented Jul 19, 2023

mingxin-zheng commented Jul 19, 2023

wyli commented Jul 31, 2023

wyli commented Jul 31, 2023

wyli left a comment

mingxin-zheng commented Aug 2, 2023

wyli commented Aug 3, 2023

6676 port losses from monai-generative #6729

6676 port losses from monai-generative #6729

Conversation

marksgraham commented Jul 14, 2023 • edited Loading

Description

Types of changes

marksgraham commented Jul 19, 2023

wyli commented Jul 19, 2023

mingxin-zheng commented Jul 19, 2023

wyli commented Jul 31, 2023

wyli commented Jul 31, 2023

wyli left a comment

Choose a reason for hiding this comment

mingxin-zheng commented Aug 2, 2023

wyli commented Aug 3, 2023

marksgraham commented Jul 14, 2023 •

edited

Loading