diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-02-03 04:45:55 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-02-03 04:45:55 (GMT) |
| commit | 30df67700cc95f1c08a0a2bc2b4cf38489f70a51 (patch) | |
| tree | 7a7fe9e07d35ddd033d283b5986f0f3cf32a3769 /config/cmake/scripts | |
| parent | 2d4f58adf0bd1774485686cea5d7c7c0ba8c2091 (diff) | |
| parent | c348d453b583ec9092152e6aef1f7fa9854cf5d9 (diff) | |
| download | hdf5-30df67700cc95f1c08a0a2bc2b4cf38489f70a51.zip hdf5-30df67700cc95f1c08a0a2bc2b4cf38489f70a51.tar.gz hdf5-30df67700cc95f1c08a0a2bc2b4cf38489f70a51.tar.bz2 | |
Merge pull request #1517 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'c348d453b583ec9092152e6aef1f7fa9854cf5d9':
Correct H5DIFF to PH5DIFF in *ctestS.sl.in.cmake list of parallel tests reserved for *ctestP.sl.cmake. Revise options to run batch tests and alternative options for cross compile in HPC/*-HDF5options.cmake.
Change examples file to zip for CMake zip file.
Update bin/release for filename changes and HPC-CMake tar file corrections.
Add new files to MANIFEST. Update permissions for raybsub to 755.
Diffstat (limited to 'config/cmake/scripts')
| -rw-r--r-- | config/cmake/scripts/HPC/par-HDF5options.cmake | 24 | ||||
| -rw-r--r-- | config/cmake/scripts/HPC/ser-HDF5options.cmake | 16 |
2 files changed, 27 insertions, 13 deletions
diff --git a/config/cmake/scripts/HPC/par-HDF5options.cmake b/config/cmake/scripts/HPC/par-HDF5options.cmake index 0527995..68d35dc 100644 --- a/config/cmake/scripts/HPC/par-HDF5options.cmake +++ b/config/cmake/scripts/HPC/par-HDF5options.cmake @@ -100,6 +100,17 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF") ### Create install package with external libraries (szip, zlib) 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 (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} -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") + + ############################################################################################# ### use a toolchain file @@ -107,11 +118,10 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") #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") -#options to run test scripts in batch commands -set (LOCAL_BATCH_TEST ON) -set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch") -set (LOCAL_BATCH_SCRIPT_NAME "knl_ctestS.sl") -set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl") -set(MPIEXEC_EXECUTABLE "srun") - +#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") ############################################################################################# diff --git a/config/cmake/scripts/HPC/ser-HDF5options.cmake b/config/cmake/scripts/HPC/ser-HDF5options.cmake index 71266ec..80c8b9e 100644 --- a/config/cmake/scripts/HPC/ser-HDF5options.cmake +++ b/config/cmake/scripts/HPC/ser-HDF5options.cmake @@ -100,6 +100,11 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN ### Create install package with external libraries (szip, zlib) 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 (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") + ############################################################################################# ### use a toolchain file @@ -107,11 +112,10 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") #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/GCC.cmake") -#options to run test scripts in batch commands -set (LOCAL_BATCH_TEST ON) -set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch") -set (LOCAL_BATCH_SCRIPT_NAME "knl_ctestS.sl") -set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl") -set(MPIEXEC_EXECUTABLE "srun") +#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") ############################################################################################# |