Skip to content
This repository has been archived by the owner on Mar 20, 2023. It is now read-only.

Give possibility to change mpiexec configuration for integration tests #699

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Give possibility to change mpiexec configuration for integration tests #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7295f4a
Give possibility to change mpiexec configuration for integration tests
Nov 29, 2021
0281e0e
Merge remote-tracking branch 'origin/master' into use_test_exec_prefix
olupton Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/coreneuron-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ jobs:
os: [ ubuntu-18.04, macOS-10.15 ]
config:
# Defaults: CORENRN_ENABLE_MPI=ON
- {cmake_option: "-DCORENRN_ENABLE_MPI=ON -DCORENRN_ENABLE_DEBUG_CODE=ON", documentation: ON}
- {cmake_option: "-DCORENRN_ENABLE_MPI_DYNAMIC=ON"}
- {cmake_option: "-DCORENRN_ENABLE_MPI_DYNAMIC=ON -DCORENRN_ENABLE_SHARED=OFF"}
- {cmake_option: "-DCORENRN_ENABLE_DEBUG_CODE=ON -DTEST_EXEC_PREFIX='mpiexec;-n;2'", documentation: ON}
- {cmake_option: "-DCORENRN_ENABLE_MPI_DYNAMIC=ON -DTEST_EXEC_PREFIX='mpiexec;-n;2'"}
- {cmake_option: "-DCORENRN_ENABLE_MPI_DYNAMIC=ON -DCORENRN_ENABLE_SHARED=OFF -DTEST_EXEC_PREFIX='mpiexec;-n;2'"}
- {cmake_option: "-DCORENRN_ENABLE_MPI=OFF"}
- {use_nmodl: ON, py_version: 3.6.7}
- {use_nmodl: ON}
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ If you have a different mpi launcher (than `mpirun`), you can specify it during

```bash
cmake .. -DTEST_MPI_EXEC_BIN="mpirun" \
-DTEST_EXEC_PREFIX="mpirun;-n;2" \
-DTEST_EXEC_PREFIX="mpirun;-n;2" \
-DAUTO_TEST_WITH_SLURM=OFF \
-DAUTO_TEST_WITH_MPIEXEC=OFF \
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ foreach(args_line ${TEST_CASES_WITH_ARGS})
string(REPLACE ";" " " SRUN_PREFIX "")
else()
set(test_num_processors 2)
string(REPLACE ";" " " SRUN_PREFIX "${TEST_MPI_EXEC_BIN};-n;${test_num_processors}")
string(REPLACE ";" " " SRUN_PREFIX "${TEST_EXEC_PREFIX}")
endif()
endif()
list(GET string_line 0 TEST_NAME)
Expand All @@ -137,7 +137,7 @@ foreach(args_line ${NEGATIVE_TEST_CASES})
set(test_num_processors 1)
if(MPI_FOUND)
set(test_num_processors 2)
string(REPLACE ";" " " SRUN_PREFIX "${TEST_MPI_EXEC_BIN};-n;${test_num_processors}")
string(REPLACE ";" " " SRUN_PREFIX "${TEST_EXEC_PREFIX}")
endif()
list(GET string_line 0 TEST_NAME)
list(GET string_line 1 TEST_ARGS)
Expand Down