Set Trilinos_ENABLE_BUILD_STATS=ON by default in all ATDM Trilinos bu…

…ilds (trilinos#7376) With the updated magic_wrapper.py, this should be safe to do. Individual drivers can still set Trilinos_ENABLE_BUILD_STATS=OFF if they want. This is just the default. I also remove an obsolete Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE since that has been the default for many years.
jjellio · Jun 11, 2021 · 77c31f0 · 77c31f0
1 parent b4109f1
commit 77c31f0
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 49 deletions.
diff --git a/cmake/ctest/drivers/atdm/ats1/local-driver.sh b/cmake/ctest/drivers/atdm/ats1/local-driver.sh
@@ -8,13 +8,6 @@ if [ "${SBATCH_TEST_TIME_LIMIT_MINUTES}" == "" ] ; then
   export SBATCH_TEST_TIME_LIMIT_MINUTES=780 # Default 13 hour time limit
 fi
 
-if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] && \
-   [[ ! $JOB_NAME == *"intel"* ]] \
-  ; then
-  export Trilinos_ENABLE_BUILD_STATS=ON
-fi
-echo "Trilinos_ENABLE_BUILD_STATS='${Trilinos_ENABLE_BUILD_STATS}'"
-
 # Load environment on the login node
 source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
 

diff --git a/cmake/ctest/drivers/atdm/ats2/local-driver.sh b/cmake/ctest/drivers/atdm/ats2/local-driver.sh
@@ -2,10 +2,6 @@
 
 set +x
 
-if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] ; then
-  export Trilinos_ENABLE_BUILD_STATS=ON
-fi
-
 # Need to load env so we define some vars
 source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
 

diff --git a/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh b/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
@@ -5,13 +5,6 @@ set +x
 # Need to load env so we define some vars
 source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
 
-if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] && \
-   [[ ! $JOB_NAME == *"intel"* ]] \
-  ; then
-  export Trilinos_ENABLE_BUILD_STATS=ON
-fi
-echo "Trilinos_ENABLE_BUILD_STATS='${Trilinos_ENABLE_BUILD_STATS}'"
-
 # Ensure that we don't set both Trilinos_PACKAGES and Trilinos_PACKAGE_ENABLES_FILE
 if [ -z $Trilinos_PACKAGES ]; then
   # Make adjustments for mini build of Trilinos for SPARC

diff --git a/cmake/ctest/drivers/atdm/cts1/local-driver.sh b/cmake/ctest/drivers/atdm/cts1/local-driver.sh
@@ -7,16 +7,6 @@ if [ "${SLURM_CTEST_TIMEOUT}" == "" ] ; then
   # This is just running tests, not the entire build!
 fi
 
-if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] && \
-   [[ ! $JOB_NAME == *"intel"* ]] \
-  ; then
-  export Trilinos_ENABLE_BUILD_STATS=ON
-fi
-echo "Trilinos_ENABLE_BUILD_STATS='${Trilinos_ENABLE_BUILD_STATS}'"
-# NOTE: That above matching is a bit fragile but it avoids needing to load a
-# full env and it is good enough for driving nightly builds.  (I would never
-# do this with a build name coming from a user.)
-
 set -x
 
 source $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ctest-s-driver-config-build.sh

diff --git a/cmake/ctest/drivers/atdm/cts1empire/local-driver.sh b/cmake/ctest/drivers/atdm/cts1empire/local-driver.sh
@@ -5,10 +5,6 @@ if [ "${SLURM_CTEST_TIMEOUT}" == "" ] ; then
   # This is just running tests, not the entire build!
 fi
 
-if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
-  export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
-fi
-
 set -x
 
 source $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ctest-s-driver-config-build.sh

diff --git a/cmake/ctest/drivers/atdm/ride/local-driver.sh b/cmake/ctest/drivers/atdm/ride/local-driver.sh
@@ -12,11 +12,6 @@ if [ "${EXCLUDE_NODES_FROM_BSUB}" == "" ] ; then
   fi
 fi
 
-if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] ; then
-  export Trilinos_ENABLE_BUILD_STATS=ON
-fi
-echo "Trilinos_ENABLE_BUILD_STATS='${Trilinos_ENABLE_BUILD_STATS}'"
-
 source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
 
 set -x

diff --git a/cmake/ctest/drivers/atdm/sems-rhel7/local-driver.sh b/cmake/ctest/drivers/atdm/sems-rhel7/local-driver.sh
@@ -2,10 +2,6 @@
 
 set +x
 
-if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] ; then
-  export Trilinos_ENABLE_BUILD_STATS=ON
-fi
-
 if [[ "${Trilinos_REPOSITORY_LOCATION}" == "" ]] ; then
   export [email protected]:trilinos/Trilinos.git
 fi

diff --git a/cmake/ctest/drivers/atdm/tlcc2/local-driver.sh b/cmake/ctest/drivers/atdm/tlcc2/local-driver.sh
@@ -5,10 +5,6 @@ if [ "${SALLOC_CTEST_TIME_LIMIT_MINUTES}" == "" ] ; then
   # This is just running tests, not the entire build!
 fi
 
-if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
-  export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
-fi
-
 set -x
 
 source $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ctest-s-driver-config-build.sh

diff --git a/cmake/ctest/drivers/atdm/utils/setup_env.sh b/cmake/ctest/drivers/atdm/utils/setup_env.sh
@@ -4,6 +4,11 @@ set +x
 # A) Load the env
 #
 
+if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] ; then
+  export Trilinos_ENABLE_BUILD_STATS=ON
+fi
+echo "Trilinos_ENABLE_BUILD_STATS='${Trilinos_ENABLE_BUILD_STATS}'"
+
 source ${WORKSPACE}/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
 echo
 module list

diff --git a/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh b/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh
@@ -9,10 +9,6 @@ if [[ "${SALLOC_CTEST_LIMIT_MINUTES}" == "" ]] ; then
   # do everything.
 fi
 
-if [[ "${Trilinos_ENABLE_BUILD_STATS}" == "" ]] ; then
-  export Trilinos_ENABLE_BUILD_STATS=OFF
-fi
-
 source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
 echo