Skip to content

Commit

Permalink
Merge branch 'azamat/perftests/lores-v3-config' into next (PR #6488)
Browse files Browse the repository at this point in the history 
Update perf-tests to match v3 configurations.

[BFB]
  • Loading branch information
@amametjanov
amametjanov committed Jul 17, 2024
2 parents 05f0d59 + e064017 commit cd4d69a
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 56 deletions.
1 change: 1 addition & 0 deletions cime_config/testmods_dirs/bench/gmpas_noio/user_nl_mpaso
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
config_am_highfrequencyoutput_enable=false
config_am_globalstats_enable=false
config_am_conservationcheck_enable=false
112 changes: 56 additions & 56 deletions cime_config/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -803,38 +803,38 @@

# super-BFB OCN
"e3sm_superbfb_ocn_opt" : { # opt + pureMPI
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"ERS_Ld3.T62_EC30to60E2r2.CMPASO-NYF.pemod-omp1",
"PEM_Lh3.T62_EC30to60E2r2.CMPASO-NYF.pemod-omp1",
"ERS_Ld3.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-omp1",
"PEM_Lh3.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-omp1",
)
},

"e3sm_superbfb_ocn_dbg" : { # dbg + pureMPI
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Ld3_D.T62_EC30to60E2r2.CMPASO-NYF.pemod-omp1",
"PEM_Lh3_D.T62_EC30to60E2r2.CMPASO-NYF.pemod-omp1",
"ERS_Ld3_D.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-omp1",
"PEM_Lh3_D.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-omp1",
)
},

"e3sm_superbfb_ocn_opt_thrd" : { # opt + threads
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"ERS_Ld3.T62_EC30to60E2r2.CMPASO-NYF.pemod-omp2",
"PET_Lh3.T62_EC30to60E2r2.CMPASO-NYF.pemod-ompfull",
"ERS_Ld3.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-omp2",
"PET_Lh3.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-ompfull",
)
},

"e3sm_superbfb_ocn_dbg_thrd" : { # dbg + threads
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Ld3_D.T62_EC30to60E2r2.CMPASO-NYF.pemod-omp2",
"PET_Lh3_D.T62_EC30to60E2r2.CMPASO-NYF.pemod-ompfull",
"ERS_Ld3_D.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-omp2",
"PET_Lh3_D.T62_IcoswISC30E3r5.CMPASO-NYF.pemod-ompfull",
)
},

Expand All @@ -845,38 +845,38 @@

# super-BFB ICE
"e3sm_superbfb_ice_opt" : { # opt + pureMPI
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"ERS_Lh3.T62_EC30to60E2r2.DTESTM.pemod-omp1",
"PEM_Lh3.T62_EC30to60E2r2.DTESTM.pemod-omp1",
"ERS_Lh3.T62_IcoswISC30E3r5.DTESTM.pemod-omp1",
"PEM_Lh3.T62_IcoswISC30E3r5.DTESTM.pemod-omp1",
)
},

"e3sm_superbfb_ice_dbg" : { # dbg + pureMPI
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Lh3_D.T62_EC30to60E2r2.DTESTM.pemod-omp1",
"PEM_Lh3_D.T62_EC30to60E2r2.DTESTM.pemod-omp1",
"ERS_Lh3_D.T62_IcoswISC30E3r5.DTESTM.pemod-omp1",
"PEM_Lh3_D.T62_IcoswISC30E3r5.DTESTM.pemod-omp1",
)
},

"e3sm_superbfb_ice_opt_thrd" : { # opt + threads
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"ERS_Lh3.T62_EC30to60E2r2.DTESTM.pemod-ompfull",
"PET_Lh3.T62_EC30to60E2r2.DTESTM.pemod-omp2",
"ERS_Lh3.T62_IcoswISC30E3r5.DTESTM.pemod-ompfull",
"PET_Lh3.T62_IcoswISC30E3r5.DTESTM.pemod-omp2",
)
},

"e3sm_superbfb_ice_dbg_thrd" : { # dbg + threads
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Lh3_D.T62_EC30to60E2r2.DTESTM.pemod-ompfull",
"PET_Lh3_D.T62_EC30to60E2r2.DTESTM.pemod-omp2",
"ERS_Lh3_D.T62_IcoswISC30E3r5.DTESTM.pemod-ompfull",
"PET_Lh3_D.T62_IcoswISC30E3r5.DTESTM.pemod-omp2",
)
},

Expand All @@ -887,38 +887,38 @@

