Skip to content

Commit

Permalink
Merge branch 'worleyph/machines/disable_perf_archiving_on_dev_systems…
Browse files Browse the repository at this point in the history 
…' (PR #1568)

Remove definition of SAVE_TIMING_DIR from current nonproduction
machine descriptions. This disables the automatic archive of
performance data for these systems.

[BFB]

* worleyph/machines/disable_perf_archiving_on_dev_systems:
  disable performance archiving logic for nonproduction systems
  • Loading branch information
@rljacob
rljacob committed Jun 6, 2017
2 parents 4441ab6 + 3e2d50b commit 36eb17a
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions config/acme/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
<DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
<BASELINE_ROOT>/sems-data-store/ACME/baselines</BASELINE_ROOT>
<SAVE_TIMING_DIR>/sems-data-store/ACME/timings</SAVE_TIMING_DIR>
<CCSM_CPRNC>/sems-data-store/ACME/cprnc/build/cprnc</CCSM_CPRNC>
<SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
<!-- <GMAKE>make</GMAKE> <- this doesn't actually work! -->
Expand Down Expand Up @@ -579,7 +578,6 @@
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
<DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
<BASELINE_ROOT>/sems-data-store/ACME/baselines</BASELINE_ROOT>
<SAVE_TIMING_DIR>/sems-data-store/ACME/timings</SAVE_TIMING_DIR>
<CCSM_CPRNC>/sems-data-store/ACME/cprnc/build/cprnc</CCSM_CPRNC>
<SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
<!-- <GMAKE>make</GMAKE> <- this doesn't actually work! -->
Expand Down Expand Up @@ -643,7 +641,6 @@
<DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
<BASELINE_ROOT>/home/climate1/acme/baselines</BASELINE_ROOT>
<CCSM_CPRNC>/home/climate1/acme/cprnc/build/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>$CIME_OUTPUT_ROOT/timings</SAVE_TIMING_DIR>
<BATCHQUERY></BATCHQUERY>
<BATCHSUBMIT></BATCHSUBMIT>
<SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
Expand Down Expand Up @@ -707,7 +704,6 @@
<DOUT_L_MSROOT>USERDEFINED_optional_run</DOUT_L_MSROOT> <!-- complete path to a long term archiving directory -->
<BASELINE_ROOT>/projects/ccsm/ccsm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/projects/ccsm/cprnc/build/cprnc_wrap</CCSM_CPRNC> <!-- path to the cprnc tool used to compare netcdf history files in testing -->
<SAVE_TIMING_DIR>/projects/ccsm/timings</SAVE_TIMING_DIR>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
Expand Down Expand Up @@ -787,7 +783,6 @@
<DOUT_L_MSROOT>USERDEFINED_optional_run</DOUT_L_MSROOT> <!-- complete path to a long term archiving directory -->
<BASELINE_ROOT>/projects/ccsm/ccsm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/projects/ccsm/cprnc/build/cprnc_wrap</CCSM_CPRNC> <!-- path to the cprnc tool used to compare netcdf history files in testing -->
<SAVE_TIMING_DIR>/projects/ccsm/timings</SAVE_TIMING_DIR>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
Expand Down Expand Up @@ -867,7 +862,6 @@
<DOUT_L_MSROOT>USERDEFINED_optional_run</DOUT_L_MSROOT> <!-- complete path to a long term archiving directory -->
<BASELINE_ROOT>/projects/ccsm/ccsm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/projects/ccsm/cprnc/build/cprnc_wrap</CCSM_CPRNC> <!-- path to the cprnc tool used to compare netcdf history files in testing -->
<SAVE_TIMING_DIR>/projects/ccsm/timings</SAVE_TIMING_DIR>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
Expand Down Expand Up @@ -937,7 +931,6 @@
<COMPILERS>gnu,pgi,intel,nag</COMPILERS>
<MPILIBS>mvapich,mpich,openmpi,mpi-serial</MPILIBS>
<CIME_OUTPUT_ROOT>/lcrc/project/$PROJECT/$USER/acme_scratch</CIME_OUTPUT_ROOT>
<SAVE_TIMING_DIR>/lcrc/project/$PROJECT</SAVE_TIMING_DIR>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<DIN_LOC_ROOT>/home/ccsm-data/inputdata</DIN_LOC_ROOT>
Expand Down Expand Up @@ -1121,7 +1114,6 @@
<DOUT_L_MSROOT>/home/$USER/csm/$CASE/</DOUT_L_MSROOT>
<BASELINE_ROOT>/projects/ccsm/ccsm_baselines/</BASELINE_ROOT>
<CCSM_CPRNC>/projects/ccsm/tools/cprnc/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>/projects/$PROJECT</SAVE_TIMING_DIR>
<OS>BGQ</OS>
<BATCH_SYSTEM>cobalt</BATCH_SYSTEM>
<SUPPORTED_BY> jayesh -at- mcs.anl.gov</SUPPORTED_BY>
Expand Down Expand Up @@ -1185,7 +1177,6 @@
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
<BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
<SAVE_TIMING_DIR>/usr/gdata/climdat/timing_performance</SAVE_TIMING_DIR>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
Expand Down Expand Up @@ -1238,7 +1229,6 @@
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
<BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
<SAVE_TIMING_DIR>/usr/gdata/climdat/timing_performance</SAVE_TIMING_DIR>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
Expand Down Expand Up @@ -1441,7 +1431,6 @@
<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
<BASELINE_ROOT>/lustre/climate/acme_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/lustre/climate/acme_baselines/cprnc/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>/lustre/climate/timing_acme</SAVE_TIMING_DIR>
<GMAKE_J>8</GMAKE_J>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>balwinder.singh -at- pnnl.gov</SUPPORTED_BY>
Expand Down Expand Up @@ -1515,7 +1504,6 @@
<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
<CCSM_BASELINE>/dtemp/sing201/acme/acme_baselines</CCSM_BASELINE>
<CCSM_CPRNC>/dtemp/sing201/acme/acme_baselines/cprnc/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>/dtemp/sing201/acme/timing_acme</SAVE_TIMING_DIR>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>balwinder.singh -at- pnnl.gov</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
Expand Down Expand Up @@ -1583,7 +1571,6 @@
<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
<BASELINE_ROOT>/pic/projects/climate/acme_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/pic/projects/climate/acme_baselines/cprnc/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>/pic/projects/climate/csmdata/</SAVE_TIMING_DIR>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>balwinder.singh -at- pnnl.gov</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
Expand Down Expand Up @@ -2086,7 +2073,6 @@
<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
<BASELINE_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/ccsm_baselines</BASELINE_ROOT>
<CIME_OUTPUT_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/scratch</CIME_OUTPUT_ROOT>
<SAVE_TIMING_DIR>$CASEROOT/timings</SAVE_TIMING_DIR>
<CCSM_CPRNC>/turquoise/usr/projects/climate/SHARED_CLIMATE/software/wolf/cprnc/v0.40/cprnc</CCSM_CPRNC>
<module_system type="module">
<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
Expand Down Expand Up @@ -2179,7 +2165,6 @@
<DIN_LOC_ROOT_CLMFORC>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<BASELINE_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/ccsm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/turquoise/usr/projects/climate/SHARED_CLIMATE/software/wolf/cprnc/v0.40/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>$CASEROOT/timings</SAVE_TIMING_DIR>
<mpirun mpilib="default">
<executable>mpirun</executable>
<arguments>
Expand Down Expand Up @@ -2438,7 +2423,6 @@
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<SAVE_TIMING_DIR>/global/scratch/$ENV{USER}</SAVE_TIMING_DIR>
<mpirun mpilib="mpi-serial">
<executable>mpirun</executable>
<arguments>
Expand Down Expand Up @@ -2502,7 +2486,6 @@
<MAX_TASKS_PER_NODE>12</MAX_TASKS_PER_NODE>
<PES_PER_NODE>12</PES_PER_NODE>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<SAVE_TIMING_DIR>/global/scratch/$ENV{USER}</SAVE_TIMING_DIR>
<mpirun mpilib="mpi-serial">
<executable>mpirun</executable>
<arguments>
Expand Down

0 comments on commit 36eb17a

Please sign in to comment.