Skip to content

Commit

Permalink
Fix the build issues and tests on Apple M1 (#1053)
Browse files Browse the repository at this point in the history
* Fix the build issues and tests on Apple M1
 * catch submodule updated to latest release to
   support apple m1 build
 * FindMPI.cmake breaks compatibility with latest
   cmake version. See #1052.

Fixes #1052
Fixes #1033
  • Loading branch information
pramodk authored and alexsavulescu committed Apr 13, 2021
1 parent d925911 commit 71eedec
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion external/catch2
Submodule catch2 updated 142 files
12 changes: 12 additions & 0 deletions test/external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
#
# Add tests based on external repositories
#

# FindMPI broke backward compatibility with v3.19
if(${CMAKE_VERSION} VERSION_LESS "3.10")
get_filename_component(MPIEXEC_NAME ${MPIEXEC} NAME)
else()
get_filename_component(MPIEXEC_NAME ${MPIEXEC_EXECUTABLE} NAME)
endif()

# To work around CI failures that seem related to #894 we should run `mpiexec` not
# `/path/to/mpiexec`
set(MPIEXEC_NAME ${MPIEXEC_NAME})

add_subdirectory(ringtest)
add_subdirectory(testcorenrn)
3 changes: 0 additions & 3 deletions test/external/ringtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ nrn_add_test(
COMMAND special -python ringtest.py -tstop 100
OUTPUT asciispikes::spk1.std)

# To work around CI failures that seem related to #894 we should run `mpiexec` not
# `/path/to/mpiexec`
get_filename_component(MPIEXEC_NAME ${MPIEXEC} NAME)
nrn_add_test(
GROUP external_ringtest
NAME neuron_mpi
Expand Down
2 changes: 0 additions & 2 deletions test/external/testcorenrn/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ set(test_vecplay_neuron_requirements mod_compatibility)
set(test_gf_coreneuron_cpu_conflicts gpu) # CoreNEURON-on-CPU test conflicts with GPU being enabled
# in the build

get_filename_component(MPIEXEC_NAME ${MPIEXEC} NAME)

if(${CORENRN_ENABLE_GPU})
set(gpu_args_online -c arg_coreneuron_gpu=1)
set(gpu_args_offline --gpu)
Expand Down

0 comments on commit 71eedec

Please sign in to comment.