summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-02-13 15:31:53 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-02-13 15:31:53 (GMT)
commit50b85e03300f4ba662038772cd6fd6fa84ecf97d (patch)
treee85d265553f0b5079005ed13fc5087256d7a94c2
parent112b8131965104cbed0746391893f211d79888ad (diff)
parent3ed1ac0f1b760fe84ec009de19550d98f0b38071 (diff)
downloadhdf5-50b85e03300f4ba662038772cd6fd6fa84ecf97d.zip
hdf5-50b85e03300f4ba662038772cd6fd6fa84ecf97d.tar.gz
hdf5-50b85e03300f4ba662038772cd6fd6fa84ecf97d.tar.bz2
Merge pull request #1539 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3ed1ac0f1b760fe84ec009de19550d98f0b38071': Add missing toolchain include for cross-compile KNL option for batch scripts
-rw-r--r--config/cmake/scripts/HPC/sbatch-HDF5options.cmake23
1 files changed, 13 insertions, 10 deletions
diff --git a/config/cmake/scripts/HPC/sbatch-HDF5options.cmake b/config/cmake/scripts/HPC/sbatch-HDF5options.cmake
index 5316f41..f70526e 100644
--- a/config/cmake/scripts/HPC/sbatch-HDF5options.cmake
+++ b/config/cmake/scripts/HPC/sbatch-HDF5options.cmake
@@ -28,22 +28,25 @@ if (DEFINED MPI)
endif ()
#############################################################################################
### options to run test scripts in batch commands
+if (DEFINED KNL)
+ ### some additions and alternatives to cross compile on haswell for knl
+ set (COMPILENODE_HWCOMPILE_MODULE "craype-haswell")
+ set (COMPUTENODE_HWCOMPILE_MODULE "craype-mic-knl")
+ set (LOCAL_BATCH_SCRIPT_NAME "knl_ctestS.sl")
+ set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl")
+ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
+else ()
+ set (LOCAL_BATCH_SCRIPT_NAME "ctestS.sl")
+ set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctestP.sl")
+endif ()
set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch")
set (LOCAL_BATCH_TEST "TRUE")
-set (LOCAL_BATCH_SCRIPT_NAME "ctestS.sl")
-set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctestP.sl")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
-set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=ctestS.sl")
-set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=ctestP.sl")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=srun")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
#############################################################################################
-### some additions and alternatives to cross compile on haswell for knl
-#set (COMPILENODE_HWCOMPILE_MODULE "craype-haswell")
-#set (COMPUTENODE_HWCOMPILE_MODULE "craype-mic-knl")
-#set (SITE_BUILDNAME_SUFFIX "knl-intel17-SHARED"
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=knl_ctestS.sl")
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=knl_ctestP.sl")
#############################################################################################