Review updates.

Co-authored-by: Tobias Ribizel <ribizel@kit.edu> Co-authored-by: Marcel Koch <marcel.koch@kit.edu> Co-authored-by: Aditya Kashi <aditya.kashi@kit.edu>
ginkgo-project · Nov 27, 2021 · 37b8a44 · 37b8a44
1 parent e913f55
commit 37b8a44
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 75 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,6 @@ option(GINKGO_BUILD_BENCHMARKS "Build Ginkgo's benchmarks" ON)
 option(GINKGO_BUILD_REFERENCE "Compile reference CPU kernels" ON)
 option(GINKGO_BUILD_OMP "Compile OpenMP kernels for CPU" ${GINKGO_HAS_OMP})
 option(GINKGO_BUILD_MPI "Compile the MPI module" ${GINKGO_HAS_MPI})
-option(GINKGO_FORCE_GPU_AWARE_MPI "Force the GPU Aware functionality to be enabled" OFF)
 option(GINKGO_BUILD_DPCPP
     "Compile DPC++ kernels for Intel GPUs or other DPC++ enabled hardware" ${GINKGO_HAS_DPCPP})
 option(GINKGO_BUILD_CUDA "Compile kernels for NVIDIA GPUs" ${GINKGO_HAS_CUDA})
@@ -191,15 +190,8 @@ else()
     message(STATUS "HWLOC is being forcibly switched off")
 endif()
 
-set(GINKGO_HAVE_MPI 0)
-set(GINKGO_HAVE_GPU_AWARE_MPI 0)
 if(GINKGO_BUILD_MPI)
     find_package(MPI REQUIRED)
-    set(GINKGO_HAVE_MPI 1)
-    set(GINKGO_HAVE_GPU_AWARE_MPI 0)
-    if(GINKGO_FORCE_GPU_AWARE_MPI)
-        set(GINKGO_HAVE_GPU_AWARE_MPI 1)
-    endif()
 endif()
 
 # We keep using NVCC/HCC for consistency with previous releases even if AMD

diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in
@@ -82,8 +82,7 @@ set(GINKGO_DPCPP_FLAGS @GINKGO_DPCPP_FLAGS@)
 set(GINKGO_MKL_ROOT @GINKGO_MKL_ROOT@)
 set(GINKGO_DPL_ROOT @GINKGO_DPL_ROOT@)
 
-set(GINKGO_HAVE_MPI @GINKGO_HAVE_MPI@)
-set(GINKGO_HAVE_CUDA_AWARE_MPI @GINKGO_HAVE_CUDA_AWARE_MPI@)
+set(GINKGO_BUILD_MPI @GINKGO_BUILD_MPI@)
 
 set(GINKGO_HAVE_PAPI_SDE @GINKGO_HAVE_PAPI_SDE@)
 
@@ -155,7 +154,7 @@ if(GINKGO_HAVE_HWLOC)
 endif()
 
 # Check for MPI if it is enabled
-if(GINKGO_HAVE_MPI)
+if(GINKGO_BUILD_MPI)
     find_package(MPI REQUIRED)
 endif()
 

diff --git a/core/mpi/get_info.cmake b/core/mpi/get_info.cmake
@@ -1,6 +1,4 @@
 ginkgo_print_module_header(${detailed_log} "MPI")
-ginkgo_print_variable(${detailed_log} "GINKGO_FORCE_CUDA_AWARE_MPI")
-ginkgo_print_variable(${detailed_log} "GKO_CUDA_AWARE_RUN_STATUS")
 ginkgo_print_variable(${detailed_log} "MPI_C_COMPILER")
 ginkgo_print_variable(${detailed_log} "MPI_CXX_COMPILER")
 ginkgo_print_variable(${detailed_log} "MPI_CXX_COMPILE_OPTIONS")

diff --git a/core/test/mpi/base/communicator.cpp b/core/test/mpi/base/communicator.cpp
@@ -114,7 +114,8 @@ TEST_F(Communicator, CommunicatorCanBeMoveConstructed)
 TEST_F(Communicator, CommunicatorCanBeMoveAssigned)
 {
     gko::mpi::communicator comm2(MPI_COMM_WORLD);
-    gko::mpi::communicator copy = std::move(comm2);
+    gko::mpi::communicator copy(MPI_COMM_NULL);
+    copy = std::move(comm2);
 
     EXPECT_TRUE(copy == comm);
 }

diff --git a/include/ginkgo/config.hpp.in b/include/ginkgo/config.hpp.in
@@ -84,13 +84,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* Is MPI available ? */
 // clang-format off
-#define GKO_HAVE_MPI @GINKGO_HAVE_MPI@
-// clang-format on
-
-
-/* Is GPU-aware MPI available ? */
-// clang-format off
-#define GKO_HAVE_GPU_AWARE_MPI @GINKGO_HAVE_GPU_AWARE_MPI@
+#cmakedefine01 GINKGO_BUILD_MPI
 // clang-format on