[develop] Integrate UW CLI tool for templater and remove external dependency.#994
Conversation
| set -e -u | ||
|
|
||
| export PYTHONPATH=${workspace}/ush/python_utils/workflow-tools:${workspace}/ush/python_utils/workflow-tools/src | ||
|
|
There was a problem hiding this comment.
PYTHONPATH shenanigans are no longer needed. In fact, they cause problems when trying to call the command line tools from the conda environment.
| python3 $USHdir/python_utils/workflow-tools/scripts/templater.py \ | ||
| -c "${tmpfile}" \ | ||
|
|
||
| uw template render \ |
There was a problem hiding this comment.
This change was made in several of the ex-scripts. This is how the command line tool can be called to render a template instead of relying on a script on disk.
mkavulich
left a comment
There was a problem hiding this comment.
Some comments and questions
christinaholtNOAA
left a comment
There was a problem hiding this comment.
@mkavulich Thanks for you review. Great questions! Let me know if I can provide more information.
mkavulich
left a comment
There was a problem hiding this comment.
Thanks for the comments and making those requested changes
MichaelLueken
left a comment
There was a problem hiding this comment.
These changes look good to me! I was also able to run the coverage tests on Hercules and they all passed:
----------------------------------------------------------------------------------------------------
Experiment name | Status | Core hours used
----------------------------------------------------------------------------------------------------
custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE COMPLETE 7.55
grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 COMPLETE 10.82
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta COMPLETE 27.64
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v17_p8_plot COMPLETE 17.34
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR COMPLETE 24.36
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP COMPLETE 49.93
grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 COMPLETE 12.69
grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP COMPLETE 64.96
grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16 COMPLETE 27.81
MET_verification_only_vx COMPLETE 0.38
specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS COMPLETE 7.82
----------------------------------------------------------------------------------------------------
Total COMPLETE 251.30
Approving now.
|
The coverage tests were manually run on Derecho and all successfully passed: |
|
Just out of curiosity, what's the hang up on the Jenkins tests? I know Hera was down yday, but it seems bigger than that given they were kicked off Monday. |
|
@christinaholtNOAA - The While the tests were able to successfully complete after several repeated rewinds/boots, the run_post tasks all failed due to missing |
|
@christinaholtNOAA - Just wanting to give you a head's up, the current WE2E test runs on Jet look like they are successfully passing this time. No signs of |
|
The rerun of the WE2E tests on Jet have successfully passed: |
…ing PR ufs-community#994: * run_vx.local.lua files were updated to load the srw_app conda environment for verification tasks. * wflow_jet.lua file was updated to remove unload("python") and load("set_pythonpath"). * verify_pre.yaml was updated to add native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}' to the get_verification_obs tasks. * comprehensive.derecho was updated to add the MET_ensemble_verification_winter_wx verification test. * jet.yaml was updated to add SCHED_NATIVE_CMD_HPSS: -n 1 --export=NONE to allow the service partition to work.
DESCRIPTION OF CHANGES:
The workflow-tools package was initially integrated with SRW as an external repository under ush/python_utils. Since then, we have packaged the code as a conda package and it is now installed automatically on most platforms (WCOSS excluded, but with workarounds in place).
In this PR, I am removing the prior integration and leaning on the UW command line tools available from the conda package. For now, this involves calling the command line tools in a subprocess from Python code. We have an API under development that will replace this in the near future, so this will not likely be the final result for the Python-based scripts you see here.
Type of change
TESTS CONDUCTED:
DEPENDENCIES:
None
DOCUMENTATION:
None. UW Documentation is currently being updated to reflect changes in CLI tools.
CHECKLIST