# super-BFB LND
"e3sm_superbfb_lnd_opt" : { # opt + pureMPI
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
"PEM_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
"ERS_Lh3.r05_r05.IELMTEST.pemod-omp1",
"PEM_Lh3.r05_r05.IELMTEST.pemod-omp1",
)
},

"e3sm_superbfb_lnd_dbg" : { # dbg + pureMPI
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
"PEM_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
"ERS_Lh3_D.r05_r05.IELMTEST.pemod-omp1",
"PEM_Lh3_D.r05_r05.IELMTEST.pemod-omp1",
)
},

"e3sm_superbfb_lnd_opt_thrd" : { # opt + threads
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"PET_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp2",
"ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull",
"PET_Lh3.r05_r05.IELMTEST.pemod-omp2",
"ERS_Lh3.r05_r05.IELMTEST.pemod-ompfull",
)
},

"e3sm_superbfb_lnd_dbg_thrd" : { # dbg + threads
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"PET_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp2",
"ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull",
"PET_Lh3_D.r05_r05.IELMTEST.pemod-omp2",
"ERS_Lh3_D.r05_r05.IELMTEST.pemod-ompfull",
)
},

Expand All @@ -929,7 +929,7 @@

# super-BFB ROF
"e3sm_superbfb_rof_opt" : { # opt + pureMPI
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"ERS_Ld3.r05_r05.RMOSGPCC.pemod-omp1",
Expand All @@ -938,7 +938,7 @@
},

"e3sm_superbfb_rof_dbg" : { # dbg + pureMPI
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Ld3_D.r05_r05.RMOSGPCC.pemod-omp1",
Expand All @@ -947,7 +947,7 @@
},

"e3sm_superbfb_rof_opt_thrd" : { # opt + threads
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"PET_Ld3.r05_r05.RMOSGPCC.pemod-omp2",
Expand All @@ -956,7 +956,7 @@
},

"e3sm_superbfb_rof_dbg_thrd" : { # dbg + threads
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"PET_Ld3_D.r05_r05.RMOSGPCC.pemod-omp2",
Expand All @@ -971,7 +971,7 @@

# super-BFB ATM
"e3sm_superbfb_atm_opt" : { # opt + pureMPI
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"ERS_Lh3.ne30pg2_ne30pg2.FAQP.pemod-omp1",
Expand All @@ -980,7 +980,7 @@
},

"e3sm_superbfb_atm_dbg" : { # dbg + pureMPI
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Lh3_D.ne30pg2_ne30pg2.FAQP.pemod-omp1",
Expand All @@ -989,7 +989,7 @@
},

"e3sm_superbfb_atm_opt_thrd" : { # opt + threads
#"share" : True,
"share" : True,
"time" : "00:30:00",
"tests" : (
"PET_Lh3.ne30pg2_ne30pg2.FAQP.pemod-omp2",
Expand All @@ -998,7 +998,7 @@
},

"e3sm_superbfb_atm_dbg_thrd" : { # dbg + threads
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"PET_Lh3_D.ne30pg2_ne30pg2.FAQP.pemod-omp2",
Expand All @@ -1013,38 +1013,38 @@

# super-BFB all-active
"e3sm_superbfb_wcycl_opt" : { # opt + pureMPI
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"ERS_Ld3.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-omp1",
"PEM_Ld3.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-omp1",
"ERS_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-omp1",
"PEM_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-omp1",
)
},

"e3sm_superbfb_wcycl_dbg" : { # dbg + pureMPI
#"share" : True,
"share" : True,
"time" : "02:00:00",
"tests" : (
"ERS_Ld3_D.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-omp1",
"PEM_Ld3_D.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-omp1",
"ERS_Ld3_D.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-omp1",
"PEM_Ld3_D.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-omp1",
)
},

"e3sm_superbfb_wcycl_opt_thrd" : { # opt + threads
#"share" : True,
"share" : True,
"time" : "01:00:00",
"tests" : (
"PET_Ld3.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-omp2",
"ERS_Ld3.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-ompfull",
"PET_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-omp2",
"ERS_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-ompfull",
)
},

"e3sm_superbfb_wcycl_dbg_thrd" : { # dbg + threads
#"share" : True,
"share" : True,
"time" : "02:00:00",
"tests" : (
"PET_Ld3_D.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-omp2",
"ERS_Ld3_D.ne30pg2_EC30to60E2r2.WCYCL1850.pemod-omp2",
"PET_Ld3_D.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-omp2",
"ERS_Ld3_D.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.pemod-omp2",
)
},

Expand Down

0 comments on commit cd4d69a

Please sign in to comment.