Skip to content

Commit 73c4db2

Browse files
committed
removed raybsub references
1 parent 1e2f32e commit 73c4db2

File tree

5 files changed

+8
-54
lines changed

5 files changed

+8
-54
lines changed

config/cmake/scripts/CTestScript.cmake

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,11 @@ set (ENV{CI_MODEL} ${MODEL})
278278
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
279279
else ()
280280
file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
281-
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
282-
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
281+
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
282+
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestS.out)
283283
else ()
284-
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
285-
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestS.out)
286-
else ()
287-
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
288-
endif()
289-
endif ()
284+
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
285+
endif()
290286
message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/ctestS.done")
291287
execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/ctestS.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
292288
while(result)
@@ -299,14 +295,10 @@ set (ENV{CI_MODEL} ${MODEL})
299295
endif ()
300296
if (LOCAL_BATCH_SCRIPT_PARALLEL_NAME)
301297
unset(result CACHE)
302-
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
303-
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
298+
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
299+
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestP.out)
304300
else ()
305-
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
306-
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestP.out)
307-
else ()
308-
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
309-
endif ()
301+
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
310302
endif ()
311303
message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/ctestP.done")
312304
execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/ctestP.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)

config/cmake/scripts/HDF5config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ set (CTEST_SOURCE_VERSEXT "-4")
4848
#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
4949
#CTEST_SOURCE_NAME - name of source folder; HDF5-2.0.x
5050
#MODEL - CDash group name
51-
#HPC - run alternate configurations for HPC machines; sbatch, bsub, raybsub, qsub
51+
#HPC - run alternate configurations for HPC machines; sbatch, bsub, qsub
5252
#MPI - enable MPI
5353
if (DEFINED CTEST_SCRIPT_ARG)
5454
# transform ctest script arguments of the form

config/cmake/scripts/HPC/raybsub-HDF5options.cmake

Lines changed: 0 additions & 32 deletions
This file was deleted.

release_docs/README_HPC.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ Add after `HDF5config.cmake,` separated by commas:
198198
|--------|-------------|
199199
| `HPC=sbatch` | Use SLURM batch system |
200200
| `HPC=bsub` | Use LSF batch system |
201-
| `HPC=raybsub` | Use Ray LSF variant |
202201
| `MPI=true` | Enable parallel (disables C++, Java, threadsafe) |
203202
| `LOCAL_BATCH_SCRIPT_ARGS="--account=<acct>"` | Supply batch job account information |
204203

src/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,11 +1226,6 @@ if (LOCAL_BATCH_TEST)
12261226
${HDF5_SOURCE_DIR}/bin/batch/ctest_parallel.cmake.in
12271227
${HDF5_BINARY_DIR}/ctest_parallel.cmake ESCAPE_QUOTES @ONLY
12281228
)
1229-
if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
1230-
configure_file (
1231-
${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_COMMAND}
1232-
${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_COMMAND} ESCAPE_QUOTES @ONLY
1233-
)
12341229
endif ()
12351230
if (LOCAL_BATCH_SCRIPT_NAME)
12361231
configure_file (

0 commit comments

Comments
 (0)