Tweak release scripts and compile flags for rzansel.

lanl · Dec 19, 2019 · 519f7f7 · 519f7f7
1 parent 15d9f7a
commit 519f7f7
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/config/unix-xl.cmake b/config/unix-xl.cmake
@@ -8,8 +8,7 @@
 #------------------------------------------------------------------------------#
 
 # Ref:
-# https://www.ibm.com/support/knowledgecenter/SSXVZZ_16.1.0/com.ibm.xlcpp161.lelinux.doc/compiler_ref/opt_langlvl.html
-
+# https://www.ibm.com/support/knowledgecenter/en/SSXVZZ_16.1.1/com.ibm.xlcpp1611.lelinux.doc/compiler_ref/rucmpopt.html
 #
 # Compiler flag checks
 #
@@ -33,9 +32,9 @@ if( NOT CXX_FLAGS_INITIALIZED )
     string( APPEND CMAKE_C_FLAGS " -qsuppress=1506-1197" )
   endif()
   # 2019-04-03 IBM support asks that we not use '-qcheck' due to compiler issues.
-  set( CMAKE_C_FLAGS_DEBUG          "-O0 -qsmp=omp:noopt -qoffload -qfullpath -DDEBUG") # -qcheck
+  set( CMAKE_C_FLAGS_DEBUG          "-O0 -qsmp=omp:noopt -qfullpath -DDEBUG") # -qcheck -qoffload
   set( CMAKE_C_FLAGS_RELWITHDEBINFO
-    "-O3 -qhot=novector -qsimd=auto -qstrict=nans:operationprecision" )
+    "-O3 -qhot=novector -qsmp=omp -qstrict=nans:operationprecision" ) # -qsimd=auto
   set( CMAKE_C_FLAGS_RELEASE        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG" )
   set( CMAKE_C_FLAGS_MINSIZEREL     "${CMAKE_C_FLAGS_RELEASE}" )
 

diff --git a/tools/ats2-env.sh b/tools/ats2-env.sh
@@ -21,7 +21,7 @@ else
 fi
 
 # The following toolchains will be used when releasing code
-environments="gcc731env"
+environments="gcc731env xl20190820"
 
 # Extra cmake options
 export CONFIG_BASE+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
@@ -49,14 +49,49 @@ fi
 case $ddir in
 
   #------------------------------------------------------------------------------#
-  draco-7_2* | draco-7_3* | draco-7_4*)
+  draco-7_4*)
+    function gcc731env()
+    {
+      run "module purge"
+      run "module use /usr/gapps/jayenne/vendors-ec/spack.20190616/share/spack/lmod/linux-rhel7-ppc64le/Core"
+      run "module load StdEnv"
+      run "module unload spectrum-mpi xl"
+      run "module load gcc/7.3.1 spectrum-mpi/2019.06.24"
+      run "module load python/3.7.2 cmake/3.14.5 git gsl numdiff random123 metis netlib-lapack"
+      run "module load parmetis superlu-dist trilinos csk"
+      run "module load eospac/6.4.0"
+      # ndi quo
+      run "module list"
+      unset MPI_ROOT
+      CXX=`which g++`
+      CC=`which gcc`
+      FC=`which gfortran`
+    }
+    function xl20190820()
+    {
+      run "module purge"
+      run "module use /usr/gapps/jayenne/vendors-ec/spack.20190616/share/spack/lmod/linux-rhel7-ppc64le/Core"
+      run "module load StdEnv"
+      run "module unload spectrum-mpi"
+      run "module load spectrum-mpi/2019.06.24"
+      run "module load python/3.7.2 cmake/3.14.5 git gsl numdiff random123 metis netlib-lapack"
+      run "module load parmetis superlu-dist csk"
+      run "module load eospac/6.4.0"
+      # ndi quo
+      run "module list"
+      unset MPI_ROOT
+    }
+    ;;
+
+  #------------------------------------------------------------------------------#
+  draco-7_2* | draco-7_3* )
     function gcc731env()
     {
       run "module purge"
       run "module use /usr/gapps/jayenne/vendors-ec/spack.20190616/share/spack/lmod/linux-rhel7-ppc64le/Core"
       run "module load StdEnv cuda python/3.7.2 gcc/7.3.1 spectrum-mpi/2019.01.30"
       run "module load cmake/3.14.5 git gsl numdiff random123 metis netlib-lapack"
-      run "module load parmetis superlu-dist trilinos csk/0.4.2 quo"
+      run "module load parmetis superlu-dist trilinos csk"
       run "module load eospac/6.4.0"
       # ndi
       run "module list"

diff --git a/tools/release.msub b/tools/release.msub
@@ -11,7 +11,8 @@
 source $draco_script_dir/common.sh
 export buildflavor=`flavor`
 export build_pe=`npes_build`
-export test_pe=`npes_test`
+#export test_pe=`npes_test`
+export test_pe=1
 
 ##---------------------------------------------------------------------------##
 ## Print a summary of this build