Commit ffd6b79a authored by Guillaume Pasero's avatar Guillaume Pasero

BUG: don't use implementation specific mpi options in sources

parent 29110918
......@@ -51,7 +51,8 @@ OTB_USE_QWT:BOOL=ON
OTB_USE_SHARK:BOOL=ON
OTB_USE_SIFTFAST:BOOL=ON
OTB_USE_SPTW:BOOL=ON
OTB_USE_SSE_FLAGS:BOOL=ON")
OTB_USE_SSE_FLAGS:BOOL=ON
OTB_MPIEXEC_OPT:STRING=--allow-run-as-root")
set (otb_wrap_option
"OTB_WRAP_JAVA:BOOL=ON
......
......@@ -235,6 +235,6 @@ function(otb_add_test_mpi)
foreach(arg IN LISTS TEST_MPI_UNPARSED_ARGUMENTS)
list(APPEND ARGS ${arg})
endforeach()
set (test_parameters -np ${TEST_MPI_NBPROCS} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
set (test_parameters -n ${TEST_MPI_NBPROCS} ${OTB_MPIEXEC_OPT} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
otb_add_test(NAME ${TEST_MPI_NAME} COMMAND ${MPIEXEC} ${test_parameters})
endfunction()
......@@ -112,7 +112,7 @@ function(otb_add_test_mpi)
foreach(arg IN LISTS TEST_MPI_UNPARSED_ARGUMENTS)
list(APPEND ARGS ${arg})
endforeach()
set (test_parameters -np ${TEST_MPI_NBPROCS} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
set (test_parameters -n ${TEST_MPI_NBPROCS} ${OTB_MPIEXEC_OPT} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
otb_add_test(NAME ${TEST_MPI_NAME} COMMAND ${MPIEXEC} ${test_parameters})
endfunction()
......
......@@ -35,5 +35,4 @@ otb_module_target_label(otbMPIConfigTestDriver)
# MPI Hello test
otb_add_test_mpi(NAME otbMPIConfigTest
NBPROCS 2
EXTRA_OPT --allow-run-as-root
COMMAND otbMPIConfigTestDriver otbMPIConfigTest )
......@@ -37,7 +37,6 @@ otb_module_target_label(otbMPITiffWriterTestDriver)
otb_add_test_mpi(NAME otbMPISPTWReadWriteTest
NBPROCS 2
EXTRA_OPT --allow-run-as-root
COMMAND otbMPITiffWriterTestDriver
--compare-image ${NOTOL}
${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
......
......@@ -35,7 +35,6 @@ otb_module_target_label(otbMPIVrtWriterTestDriver)
# MPI Hello test
otb_add_test_mpi(NAME otbMPIVrtWriterTest
NBPROCS 2
EXTRA_OPT --allow-run-as-root
COMMAND otbMPIVrtWriterTestDriver
--compare-image ${NOTOL}
${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
......
......@@ -19,3 +19,5 @@
#
find_package ( MPI REQUIRED )
set(OTB_MPIEXEC_OPT "" CACHE STRING "Additional options for mpiexec tests")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment