From f0ecf1f0b3762e9875477e27b41c7c55c0a700c6 Mon Sep 17 00:00:00 2001 From: Samuel Thibault <samuel.thibault@inria.fr> Date: Mon, 14 Sep 2015 15:45:10 +0000 Subject: [PATCH] Allow MPI in simulation mode, just use smpicc instead of mpicc --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0463fe7f..eb23861ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -465,7 +465,11 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/") # -DMPI_C_COMPILER=path/to/mpicc -DMPI_Fortran_COMPILER=path/to/mpif90 # at cmake configure if(NOT MPI_C_COMPILER) - set(MPI_C_COMPILER mpicc) + if(NOT CHAMELEON_SIMULATION) + set(MPI_C_COMPILER mpicc) + else(NOT CHAMELEON_SIMULATION) + set(MPI_C_COMPILER smpicc) + endif() endif() find_package(MPI REQUIRED) @@ -509,12 +513,6 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/") "Because we are compiling the simulation mode (CHAMELEON_SIMULATION=ON)," "we do not need to link with MAGMA.${ColourReset}") endif () - if (CHAMELEON_USE_MPI) - set(CHAMELEON_USE_MPI OFF) - message("${BoldBlue}CHAMELEON_USE_MPI is set to ON but we turn it OFF." - "Because we are compiling the simulation mode (CHAMELEON_SIMULATION=ON)," - "we do not need to link with MPI.${ColourReset}") - endif () if (CHAMELEON_ENABLE_TESTING) set(CHAMELEON_ENABLE_TESTING OFF) message("${BoldBlue}CHAMELEON_ENABLE_TESTING is set to ON but we turn it OFF." -- GitLab