Skip to content
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.

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

Make SequentialDict return outputs from all modules as DotDict #171

Merged
merged 18 commits into from
Jun 22, 2023

Conversation

dxoigmn
Copy link
Contributor

@dxoigmn dxoigmn commented Jun 14, 2023

What does this PR do?

Right now SequentialDict only returns the output module. This requires hardcoding a module with that name and often makes configuration more verbose than necessary. This PR removes that requirement and simplifies configuration by returning all outputs in the form of a DotDict. This is a breaking change and also removes ReturnKwargs since it is unnecessary.

This PR depends upon the following:

Type of change

Please check all relevant options.

  • Improvement (non-breaking)
  • Bug fix (non-breaking)
  • New feature (non-breaking)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Testing

Please describe the tests that you ran to verify your changes. Consider listing any relevant details of your test configuration.

  • pytest
  • CUDA_VISIBLE_DEVICES=0 python -m mart experiment=CIFAR10_CNN_Adv trainer=gpu trainer.precision=16 reports 70% (21 sec/epoch).
  • CUDA_VISIBLE_DEVICES=0,1 python -m mart experiment=CIFAR10_CNN_Adv trainer=ddp trainer.precision=16 trainer.devices=2 model.optimizer.lr=0.2 trainer.max_steps=2925 datamodule.ims_per_batch=256 datamodule.world_size=2 reports 70% (14 sec/epoch).

Before submitting

  • The title is self-explanatory and the description concisely explains the PR
  • My PR does only one thing, instead of bundling different changes together
  • I list all the breaking changes introduced by this pull request
  • I have commented my code
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have run pre-commit hooks with pre-commit run -a command without errors

Did you have fun?

Make sure you had fun coding 🙃

@dxoigmn dxoigmn changed the title Make SequentialDict return outputs from all modules Make SequentialDict return outputs from all modules as DotDict Jun 14, 2023
@dxoigmn dxoigmn changed the base branch from main to better_litmodular3 June 14, 2023 01:13
@dxoigmn dxoigmn requested a review from mzweilin June 14, 2023 01:21
@dxoigmn dxoigmn marked this pull request as ready for review June 14, 2023 01:21
@dxoigmn dxoigmn mentioned this pull request Jun 14, 2023
19 tasks
@dxoigmn dxoigmn marked this pull request as draft June 15, 2023 01:07
@dxoigmn dxoigmn marked this pull request as ready for review June 15, 2023 01:07
@dxoigmn dxoigmn requested review from mzweilin and removed request for mzweilin June 15, 2023 01:07
Copy link
Contributor

@mzweilin mzweilin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like there're merged changes in mart/models/modular.py.
I will review again after you merge main into this.

@dxoigmn
Copy link
Contributor Author

dxoigmn commented Jun 22, 2023

It looks like there're merged changes in mart/models/modular.py. I will review again after you merge main into this.

Should be good to review.

@dxoigmn dxoigmn requested a review from mzweilin June 22, 2023 18:28
Base automatically changed from better_litmodular3 to main June 22, 2023 19:05
Copy link
Contributor

@mzweilin mzweilin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Shall we just delete ReturnKwargs in mart.nn?

@dxoigmn
Copy link
Contributor Author

dxoigmn commented Jun 22, 2023

Leave it for now because some modules still use it. Making everything tidier should be a different PR.

@dxoigmn dxoigmn merged commit 9d1a03d into main Jun 22, 2023
@dxoigmn dxoigmn deleted the better_sequentialdict branch June 22, 2023 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants