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

Avoid linking to C++ MPI libraries #372

Merged
pramodk merged 2 commits into from
Aug 17, 2020
Merged

Avoid linking to C++ MPI libraries #372

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
03720c0
Avoid linking to C++ MPI libraries
pramodk Aug 15, 2020
a964242
Merge branch 'master' into pramodk/mpi-cpp
pramodk Aug 17, 2020
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: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ endif()
if(CORENRN_ENABLE_MPI)
find_package(MPI REQUIRED)
add_definitions("-DNRNMPI=1")
# avoid linking to C++ bindings
add_definitions("-DMPI_NO_CPPBIND=1")
add_definitions("-DOMPI_SKIP_MPICXX=1")
add_definitions("-DMPICH_SKIP_MPICXX=1")
else()
add_definitions("-DNRNMPI=0")
add_definitions("-DNRN_MULTISEND=0")
Expand Down Expand Up @@ -369,6 +373,8 @@ if(cmake_generator_tolower MATCHES "makefile")
message(STATUS " Build option | Status")
message(STATUS "--------------------+--------------------------------------------------------")

message(STATUS "C COMPILER | ${CMAKE_C_COMPILER}")
message(STATUS "CXX COMPILER | ${CMAKE_CXX_COMPILER}")
message(STATUS "COMPILE FLAGS | ${COMPILER_FLAGS} ${CMAKE_CXX_FLAGS}")
message(STATUS "Build Type | ${COMPILE_LIBRARY_TYPE}")
message(STATUS "MPI | ${CORENRN_ENABLE_MPI}")
Expand Down
5 changes: 2 additions & 3 deletions coreneuron/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ add_library(corenrnmech ${COMPILE_LIBRARY_TYPE} ${CORENEURON_HEADER_FILES} ${ENG

target_link_libraries(
coreneuron
${MPI_CXX_LIBRARIES}
${MPI_C_LIBRARIES}
${reportinglib_LIBRARY}
${sonatareport_LIBRARY}
${link_cudacoreneuron}
Expand Down Expand Up @@ -207,8 +207,7 @@ add_dependencies(coreneuron scopmath)
include_directories(${CORENEURON_PROJECT_SOURCE_DIR})
add_executable(nrniv-core "apps/coreneuron.cpp")

target_link_libraries(nrniv-core corenrnmech ${reportinglib_LIBRARY} ${sonatareport_LIBRARY}
${MPI_C_LIBRARIES} ${MPI_CXX_LIBRARIES})
target_link_libraries(nrniv-core corenrnmech ${reportinglib_LIBRARY} ${sonatareport_LIBRARY})

set_target_properties(nrniv-core PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

Expand Down