From 46cfa9cd37869ccbe343093691dab21c43434529 Mon Sep 17 00:00:00 2001 From: jpekkila Date: Wed, 19 Aug 2020 15:50:16 +0300 Subject: [PATCH] Now using MPI C bindings instead of the (deprecated?) C++ bindings due to compilation issues on some machines (error: cast between incompatible function types, ompi_mpi_cxx_op_intercept) --- CMakeLists.txt | 4 ++-- samples/bwtest/CMakeLists.txt | 2 +- src/core/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64259fc..d9bc7be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,8 +91,8 @@ include_directories(${CMAKE_BINARY_DIR}) # DSL headers include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) # CUDA headers if (MPI_ENABLED) - find_package(MPI REQUIRED) - include_directories(${MPI_CXX_INCLUDE_DIRS}) + find_package(MPI REQUIRED COMPONENTS C) + include_directories(${MPI_C_INCLUDE_DIRS}) endif() ## Subdirectories diff --git a/samples/bwtest/CMakeLists.txt b/samples/bwtest/CMakeLists.txt index 229e7e2..27434ef 100644 --- a/samples/bwtest/CMakeLists.txt +++ b/samples/bwtest/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.17) # Required for moder CUDA::cudart linking -find_package(MPI) +find_package(MPI COMPONENTS C) find_package(OpenMP) find_package(CUDAToolkit) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 9e2a556..801ba1e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -9,7 +9,7 @@ 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_C) endif() if (MULTIGPU_ENABLED)