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

Streamlined setting up MPI in the CMakeLists

Browse Source
This commit is contained in:
jpekkila
2020-08-19 13:44:35 +03:00
parent b035dfd6fb
commit f9e9a4a4ef
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -78,6 +78,8 @@ if (DOUBLE_PRECISION)
add_definitions(-DAC_DOUBLE_PRECISION=1) add_definitions(-DAC_DOUBLE_PRECISION=1)
endif () endif ()
if (MPI_ENABLED) if (MPI_ENABLED)
find_package(MPI REQUIRED)
include_directories(${MPI_CXX_INCLUDE_DIRS})
add_definitions(-DAC_MPI_ENABLED=1) add_definitions(-DAC_MPI_ENABLED=1)
endif () endif ()
if (MULTIGPU_ENABLED) if (MULTIGPU_ENABLED)
@@ -92,11 +94,6 @@ 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,12 +6,5 @@ target_link_libraries(astaroth_core astaroth_kernels CUDA::cudart CUDA::cuda_dri
## Options ## Options
if (MPI_ENABLED) if (MPI_ENABLED)
#find_package(MPI REQUIRED)
#find_package(OpenMP)
#target_link_libraries(astaroth_core MPI::MPI_CXX OpenMP::OpenMP_CXX)
target_link_libraries(astaroth_core MPI::MPI_CXX) target_link_libraries(astaroth_core MPI::MPI_CXX)
endif() endif()
if (MULTIGPU_ENABLED)
target_compile_definitions(astaroth_core PRIVATE -DAC_MULTIGPU_ENABLED=1)
endif ()