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

[EZ] Fix config bug where interpolation happens too early #2236

Merged
merged 5 commits into from
Jan 12, 2025

Conversation

EugenHotaj
Copy link
Contributor

There is currently a bug in config interpolation. E.g. given the following config:

name: REPLACE_ME
output_dir: ${name}/logs

When overriding name=some-override via the CLI, the expected config should be:

name: some-override
output_dir: some-override/logs

However, instead we get:

name: some-override
output_dir: REPLACE_ME/logs

This happens because OmegaConf resolves values under the hood when you try to access them.

Context

What is the purpose of this PR? Is it to

  • add a new feature
  • fix a bug
  • update tests and/or documentation
  • other (please add here)

Please link to any issues this PR addresses.

Changelog

What are the changes made in this PR?

  • See above

Test plan

Please make sure to do each of the following if applicable to your PR. If you're unsure about any one of these just ask and we will happily help. We also have a contributing page for some guidance on contributing.

  • run pre-commit hooks and linters (make sure you've first installed via pre-commit install)
  • add unit tests for any new functionality
  • update docstrings for any new or updated methods or classes
  • run unit tests via pytest tests
  • run recipe tests via pytest tests -m integration_test
  • manually run any new or modified recipes with sufficient proof of correctness
  • include relevant commands and any other artifacts in this summary (pastes of loss curves, eval results, etc.)

UX

If your function changed a public API, please add a dummy example of what the user experience will look like when calling it.
Here is a docstring example
and a tutorial example

  • I did not change any public API
  • I have added an example to docs or docstrings

Copy link

pytorch-bot bot commented Jan 7, 2025

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/torchtune/2236

Note: Links to docs will display an error until the docs builds have been completed.

✅ No Failures

As of commit 2bab3ec with merge base e420bc0 (image):
💚 Looks good so far! There are no failures yet. 💚

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Jan 7, 2025
@codecov-commenter
Copy link

codecov-commenter commented Jan 8, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.31%. Comparing base (213f386) to head (2bab3ec).
Report is 10 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2236      +/-   ##
==========================================
- Coverage   65.41%   64.31%   -1.11%     
==========================================
  Files         344      352       +8     
  Lines       20658    20569      -89     
==========================================
- Hits        13514    13228     -286     
- Misses       7144     7341     +197     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@RdoubleA
Copy link
Contributor

RdoubleA commented Jan 8, 2025

This is a great catch. You may need to update the unit tests to make sure the mock value returned by OmegaConf.load is an OmegaConf object. Would you also be able to modify test_parse_known_args in tests/torchtune/config/test_parse.py to test for this edge case?

@EugenHotaj
Copy link
Contributor Author

@RdoubleA added ptal when you get a chance.

Copy link
Contributor

@RdoubleA RdoubleA left a comment

Choose a reason for hiding this comment

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

awesome, will merge once CI is green

@RdoubleA
Copy link
Contributor

RdoubleA commented Jan 9, 2025

@EugenHotaj looks like one more test needs to be fixed, you can also run tests locally with pytest tests

@EugenHotaj
Copy link
Contributor Author

Ah missed one of the tests, updated

@joecummings joecummings merged commit e79ab8b into pytorch:main Jan 12, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants