summaryrefslogtreecommitdiffstats
path: root/config/cmake/scripts/HPC/bsub-HDF5options.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-02-13 23:05:25 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-02-13 23:05:25 (GMT)
commit40589e28d8bd98a1af906e34c56b8b908a7eddab (patch)
tree3cc7bce865e0be1210d64633d59a379b47fb0805 /config/cmake/scripts/HPC/bsub-HDF5options.cmake
parent50b85e03300f4ba662038772cd6fd6fa84ecf97d (diff)
parentb95f05638ce40ccd944248f5865a248f39ef0d10 (diff)
downloadhdf5-40589e28d8bd98a1af906e34c56b8b908a7eddab.zip
hdf5-40589e28d8bd98a1af906e34c56b8b908a7eddab.tar.gz
hdf5-40589e28d8bd98a1af906e34c56b8b908a7eddab.tar.bz2
Merge pull request #1542 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b95f05638ce40ccd944248f5865a248f39ef0d10': TRILAB-111 fixes for parallel testing
Diffstat (limited to 'config/cmake/scripts/HPC/bsub-HDF5options.cmake')
-rw-r--r--config/cmake/scripts/HPC/bsub-HDF5options.cmake13
1 files changed, 2 insertions, 11 deletions
diff --git a/config/cmake/scripts/HPC/bsub-HDF5options.cmake b/config/cmake/scripts/HPC/bsub-HDF5options.cmake
index a862a6b..83c17aa 100644
--- a/config/cmake/scripts/HPC/bsub-HDF5options.cmake
+++ b/config/cmake/scripts/HPC/bsub-HDF5options.cmake
@@ -33,17 +33,8 @@ set (LOCAL_BATCH_TEST "TRUE")
set (LOCAL_BATCH_SCRIPT_NAME "ctestS.lsf")
set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctestP.lsf")
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.lsf")
-set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=ctestP.lsf")
+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")
-#############################################################################################