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

now try a real workflow #303

Closed
wants to merge 74 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
671ac15
now try a real workflow
jedwards4b Nov 14, 2024
546c462
fix syntax error
jedwards4b Nov 14, 2024
937662f
try again
jedwards4b Nov 14, 2024
3dc2c29
remove tab
jedwards4b Nov 14, 2024
81d1143
more workflow testing
jedwards4b Nov 14, 2024
254911f
more workflow testing2
jedwards4b Nov 14, 2024
309aa3d
more workflow testing3
jedwards4b Nov 14, 2024
99cd36b
add project id
jedwards4b Nov 14, 2024
e5104a8
update CAM tag to remove mct submodule
jedwards4b Nov 14, 2024
62d4d3a
update cam external to remove mct stub
jedwards4b Nov 14, 2024
8084d04
need project in environment
jedwards4b Nov 14, 2024
7ba911a
replace srt with builds
jedwards4b Nov 14, 2024
0a54914
try compiler tests
jedwards4b Nov 15, 2024
ab91538
try compiler tests
jedwards4b Nov 15, 2024
bf3da7f
add new compset definitions
jedwards4b Nov 15, 2024
b59852b
update cam and update compsets
jedwards4b Nov 15, 2024
5d96dbe
more compset updates
jedwards4b Nov 15, 2024
6708013
try a reusable step
jedwards4b Nov 15, 2024
d416251
fix yaml syntax
jedwards4b Nov 15, 2024
c49172d
fix yaml syntax
jedwards4b Nov 15, 2024
b884fad
fix yaml syntax
jedwards4b Nov 15, 2024
1e5965e
fix yaml syntax
jedwards4b Nov 15, 2024
83758d5
fix yaml syntax
jedwards4b Nov 15, 2024
b5210a0
fix yaml syntax
jedwards4b Nov 15, 2024
59fe8a0
fix yaml syntax again
jedwards4b Nov 15, 2024
31d6432
fix yaml syntax
jedwards4b Nov 15, 2024
20068f1
fix yaml syntaxing
jedwards4b Nov 15, 2024
f27ba3b
simplify syntax
jedwards4b Nov 15, 2024
5d5f009
simplify syntax again
jedwards4b Nov 15, 2024
00a8a8f
again
jedwards4b Nov 15, 2024
53f92d6
again
jedwards4b Nov 15, 2024
4cceae1
try again
jedwards4b Nov 15, 2024
5c20dd0
remove tab?
jedwards4b Nov 15, 2024
db7711e
runs-on
jedwards4b Nov 15, 2024
8581e40
apparently need to check out the code each time
jedwards4b Nov 18, 2024
83064b1
trouble finding repo
jedwards4b Nov 18, 2024
4017f35
repository not supported in v4
jedwards4b Nov 18, 2024
eb7972f
repository not supported in v4
jedwards4b Nov 18, 2024
949e8f9
remove steps in derecho.yaml
jedwards4b Nov 18, 2024
1b668a0
try this one
jedwards4b Nov 18, 2024
73a12cd
try this other one
jedwards4b Nov 18, 2024
80c3bf3
try this other one
jedwards4b Nov 18, 2024
3e5f2aa
try this other one
jedwards4b Nov 18, 2024
588b83f
progress?
jedwards4b Nov 18, 2024
035df28
allows all workflows to run even if some fail
jedwards4b Nov 18, 2024
cac2633
allows all workflows to run even if some fail
jedwards4b Nov 18, 2024
c48e270
allows all workflows to run even if some fail reordered
jedwards4b Nov 18, 2024
d1fb28b
allows all workflows to run even if some fail reordered
jedwards4b Nov 18, 2024
4e35663
fix file format
jedwards4b Nov 18, 2024
10142ad
address issue with ifx and fms
jedwards4b Nov 18, 2024
e3c997d
remove some of the experiments added
jedwards4b Nov 18, 2024
4abf60d
if statement didnt work
jedwards4b Nov 18, 2024
7d6ddba
fix bad path
jedwards4b Nov 18, 2024
a5cbc57
getting there
jedwards4b Nov 19, 2024
8c1d902
use main queue
jedwards4b Nov 19, 2024
6a13ce3
try this (I want fails not in expected fails to flag a test failure)
jedwards4b Nov 19, 2024
d4f363a
try this (I want fails not in expected fails to flag a test failure)
jedwards4b Nov 19, 2024
71ecad7
remove entire workspace, try --fails-only
jedwards4b Nov 19, 2024
1a14a4e
try replacing workspace
jedwards4b Nov 19, 2024
c5fbee0
try replacing workspace
jedwards4b Nov 19, 2024
52b4b69
try replacing workspace
jedwards4b Nov 19, 2024
4fa302e
add compiler to test-id
jedwards4b Nov 20, 2024
a94393a
remove illegal char
jedwards4b Nov 20, 2024
34964cc
all tests but nuopc should now pass
jedwards4b Nov 20, 2024
a8dff4d
another yaml syntax error
jedwards4b Nov 20, 2024
940d2f1
modify to shorten test list and debug more quickly
jedwards4b Nov 20, 2024
e7089ee
stupid tabs
jedwards4b Nov 20, 2024
0d0875d
work on return code
jedwards4b Nov 20, 2024
ee7c617
more debugging
jedwards4b Nov 20, 2024
9912022
more debugging
jedwards4b Nov 20, 2024
486ae2a
more debugging
jedwards4b Nov 20, 2024
0c1ec5a
exit is complicated
jedwards4b Nov 20, 2024
fcd191a
exit is complicated
jedwards4b Nov 20, 2024
0701c0c
ready to try the whole thing again
jedwards4b Nov 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

