-
Notifications
You must be signed in to change notification settings - Fork 18
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
Revamp job_id
, take 2
#2994
Revamp job_id
, take 2
#2994
Conversation
1815d8b
to
299418b
Compare
f60dc57
to
5a3b129
Compare
5a3b129
to
5f97901
Compare
f55d244
to
3a6f82d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This helps to clean up the config issues, separating job_id
from the config is much nicer.
I left some nitpicking comments
328568a
to
23591a7
Compare
Merge core and edmf default configs Cleanup flame script Use --config_file kwarg in more pipeline jobs configs_per_job_id -> configs_per_config_id Use job_id Add commandline convenience funcs Fixes config_file -> config_files Update news Temporarily disable generate_output_path Improve log / printing Doc fixes
23591a7
to
1e3e6d0
Compare
CI passed in https://buildkite.com/clima/climaatmos-ci/builds/18763. A gpu node is not working on central, so I'm going to manually merge. Thanks for taking a look, @nefrathenrici. |
Should we change the pipeline in |
Yes, I'll open a followup PR. |
While a good step forward, I feel that the problems I raised in the review of the first iteration (#2986) were not fully addressed.
Fundamentally, I think that our work on Atmos interface should move us in a direction where things are less entangled and where it is easier to understand what is happening. |
Hi @Sbozzolo,
I don't think an (optional) extra function call is adding too much complexity to set up a simulation. Also, users don't need to know what the
Sure, we can add a doc string to
I think you may be misunderstanding how things worked, and how things work with this PR. If you'd like, we can chat offline about this. The bottom line is:
This PR did not make changes w.r.t. the relation between
That's fair, and I'm open to further refactoring but we should open concrete issues about what the requirements are, and design decisions we want to make. |
Attempt to close #2651.
This PR:
config/default_configs/default_edmf_config.yml
intoconfig/default_configs/default_config.yml
, so that there is a single default (and still over-ridable) config yaml.job_id
from the toml filesjob_id
was added to the parsed args, so that we can fully control the output folder in the buildkite pipeline. The attempt to guess the job ID in Revamp job IDs #2986 still required additional special casing (the sameconfig_id
and resources could be used for a driver example and a performance script, resulting injob_id
collisions).config_files
toAtmosConfig
.config_files
is now required for all jobs, and has the same fallback as before. The main difference is that we can inspect(::AtmosConfig).config_files
to see where the parameters came from.config_path
anddefault_config_file
constants, so that they can be reused in a few placesconfigs_per_job_id
was renamed toconfigs_per_config_id
, and the values of that returned dict is now a NamedTuple:(; config, config_file)
, so that, again, we can trace where parameters are coming fromTo make a config, the driver now uses:
I think that explicitly specifying the config improves the clarity. If those arguments are not passed, we have a fallback to use
config_file::String = default_config_file
andjob_id = config_id_from_config_file(config_file)
.This is technically breaking because
CA.AtmosConfig()
no longer does arg parsing (and depending on what was available would use given or the default config), which I think was very confusing. Now, that logic is isolated to(; config_file, job_id) = CA.commandline_kwargs()
, which simply has defaults.I've not yet removed the duplicate yaml files, but I think this should make doing so much easier.
Supersedes #2986, #2981