Skip to content

Refactor MAISI tutorial, migrate GenerativeAI import #1779

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
Merged
KumoLiu merged 38 commits into from
Aug 15, 2024
Merged

Refactor MAISI tutorial, migrate GenerativeAI import #1779

KumoLiu merged 38 commits into from
Aug 15, 2024

Conversation

@Can-Zhao
Copy link
Contributor

@Can-Zhao Can-Zhao commented Aug 12, 2024 •
edited
Loading

Fixes #1772 .

Description

Refactor MAISI tutorial, migrate GenerativeAI import to monai core.
Add inference script.
Correct logging format.
VAE training notebook tested.
Diffusion training notebook tested.
ControlNet training notebook tested.
Inference notebook tested.

Checks

  • Avoid including large-size files in the PR.
  • Clean up long text outputs from code cells in the notebook.
  • For security purposes, please check the contents and remove any sensitive info such as user names and private key.
  • Ensure (1) hyperlinks and markdown anchors are working (2) use relative paths for tutorial repo files (3) put figure and graphs in the ./figure folder
  • Notebook runs automatically ./runner.sh -t <path to .ipynb file>

@Can-Zhao
change mor_op position, rm generative import in vae
f544302 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@review-notebook-app
Copy link

review-notebook-app bot commented Aug 12, 2024

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

mingxin-zheng
mingxin-zheng previously approved these changes Aug 12, 2024
View reviewed changes
@mingxin-zheng mingxin-zheng dismissed their stale review August 12, 2024 08:02

MR is still in draft state. Maybe there are some more refactors

KumoLiu
KumoLiu reviewed Aug 12, 2024
View reviewed changes
Can-Zhao and others added 16 commits August 12, 2024 14:04
@Can-Zhao
rm xformer import in vae
9da99fb 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
add load ckpt functions, inference notebook can run
dcad093 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
148484b 
for more information, see https://pre-commit.ci
@Can-Zhao
fix logging format, add inference script, add details in readme
a551102 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
966583f 
for more information, see https://pre-commit.ci
@Can-Zhao
fix typo
4c9c780 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
Merge branch 'refactor_maisi' of https://github.com/Can-Zhao/tutorials …
0b3e3dc 
…into refactor_maisi
@Can-Zhao
update readme
1272254 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
a45c9f9 
for more information, see https://pre-commit.ci
@Can-Zhao
reformat
4af5f5a 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
update readme
4aa9401 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
clear directory in code
b392528 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
a8ca930 
for more information, see https://pre-commit.ci
@Can-Zhao
clear directory in code
b0dda95 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
Merge branch 'refactor_maisi' of https://github.com/Can-Zhao/tutorials …
1bc2a7d 
…into refactor_maisi
@Can-Zhao
change epoch to 1 to save notebook run time
094e938 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao Can-Zhao marked this pull request as ready for review August 12, 2024 17:54
Can-Zhao and others added 8 commits August 12, 2024 18:23
@Can-Zhao
rm controllable size in inference input
6b064d1 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
mv some description to Readme, use subset of data to train in noteboo…
fb080de 
…k to save time

Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
rm dir info
5b942f1 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
rm xformer
837cfb7 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
rm generative in sample.py, clean print in utils.py
04a78bf 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
e97a51d 
for more information, see https://pre-commit.ci
@Can-Zhao
clean legacy code in utils.py
d5dbabe 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
Merge branch 'refactor_maisi' of https://github.com/Can-Zhao/tutorials …
1b287fe 
…into refactor_maisi
@Can-Zhao
Copy link
Contributor Author

Can-Zhao commented Aug 13, 2024 •
edited
Loading

To pass CI, it requires monai core ControlNetMaisi to remove generative dependency first.

@mingxin-zheng
Copy link
Contributor

mingxin-zheng commented Aug 13, 2024

To pass CI, it requires monai core ControlNetMaisi to remove generative dependency first.

It seems we can re-run it after this PR is merged:
Project-MONAI/MONAI#8005

KumoLiu
KumoLiu reviewed Aug 13, 2024
View reviewed changes
KumoLiu
KumoLiu reviewed Aug 13, 2024
View reviewed changes
mingxin-zheng
mingxin-zheng reviewed Aug 13, 2024
View reviewed changes
mingxin-zheng
mingxin-zheng reviewed Aug 13, 2024
View reviewed changes
Can-Zhao and others added 12 commits August 13, 2024 15:26
@Can-Zhao
rm repeated comment, rm xformer description, rm generative repo descr…
c223fad 
…iption

Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
daf5c2b 
for more information, see https://pre-commit.ci
@Can-Zhao
rm xformer description
402f4c0 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
Merge branch 'main' into refactor_maisi
3c178c8
@Can-Zhao
change docstring
288e73d 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
Merge branch 'refactor_maisi' of https://github.com/Can-Zhao/tutorials …
2659218 
…into refactor_maisi
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
4e774bc 
for more information, see https://pre-commit.ci
@Can-Zhao
Merge branch 'main' into refactor_maisi
0835773
@Can-Zhao
refactor for new controlnet
c56b0f2 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@Can-Zhao
Merge branch 'refactor_maisi' of https://github.com/Can-Zhao/tutorials …
b91b83c 
…into refactor_maisi
@Can-Zhao
refactor inference
59907c4 
Signed-off-by: Can-Zhao <volcanofly@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
7b3c389 
for more information, see https://pre-commit.ci
@KumoLiu KumoLiu merged commit 62f8ff8 into Project-MONAI:main Aug 15, 2024
@KumoLiu
Copy link
Contributor

KumoLiu commented Aug 15, 2024

Hi @Can-Zhao, I find there is still one place need to be updated in the maisi: https://github.com/Project-MONAI/tutorials/blob/main/generation/maisi/configs/config_maisi_diff_model.json#L3

@Can-Zhao
Copy link
Contributor Author

Can-Zhao commented Aug 16, 2024

Hi @Can-Zhao, I find there is still one place need to be updated in the maisi: https://github.com/Project-MONAI/tutorials/blob/main/generation/maisi/configs/config_maisi_diff_model.json#L3

Submitted a PR for it #1786

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mingxin-zheng mingxin-zheng mingxin-zheng left review comments

@guopengf guopengf guopengf left review comments

@KumoLiu KumoLiu KumoLiu approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Refactor MAISI Network with New Generative AI Components

4 participants

@Can-Zhao @mingxin-zheng @KumoLiu @guopengf