on:
workflow_call:
inputs:
compiler:
type: string
required: true

jobs:
test:
if: always()
env:
CC: mpicc
FC: mpifort
CXX: mpicxx
CIME_MODEL: cesm
CIME_DRIVER: nuopc
# needs: setup
runs-on: hpc-runner
steps:
- name: Run ${{ inputs.compiler }} tests
continue-on-error: true
run: |
pwd
cd cime/scripts
module load cmake
qcmd -q main -v PROJECT=P93300606 -A P93300606 -l walltime=02:00:00 -- ./create_test --xml-machine derecho\
--xml-category github --no-run --compiler ${{ inputs.compiler }} --test-id ${GITHUB_RUN_ID}${{ inputs.compiler }}
- name: check status
run: |
cd $SCRATCH
# if no fails and no passes in expected fails then exit 0 otherwise exit 1
./cs.status.${GITHUB_RUN_ID}${{ inputs.compiler }} --expected-fails-file $GITHUB_WORKSPACE/cime_config/testfiles/ExpectedTestFails.xml | grep FAIL | grep -v FAILURE || exit 0
exit 1
28 changes: 22 additions & 6 deletions .github/workflows/derecho.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,28 @@ on:
types: [ labeled ]

jobs:
build:

setup:
if: ${{ github.event.label.name == 'run-pr-tests' }}
runs-on: hpc-runner

steps:
- uses: actions/checkout@v3
- name: Run a one-line script
run: echo Hello one, world!

- name: Prepare system
run: |
rm -fr $SCRATCH/cs.s* $SCRATCH/SMS_Ld2* $GITHUB_WORKSPACE
mkdir $GITHUB_WORKSPACE
- name: Checkout code
uses: actions/checkout@v4
- name: Run git-fleximod
run: |
pwd
module list
./bin/git-fleximod update

build:
strategy:
matrix:
compiler: [gnu, intel, intel-oneapi, nvhpc]
uses: ./.github/workflows/build.yaml
with:
compiler: ${{ matrix.compiler }}
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
url = https://github.com/jedwards4b/ccs_config_cesm.git
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.10
fxtag = ccs_config_cesm1.0.10_update_default_ww3grid03
fxrequired = ToplevelRequired

[submodule "cime"]
Expand All @@ -56,9 +56,9 @@

[submodule "cam"]
path = components/cam
url = https://www.github.com/ESCOMP/CAM
url = https://www.github.com/jedwards4b/CAM
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
fxtag = cam6_4_046
fxtag = remove_mct_submodule_update_config_component01
fxrequired = ToplevelRequired

[submodule "clm"]
Expand Down
60 changes: 37 additions & 23 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,50 +36,64 @@
- grid (optional regular expression match for grid to work with the compset)
</help>

<!-- 1850 compsets Default, Mosart, Wave for CESM3 -->
<!-- Concentration driven compsets for CESM3 -->

<compset>
<alias>BLT1850</alias>
<lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
<alias>B1850C_MTt4s</alias>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BLT1850_MARBL</alias>
<lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
<alias>B1850CM</alias>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BMT1850_MARBL</alias>
<lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
</compset>

<compset>
<alias>BLTHIST</alias>
<lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
<alias>B1850C_MTso</alias>
<lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BMT1850</alias>
<lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
<lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BMT1850_MARBL</alias>
<lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
<alias>BHISTC_MTso</alias>
<lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BMTHIST</alias>
<lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
<alias>BHISTC_MTt4s</alias>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>BHISTCM</alias>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>


