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

Remove *_step_end from LitModular #170

Merged
merged 4 commits into from
Jun 22, 2023
Merged

Remove *_step_end from LitModular #170

merged 4 commits into from
Jun 22, 2023

Conversation

dxoigmn
Copy link
Contributor

@dxoigmn dxoigmn commented Jun 14, 2023

What does this PR do?

This PR merges *_step_end into *_step in LitModular. This means we no longer need to clear outputs.

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 marked this pull request as ready for review June 14, 2023 00:31
@dxoigmn dxoigmn requested a review from mzweilin June 14, 2023 00:31
Base automatically changed from better_litmodular2 to main June 22, 2023 18:13
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.

I also introduced this change in #157 to work with newer PL.

Have you confirmed that there's no memory leak issue with the current PL version?

@dxoigmn
Copy link
Contributor Author

dxoigmn commented Jun 22, 2023

I also introduced this change in #157 to work with newer PL.

Have you confirmed that there's no memory leak issue with the current PL version?

How did you confirm? I watched memory usage and it seemed fine. I also root caused (by reading internal PL code) why outputs.clear() was necessary in the old code. That is because PL is basically holding whatever training_step returns for training_epoch_end. This wasn't a problem for training_step (because we only returned a loss tensor) but was a problem for validation_step because we returned outputs there. Now we just return None and let metrics and log handle everything in their respective step functions (instead of using step_end).

@dxoigmn dxoigmn requested a review from mzweilin June 22, 2023 18:28
@dxoigmn
Copy link
Contributor Author

dxoigmn commented Jun 22, 2023

Note that RobustBench tests are failing because of some model issue unrelated to these changes...

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.

pytest passes locally. We may need to change the RobustBench test in a separate PR to avoid test failure in CI.

@dxoigmn dxoigmn merged commit 1b55378 into main Jun 22, 2023
@dxoigmn dxoigmn deleted the better_litmodular3 branch June 22, 2023 19:05
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