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

load config files in order, later overrides earlier, lots more testing #108

Merged
merged 6 commits into from
Apr 5, 2024

Conversation

jaidhyani
Copy link
Collaborator

The main functional impact of this PR is to kill the "priority" config arg and just load configs in the order in which they're passed in to the training script, with the later overriding the former. Alongside this we do some refactoring to support testing to ensure that everything works as expected. We also improve type-casting override argument strings to better match the actual config types and make it significantly less dangerous.

@jettjaniak
Copy link
Contributor

why the merge commit?

@jaidhyani
Copy link
Collaborator Author

why the merge commit?

Default behavior in the github UI, clicked without thinking. I think we can configure this to default to rebase/ff.

image

@jaidhyani jaidhyani force-pushed the config_file_order branch from 10c58e9 to 0cc0c98 Compare April 3, 2024 19:36
@jettjaniak
Copy link
Contributor

https://github.com/orgs/community/discussions/12032
not configurable unfortunately :/

Copy link
Contributor

@jettjaniak jettjaniak left a comment

Choose a reason for hiding this comment

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

nice! 🚀

  • why do we need filter_config_to_actual_config_values?
  • in general I'm quite overwhelmed by train/config/utils.py, I didn't realize we'll need all of this to have the functionality I imagined
  • could you add some docstrings? like what are the functions doing and why we need them

.vscode/launch.json Outdated Show resolved Hide resolved
Comment on lines 57 to +59
"--config_files",
"--config_file",
"-c",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"--config_files",
"--config_file",
"-c",
"--config",
"-c",

I don't care about backward compatibility, no one is using this yet

scripts/run_training.py Outdated Show resolved Hide resolved
src/delphi/constants.py Show resolved Hide resolved
src/delphi/train/config/utils.py Outdated Show resolved Hide resolved
@jaidhyani
Copy link
Collaborator Author

  • filter_config_to_actual_config_values

I think we actually don't need this anymore, going to optimistically delete.

@jaidhyani
Copy link
Collaborator Author

  • in general I'm quite overwhelmed by train/config/utils.py, I didn't realize we'll need all of this to have the functionality I imagined
  • could you add some docstrings? like what are the functions doing and why we need them

I added some more docstrings explaining how some things are used, why we need them, and how they work. I also deleted a few things that we don't need anymore.

@jaidhyani jaidhyani merged commit 6482b4e into main Apr 5, 2024
1 check passed
@jettjaniak jettjaniak deleted the config_file_order branch May 22, 2024 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants