cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaner MPI linking with the core library. Requires cmake 3.9+ though, might have to modify later to work with older versions.

Browse Source
This commit is contained in:
jpekkila
2019-12-04 13:49:38 +02:00
parent 6e63411170
commit 0ea2fa9337
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/CMakeLists.txt
View File

@@ -39,10 +39,6 @@ elseif (CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG")
set(CUDA_NVCC_FLAGS_DEBUG --device-debug --generate-line-info --ptxas-options=-v) set(CUDA_NVCC_FLAGS_DEBUG --device-debug --generate-line-info --ptxas-options=-v)
endif() endif()
if (MPI_ENABLED)
add_definitions(-DAC_MPI_ENABLED=1)
endif ()
## Create and link the library ## Create and link the library
#set(CMAKE_POSITION_INDEPENDENT_CODE ON) # fpic for shared libraries #set(CMAKE_POSITION_INDEPENDENT_CODE ON) # fpic for shared libraries
cuda_add_library(astaroth_core STATIC astaroth.cc node.cc device.cc kernels/boundconds.cu kernels/integration.cu kernels/reductions.cu) cuda_add_library(astaroth_core STATIC astaroth.cc node.cc device.cc kernels/boundconds.cu kernels/integration.cu kernels/reductions.cu)
@@ -57,5 +53,7 @@ if (MULTIGPU_ENABLED)
endif () endif ()
if (MPI_ENABLED) if (MPI_ENABLED)
target_link_libraries(astaroth_core astaroth_utils) find_package(MPI REQUIRED)
target_link_libraries(astaroth_core astaroth_utils MPI::MPI_CXX)
target_compile_definitions(astaroth_core PRIVATE AC_MPI_ENABLED=1)
endif () endif ()