-
Notifications
You must be signed in to change notification settings - Fork 33
Initial ICI changes #238
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
Draft
hannahnesser
wants to merge
143
commits into
dev
Choose a base branch
from
ICI
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Initial ICI changes #238
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…_required for sanitize_input_yaml)
…cies, UseScheduler, SchedulerType, DataPathObs, and PythonEnvType/PythonEnvPath
…OSChemEnv for local simulations
- Conda environment activation is no longer the default. Instead, the config file asks the user to specify a path for a file that will activate the Python environment (via `source $PythonEnv`). This better supports users on clusters that don't support conda. - slurm is no longer the default scheduler. UseSlurm has been removed from the config file and been replaced by SchedulerType. Currently two schedulers are supported: slurm and PBS. - To support this transition, we no longer call sbatch ... within the IMI to the extent possible. Instead, we added a utility function submit_job to src/utilities/common.sh that is run as submit_job $SchedulerType <ScriptName> <ScriptArgument(s)> The function then calls either submit_slurm_job or submit_pbs_job. - We also removed the Boolean usage of UseSlurm. We now assume that a scheduler is always used by the IMI.
…laced sbatch with an if/elif/else statement that depends on SchedulerType and adjusts the call to the scheduler within the script (instead of using the utilities/common.sh function submit_job)
…e sure I didn't delete anything that's supposed to be there
…hich works better on Pleaides
…eric handling of molar mass /mixing ratio conversion factors
- Need to parse PythonEnv from config file in order to evaluate the config file using Python. This is taken from the basic run_imi.sh script, but it needs to be repeated here because other clusters don't remember environments/etc in runs submitted from a given environment/etc. - Changed all relative paths to absolute paths also to help with other clusters. - Needed to explicitly cd into the working directory
…iable names for species generalization
… branch (or what was in the dev branch when these changes were made)
…use the module command
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Name: Hannah Nesser
Institution: JPL
Describe the update
This is a set of changes that:
As of now, this is up to date with the dev branch. The changes include the following (though I may have forgotten something).
PBS/SBATCH flexibility:
UseSlurm
[bool] withSchedulerType
[str].submit_job $SchedulerType SaveOutput JobArguments
whereSaveOutput
is a boolean that determines whether or not the output is appended to imi_output.log. It then callssubmit_slurm_job
orsubmit_pbs_job
as appropriate. Note:submit_pbs_job
currently assumes the use of Pleiades and therefore includes a hardcoded "model" keyword that is required by the system.convert_sbatch_to_pbs
to common.sh that is run in the case thatSchedulerType = "PBS"
. This function searches for all files that haveSBATCH
in their header and then iteratively replaces theSBATCH
commands with thePBS
equivalent. This means that any new SBATCH options added to a header should match the formatting in this function or that the sed statement should be expanded to include the new options.Some changes that were needed to make these changes work:
SBATCH -N 1
uses and instead put the node request intosubmit_job
since PBS requires that the number of nodes be assigned only once and that it occur along with CPU requests, etc. in the initial job request.Conda/pip flexibility:
Methane/CO2 flexibility: