Update release scripts for Draco-6_24_0.

lanl · Mar 19, 2018 · 71a8f54 · 71a8f54
1 parent 4ce1f19
commit 71a8f54
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 49 deletions.
diff --git a/regression/scripts/release_cray.sh b/regression/scripts/release_cray.sh
@@ -26,15 +26,15 @@
 
 # Draco install directory name (/usr/projects/draco/draco-NN_NN_NN)
 export package=draco
-ddir=draco-6_23_0
+ddir=draco-6_24_0
 pdir=$ddir
 
 # environment (use draco modules)
 # release for each module set
 target="`uname -n | sed -e s/[.].*//`"
 case $target in
   t[rt]-fe* | t[rt]-login* )
-    environments="intel17env intel1701env intel17env-knl" ;;
+    environments="intel17env intel17env-knl" ;;
 esac
 
 function intel17env()
@@ -49,33 +49,7 @@ run "module unload papi perftools"
 run "module load PrgEnv-intel"
 run "module unload xt-libsci xt-totalview"
 run "module unload intel cray-mpich"
-run "module load intel/17.0.4 cray-mpich/7.6.2"
-run "module load gsl"
-run "module load cmake/3.9.0 numdiff"
-run "module load trilinos/12.10.1 superlu-dist metis parmetis"
-run "module load ndi random123 eospac/6.2.4 csk"
-run "module list"
-CC=`which cc`
-CXX=`which CC`
-FC=`which ftn`
-export CRAYPE_LINK_TYPE=dynamic
-export OMP_NUM_THREADS=16
-export TARGET=haswell
-}
-
-function intel1701env()
-{
-run "module load user_contrib friendly-testing"
-run "module unload ndi metis parmetis superlu-dist trilinos csk"
-run "module unload lapack gsl intel"
-run "module unload cmake"
-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"
-run "module unload intel cray-mpich"
-run "module load intel/17.0.1 cray-mpich/7.5.2"
+run "module load intel/17.0.4 cray-mpich/7.7.0"
 run "module load gsl"
 run "module load cmake/3.9.0 numdiff"
 run "module load trilinos/12.10.1 superlu-dist metis parmetis"
@@ -101,7 +75,7 @@ run "module unload papi perftools"
 run "module load PrgEnv-intel"
 run "module unload xt-libsci xt-totalview"
 run "module unload intel cray-mpich"
-run "module load intel/17.0.4 cray-mpich/7.6.2"
+run "module load intel/17.0.4 cray-mpich/7.7.0"
 run "module swap craype-haswell craype-mic-knl"
 run "module load gsl"
 run "module load cmake/3.9.0 numdiff"
@@ -124,7 +98,10 @@ export TARGET=knl
 ## Generic setup
 ##---------------------------------------------------------------------------##
 
-export script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" )
+if ! [[ -d $script_dir ]]; then
+  export script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+fi
 export draco_script_dir=`readlink -f $script_dir | head -n 1`
 echo "source ${draco_script_dir}/common.sh"
 source ${draco_script_dir}/common.sh
@@ -143,6 +120,7 @@ if [[ -d /netscratch/$USER ]]; then
   scratchdir=/netscratch/$USER/scratch
 else
   scratchdir=/usr/projects/ccsrad/scratch
+  mkdir -p $scratchdir
 fi
 ppn=`lookupppn`
 
@@ -237,7 +215,7 @@ for env in $environments; do
     # Run the tests on the back-end.
     export steps="test"
     logfile="$source_prefix/logs/release-$buildflavor-$version-t${knlext}.log"
-    cmd="sbatch -J release_draco -t 8:00:00 -N 1 $partition \
+    cmd="sbatch -J rel-draco-$buildflavor-$version -t 8:00:00 -N 1 $partition \
  --gres=craynetwork:0 -o $logfile $draco_script_dir/release.msub"
     echo -e "\nTest $package for $buildflavor-$version."
     echo "$cmd"

diff --git a/regression/scripts/release_toss.sh b/regression/scripts/release_toss.sh
@@ -26,28 +26,17 @@
 
 # Draco install directory name (/usr/projects/draco/draco-NN_NN_NN)
 export package=draco
-ddir=draco-6_23_0
+ddir=draco-6_24_0
 pdir=$ddir
 
 # environment (use draco modules)
 # release for each module set
-environments="intel1701env intel1704env gcc640env"
-function intel1701env()
-{
-  run "module purge"
-  run "module load friendly-testing user_contrib"
-  run "module load cmake/3.9.0 git numdiff"
-  run "module load intel/17.0.1 openmpi/1.10.5"
-  run "module load random123 eospac/6.2.4 gsl"
-  run "module load mkl metis ndi csk"
-  run "module load parmetis superlu-dist trilinos"
-  run "module list"
-}
+environments="intel1704env gcc640env"
 function intel1704env()
 {
   run "module purge"
   run "module load friendly-testing user_contrib"
-  run "module load cmake/3.9.0 git numdiff"
+  run "module load cmake git numdiff"
   run "module load intel/17.0.4 openmpi/2.1.2"
   run "module load random123 eospac/6.2.4 gsl"
   run "module load mkl metis ndi csk"
@@ -58,7 +47,7 @@ function gcc640env()
 {
   run "module purge"
   run "module load friendly-testing user_contrib"
-  run "module load cmake/3.9.0 git numdiff"
+  run "module load cmake git numdiff"
   run "module load gcc/6.4.0 openmpi/2.1.2"
   run "module load random123 eospac/6.2.4 gsl"
   run "module load mkl metis ndi"
@@ -74,7 +63,10 @@ function gcc640env()
 ## Generic setup (do not edit)
 ##---------------------------------------------------------------------------##
 
-export script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" )
+if ! [[ -d $script_dir ]]; then
+  export script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+fi
 export draco_script_dir=`readlink -f $script_dir`
 source $draco_script_dir/common.sh
 
@@ -188,7 +180,7 @@ for env in $environments; do
 
     # export dry_run=1
     export steps="config build test"
-    cmd="sbatch -J release_draco $access_queue -t 1:00:00 -N 1 \
+    cmd="sbatch -J rel-draco-$buildflavor-$version $access_queue -t 1:00:00 -N 1 \
 -o $source_prefix/logs/release-$buildflavor-$version.log \
 $script_dir/release.msub"
     echo -e "\nConfigure, Build and Test $buildflavor-$version version of $package."