<!-- Prognostic wave -->


<!-- Data wave -->
<compset>
<alias>B1850C_LTso</alias>
<lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>BLT1850</alias>
<lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>BHISTC_LTso</alias>
<lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<!-- Emissions driven compsets for CESM3 -->

<compset>
<alias>B1850E_MTt4s</alias>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>B1850EM</alias>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<!-- SOM compsets -->

Expand Down
8 changes: 4 additions & 4 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
<pes pesize="M" compset="CAM.*%MT.*MOM6%[^_]*MARBL-BIO">
<!-- <pes pesize="M" compset="CAM.*%MT.*MOM6%[^_]*MARBL-BIO">
<comment></comment>
<ntasks>
<ntasks_atm>5400</ntasks_atm>
Expand Down Expand Up @@ -107,10 +107,10 @@
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</pes> -->
<pes pesize="XL" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
<comment>20 ypd/ 7100 pe-hrs/simyr expected</comment>
<ntasks>
<ntasks>
<ntasks_atm>5400</ntasks_atm>
<ntasks_lnd>1792</ntasks_lnd>
<ntasks_rof>1792</ntasks_rof>
Expand Down Expand Up @@ -154,7 +154,7 @@
<ntasks_ice>3608</ntasks_ice>
<ntasks_ocn>3300</ntasks_ocn>
<ntasks_glc>4</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
<ntasks_wav>64</ntasks_wav>
<ntasks_cpl>5400</ntasks_cpl>
</ntasks>
<nthrds>
Expand Down
48 changes: 48 additions & 0 deletions cime_config/testfiles/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version= "1.0"?>

<expectedFails version="1.1">

<!-- Notes about the format of this file:

The required elements for a given failure are just:

<test name="...">
<phase name="...">
<status>...</status>
</phase>
</test>

There can be multiple phase blocks in a given test block.

In addition, a number of optional elements are allowed, which
currently are just for human consumption (not parsed by any
scripts):

- A phase block can contain an "issue" element, which gives the
issue number associated with this failure. (#123 refers to issue
#123 in the ESCOMP/ctsm repository. Issues in other repositories
should be specified as ORG/repo#123 - e.g., ESMCI/cime#123.)

- A phase block can contain a "comment" element, which gives any
sort of comment you desire.
-->


<!--
<test name="SMS.res.compset.machine_compiler.clm-nofireemis">
<phase name="RUN">
<status>FAIL</status>
<issue>CDEPS/#243</issue>
</phase>
</test>
-->
<test name="SMS_Ld2.ne30pg3_t232.BMT1850.derecho_nvhpc.allactive-defaultio">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue></issue>
<comment></comment>
</phase>
</test>


</expectedFails>
72 changes: 70 additions & 2 deletions cime_config/testlist_allactive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<machines>
<machine name="derecho" compiler="intel" category="aux_cime_baselines"/>
<machine name="derecho" compiler="gnu" category="prealpha"/>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
Expand All @@ -61,19 +62,86 @@
<test name="SMS_Ld2" grid="ne30pg3_t232" compset="BMT1850" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="gnu" category="prealpha"/>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>
<test name="SMS_Ld2" grid="ne30pg3_t232" compset="BLT1850" testmods="allactive/defaultio">

<test name="SMS_Ld2_D" grid="ne30pg3_t232" compset="B1850C_MTt4s" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="prealpha"/>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>

<test name="SMS_Ld2_D" grid="ne30pg3_t232" compset="BHISTC_MTt4s" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>

<test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850C_MTso" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>

<test name="SMS_Ld2" grid="ne30pg3_t232" compset="BHISTC_MTso" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>
<!-- These are not defined in config_compsets.xml
<test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850C_HTs1" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>
<test name="SMS_Ld2" grid="ne30pg3_t232" compset="BHISTC_HTs1" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>
-->
<test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850C_LTso" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>

<test name="SMS_Ld2" grid="ne30pg3_t232" compset="BHISTC_LTso" testmods="allactive/defaultio">
<machines>
<machine name="derecho" compiler="intel" category="github"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>



<!-- MCC tests do not work because FMS fails at initialization of MOM -->
<test name="MCC" grid="ne30pg3_t232" compset="BMT1850" testmods="allactive/defaultio">
<machines>
Expand Down
2 changes: 1 addition & 1 deletion components/cam
Loading