From e9b0e195f73e13013fe1f5de68ce616d1cfe65d7 Mon Sep 17 00:00:00 2001
From: "Kelly (KT) Thompson" <kgt@lanl.gov>
Date: Mon, 21 Nov 2016 12:00:02 -0700
Subject: [PATCH] Add env for releases with intel/17 and try to fix travis
 style check.

---
 .travis-install-dependencies.sh     | 19 ++++++++++++++-----
 regression/scripts/common.sh        |  2 +-
 regression/scripts/release_cray.sh  | 25 ++++++++++++++++++++++++-
 regression/scripts/release_toss2.sh | 13 ++++++++++++-
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/.travis-install-dependencies.sh b/.travis-install-dependencies.sh
index 24352c8371..5933209bdb 100755
--- a/.travis-install-dependencies.sh
+++ b/.travis-install-dependencies.sh
@@ -24,6 +24,14 @@ NUMDIFF_VER=5.8.1
 CLANG_FORMAT_VER=3.9
 OPENMPI_VER=1.10.3
 
+# Return integer > 0 if 'develop' branch is found.
+function find_dev_branch
+{
+  set -f
+  git branch -a | grep -c develop
+  set +f
+}
+
 # printenv
 
 if [[ ${STYLE} ]]; then
@@ -32,14 +40,15 @@ if [[ ${STYLE} ]]; then
   # that lives at github.com/losalamos), the develop branch is missing in the
   # travis checkout. Since we only test files that are modified when comapred to
   # the 'develop' branch, the develop branch must be available locally.
-  dev_branch_found=`git branch -a | grep -c develop`
-  if [[ ! $dev_branch_found ]]; then
+  num_dev_branches_found=`find_dev_branch`
+  if [[ $num_dev_branches_found == 0 ]]; then
+    echo "no develop branches found."
     # Register the develop branch in draco/.git/config
-    git config --local remote.origin.fetch +refs/heads/develop:refs/remotes/origin/develop
+    run "git config --local remote.origin.fetch +refs/heads/develop:refs/remotes/origin/develop"
     # Download the meta-data for the 'develop' branch
-    git fetch
+    run "git fetch"
     # Create a local tracking branch
-    git branch -t develop origin/develop
+    run "git branch -t develop origin/develop"
   fi
 
   # clang-format and git-clang-format
diff --git a/regression/scripts/common.sh b/regression/scripts/common.sh
index a863f8ef33..dd18fdc99d 100644
--- a/regression/scripts/common.sh
+++ b/regression/scripts/common.sh
@@ -169,7 +169,7 @@ function selectscratchdir
   # TOSS, CLE, BGQ, Darwin:
   toss2_yellow_scratchdirs="lustre/scratch2/yellow lustre/scratch3/yellow"
   toss2_red_scratchdirs="lustre/scratch3 lustre/scratch4"
-  cray_yellow_scratchdirs="lustre/ttscratch"
+  cray_yellow_scratchdirs="lustre/ttscratch1"
   cray_red_scratchdirs="lustre/trscratch1 lustre/trscratch2"
   bgq_scratchdirs="nfs/tmp2"
   scratchdirs="$toss2_yellow_scratchdirs $toss2_red_scratchdirs \
diff --git a/regression/scripts/release_cray.sh b/regression/scripts/release_cray.sh
index 4f1bfbb566..f975105ba1 100755
--- a/regression/scripts/release_cray.sh
+++ b/regression/scripts/release_cray.sh
@@ -35,7 +35,7 @@ pdir=$ddir
 target="`uname -n | sed -e s/[.].*//`"
 case $target in
   t[rt]-fe* | t[rt]-login* )
-    environments="intel16env" ;;
+    environments="intel17env" ;;
 esac
 function intel16env()
 {
@@ -60,6 +60,29 @@ export CRAYPE_LINK_TYPE=dynamic
 export OMP_NUM_THREADS=16
 }
 
+function intel17env()
+{
+run "module load user_contrib friendly-testing"
+run "module unload ndi metis parmetis superlu-dist trilinos"
+run "module unload lapack gsl intel"
+run "module unload cmake numdiff"
+run "module unload intel gcc"
+run "module unload PrgEnv-intel PrgEnv-cray PrgEnv-gnu"
+run "module unload papi perftools"
+run "module load PrgEnv-intel"
+run "module unload xt-libsci xt-totalview intel"
+run "module load intel/17.0.1"
+run "module load gsl/2.1"
+run "module load cmake/3.6.2 numdiff"
+run "module load trilinos/12.8.1 superlu-dist/4.3 metis/5.1.0 parmetis/4.0.3"
+run "module load ndi random123 eospac/6.2.4"
+run "module list"
+CC=`which cc`
+CXX=`which CC`
+FC=`which ftn`
+export CRAYPE_LINK_TYPE=dynamic
+export OMP_NUM_THREADS=16
+}
 # function intel14env()
 # {
 # run "module load friendly-testing user_contrib"
diff --git a/regression/scripts/release_toss2.sh b/regression/scripts/release_toss2.sh
index 89773c6e6f..a8b38af8ea 100755
--- a/regression/scripts/release_toss2.sh
+++ b/regression/scripts/release_toss2.sh
@@ -32,7 +32,7 @@ pdir=$ddir
 
 # environment (use draco modules)
 # release for each module set
-environments="intel16env"
+environments="intel17env"
 function intel16env()
 {
   run "module purge"
@@ -44,6 +44,17 @@ function intel16env()
   run "module load parmetis/4.0.3 superlu-dist/4.3 trilinos/12.8.1"
   run "module list"
 }
+function intel17env()
+{
+  run "module purge"
+  run "module load friendly-testing user_contrib"
+  run "module load cmake/3.6.2 git numdiff"
+  run "module load intel/17.0.1 openmpi/1.10.3"
+  run "module load random123 eospac/6.2.4 gsl/2.1"
+  run "module load mkl metis/5.1.0 ndi"
+  run "module load parmetis/4.0.3 superlu-dist/4.3 trilinos/12.8.1"
+  run "module list"
+}
 function gcc530env()
 {
   run "module purge"