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

Made cmake handle MPI linking. Potentially a bad idea (usually better to use mpicc and mpicxx wrappers)

Browse Source
This commit is contained in:
jpekkila
2020-05-30 22:02:39 +03:00
parent f97ed9e513
commit a753ca92f2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -81,6 +81,11 @@ include_directories(src/common) # Common headers
include_directories(${CMAKE_BINARY_DIR}) # DSL headers include_directories(${CMAKE_BINARY_DIR}) # DSL headers
include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) # CUDA headers include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) # CUDA headers
if (MPI_ENABLED)
find_package(MPI REQUIRED)
include_directories(${MPI_CXX_INCLUDE_DIRS})
endif()
## Subdirectories ## Subdirectories
add_subdirectory(src/utils) add_subdirectory(src/utils)
add_subdirectory(src/core/kernels) add_subdirectory(src/core/kernels)

7
src/core/CMakeLists.txt
View File

@@ -6,9 +6,10 @@ target_link_libraries(astaroth_core astaroth_utils astaroth_kernels CUDA::cudart
## Options ## Options
if (MPI_ENABLED) if (MPI_ENABLED)
find_package(MPI) #find_package(MPI REQUIRED)
find_package(OpenMP) #find_package(OpenMP)
target_link_libraries(astaroth_core MPI::MPI_CXX OpenMP::OpenMP_CXX) #target_link_libraries(astaroth_core MPI::MPI_CXX OpenMP::OpenMP_CXX)
target_link_libraries(astaroth_core MPI::MPI_CXX)
endif() endif()
if (MULTIGPU_ENABLED) if (MULTIGPU_ENABLED)