Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
ffd6b79a
Commit
ffd6b79a
authored
Apr 05, 2019
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: don't use implementation specific mpi options in sources
parent
29110918
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
6 deletions
+6
-6
CI/configure_option.cmake
CI/configure_option.cmake
+2
-1
CMake/OTBModuleTest.cmake
CMake/OTBModuleTest.cmake
+1
-1
CMake/OTBStandaloneModuleMacros.cmake
CMake/OTBStandaloneModuleMacros.cmake
+1
-1
Modules/MPI/MPIConfig/test/CMakeLists.txt
Modules/MPI/MPIConfig/test/CMakeLists.txt
+0
-1
Modules/MPI/MPITiffWriter/test/CMakeLists.txt
Modules/MPI/MPITiffWriter/test/CMakeLists.txt
+0
-1
Modules/MPI/MPIVrtWriter/test/CMakeLists.txt
Modules/MPI/MPIVrtWriter/test/CMakeLists.txt
+0
-1
Modules/ThirdParty/MPI/otb-module-init.cmake
Modules/ThirdParty/MPI/otb-module-init.cmake
+2
-0
No files found.
CI/configure_option.cmake
View file @
ffd6b79a
...
...
@@ -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
...
...
CMake/OTBModuleTest.cmake
View file @
ffd6b79a
...
...
@@ -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 -n
p
${
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
()
CMake/OTBStandaloneModuleMacros.cmake
View file @
ffd6b79a
...
...
@@ -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 -n
p
${
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
()
...
...
Modules/MPI/MPIConfig/test/CMakeLists.txt
View file @
ffd6b79a
...
...
@@ -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
)
Modules/MPI/MPITiffWriter/test/CMakeLists.txt
View file @
ffd6b79a
...
...
@@ -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
...
...
Modules/MPI/MPIVrtWriter/test/CMakeLists.txt
View file @
ffd6b79a
...
...
@@ -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
...
...
Modules/ThirdParty/MPI/otb-module-init.cmake
View file @
ffd6b79a
...
...
@@ -19,3 +19,5 @@
#
find_package
(
MPI REQUIRED
)
set
(
OTB_MPIEXEC_OPT
""
CACHE STRING
"Additional options for mpiexec tests"
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment