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

Misc Fixes #265

Merged
merged 1 commit into from
Jun 17, 2022
Merged

Misc Fixes #265

merged 1 commit into from
Jun 17, 2022

Conversation

forsyth2
Copy link
Collaborator

Misc Fixes, resolves #262

  • Fix typo
  • Enable partition to be set at the bundle level
  • Fix invalid ilamb_run return value which could cause scripts to not run.

@forsyth2 forsyth2 added the semver: bug Bug fix (will increment patch version) label Jun 17, 2022
@forsyth2 forsyth2 self-assigned this Jun 17, 2022
@forsyth2
Copy link
Collaborator Author

Not going to commit the test cfg. Copying here for reference:

[default]
case = 20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
#environment_commands = "source /global/common/software/e3sm/anaconda_envs/load_latest_e3sm_unified_cori-knl.sh"
#input = /global/cscratch1/sd/forsyth/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
input = /global/cfs/cdirs/e3smdata/zppy_complete_run_nersc_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
input_subdir = archive/atm/hist
mapping_file = /global/homes/z/zender/data/maps/map_ne30pg2_to_cmip6_180x360_aave.20200201.nc
output = /global/cscratch1/sd/forsyth/zppy_test_bundle_partition_output/20210528.v2rc3e.piControl.ne30pg2_EC30to60E2r2.chrysalis
partition = knl
walltime = "00:30:00"
www = /global/cfs/cdirs/e3sm/www/forsyth/zppy_test_bundle_partition_output

[bundle]

  [[ bundle1 ]]
  environment_commands = "source /global/common/software/e3sm/anaconda_envs/load_latest_e3sm_unified_cori-haswell.sh"
  partition = haswell
  qos = debug

[climo]
active = True
bundle = "bundle1"
years = "51:55:2", "51:55:4",

  [[ atm_monthly_180x360_aave ]]
  frequency = "monthly"

@forsyth2 forsyth2 marked this pull request as ready for review June 17, 2022 22:13
@forsyth2 forsyth2 merged commit a59df5d into main Jun 17, 2022
@forsyth2 forsyth2 deleted the misc-fixes branch June 17, 2022 22:13
@forsyth2
Copy link
Collaborator Author

@golaz I wanted to at least get these changes merged.

Note that in the example cfg above, environment_commands needs to be specified explicitly. That's because the current resolution sequence is 1) In [default], partition is set to knl and environment_commands is not set (defaults to "") 2) environment_commands gets automatically set to the knl Unified environment, 3) In [bundle], partition is overridden to be haswell but environment_commands remains the same (i.e., the script for knl), 4) The updated environment_commands gets used (i.e., the one from the cfg with the [bundle] parameters merged in).

The problem with automatically determining environment_commands for a bundle is the following: I believe it would be difficult to determine if the value for environment_commands was passed in from the cfg at the bundle level (in which case we wouldn't want to "guess" the correct value), or if it was the one auto-generated in __main__.py (in which case, we would). I'm not sure though.

@forsyth2 forsyth2 mentioned this pull request Jun 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver: bug Bug fix (will increment patch version)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

For NERSC, ability to specify partition in bundle section. Fix typo.
1 participant