summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-02-04 03:33:16 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-02-04 03:33:16 (GMT)
commitdddc940bdf4a0ae236b7096245a436aead30b55d (patch)
treec4324abc88ec53cd37060cce87cb7b8f90da6630
parentc348d453b583ec9092152e6aef1f7fa9854cf5d9 (diff)
downloadhdf5-dddc940bdf4a0ae236b7096245a436aead30b55d.zip
hdf5-dddc940bdf4a0ae236b7096245a436aead30b55d.tar.gz
hdf5-dddc940bdf4a0ae236b7096245a436aead30b55d.tar.bz2
Add batchscript options that work when running ctest directly.
-rw-r--r--config/cmake/scripts/HPC/par-HDF5options.cmake5
-rw-r--r--config/cmake/scripts/HPC/ser-HDF5options.cmake2
-rw-r--r--config/toolchain/crayle.cmake7
3 files changed, 9 insertions, 5 deletions
diff --git a/config/cmake/scripts/HPC/par-HDF5options.cmake b/config/cmake/scripts/HPC/par-HDF5options.cmake
index 68d35dc..5386373 100644
--- a/config/cmake/scripts/HPC/par-HDF5options.cmake
+++ b/config/cmake/scripts/HPC/par-HDF5options.cmake
@@ -103,6 +103,9 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
#options to run test scripts in batch commands
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")
@@ -114,7 +117,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
#############################################################################################
### use a toolchain file
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/craype.cmake")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake")
#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/GCC.cmake")
diff --git a/config/cmake/scripts/HPC/ser-HDF5options.cmake b/config/cmake/scripts/HPC/ser-HDF5options.cmake
index 80c8b9e..f935efc 100644
--- a/config/cmake/scripts/HPC/ser-HDF5options.cmake
+++ b/config/cmake/scripts/HPC/ser-HDF5options.cmake
@@ -102,6 +102,8 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
#options to run test scripts in batch commands
set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch")
+set (LOCAL_BATCH_TEST "TRUE")
+set (LOCAL_BATCH_SCRIPT_NAME "ctestS.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")
diff --git a/config/toolchain/crayle.cmake b/config/toolchain/crayle.cmake
index 47d8afc..159f43a 100644
--- a/config/toolchain/crayle.cmake
+++ b/config/toolchain/crayle.cmake
@@ -15,7 +15,6 @@ set(HDF5_USE_PREGEN OFF)
#set(HDF5_USE_PREGEN_DIR "/lscratch1/lknox/HDF5_1_10_4/CMake-hdf5-1.10.4")
# option to generate H5Tinit.c by running H5detect on knl compute node during build
-set(HDF5_BATCH_H5DETECT ON)
-set(HDF5_BATCH_CMD "sbatch")
-set(HDF5_BATCH_H5DETECT_SCRIPT "knl_H5detect.sl")
-set(MPIEXEC_EXECUTABLE "srun")
+#set(HDF5_BATCH_H5DETECT ON)
+#set(HDF5_BATCH_CMD "sbatch")
+#set(HDF5_BATCH_H5DETECT_SCRIPT "knl_H5detect.sl")