mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
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
This commit is contained in:
commit
50b85e0330
@ -28,22 +28,25 @@ if (DEFINED MPI)
|
|||||||
endif ()
|
endif ()
|
||||||
#############################################################################################
|
#############################################################################################
|
||||||
### options to run test scripts in batch commands
|
### 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_SCRIPT_COMMAND "sbatch")
|
||||||
set (LOCAL_BATCH_TEST "TRUE")
|
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_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_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
|
||||||
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_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_EXECUTABLE:STRING=srun")
|
||||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
|
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
|
||||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
|
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")
|
|
||||||
#############################################################################################
|
#############################################################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user