Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 0240bc92 authored by MARAIT Gilles's avatar MARAIT Gilles
Browse files

Fix merge error for mumps

parent b57b0c98
......@@ -31,7 +31,6 @@
# - METIS: to activate detection of MUMPS linked with METIS
# - PARMETIS: to activate detection of MUMPS linked with PARMETIS
# - OPENMP: to activate detection of MUMPS linked with OPENMP
# - BLASMT: to use multithreaded BLAS only
#
# This module finds headers and mumps library.
# Results are reported in variables:
......@@ -83,7 +82,6 @@ set(MUMPS_LOOK_FOR_PTSCOTCH OFF)
set(MUMPS_LOOK_FOR_METIS OFF)
set(MUMPS_LOOK_FOR_PARMETIS OFF)
set(MUMPS_LOOK_FOR_OPENMP OFF)
set(MUMPS_LOOK_FOR_BLASMT OFF)
if( MUMPS_FIND_COMPONENTS )
foreach( component ${MUMPS_FIND_COMPONENTS} )
......@@ -112,9 +110,6 @@ if( MUMPS_FIND_COMPONENTS )
if (${component} STREQUAL "OPENMP")
set(MUMPS_LOOK_FOR_OPENMP ON)
endif()
if (${component} STREQUAL "BLASMT")
set(MUMPS_LOOK_FOR_BLASMT ON)
endif()
endforeach()
endif()
......@@ -155,7 +150,7 @@ endif ()
if (NOT MUMPS_FIND_QUIETLY)
message(STATUS "Looking for MUMPS - Try to detect BLAS")
endif()
if (NOT BLAS_FOUND)
if (NOT BLASEXT_FOUND)
if (MUMPS_FIND_REQUIRED)
find_package(BLASEXT REQUIRED)
else()
......@@ -346,16 +341,16 @@ else()
set(MUMPS_${mumps_hdr}_DIRS "MUMPS_${mumps_hdr}_INCLUDE_DIRS-NOTFOUND")
foreach(mumps_hdr ${MUMPS_hdrs_to_find})
find_path(MUMPS_${mumps_hdr}_DIRS
NAMES ${mumps_hdr}
HINTS ${MUMPS_DIR}
PATH_SUFFIXES "include")
NAMES ${mumps_hdr}
HINTS ${MUMPS_DIR}
PATH_SUFFIXES "include")
endforeach()
else()
foreach(mumps_hdr ${MUMPS_hdrs_to_find})
set(MUMPS_${mumps_hdr}_DIRS "MUMPS_${mumps_hdr}_INCLUDE_DIRS-NOTFOUND")
find_path(MUMPS_${mumps_hdr}_DIRS
NAMES ${mumps_hdr}
HINTS ${_inc_env})
NAMES ${mumps_hdr}
HINTS ${_inc_env})
endforeach()
endif()
endif()
......@@ -439,16 +434,16 @@ else()
foreach(mumps_lib ${MUMPS_libs_to_find})
set(MUMPS_${mumps_lib}_LIBRARY "MUMPS_${mumps_lib}_LIBRARY-NOTFOUND")
find_library(MUMPS_${mumps_lib}_LIBRARY
NAMES ${mumps_lib}
HINTS ${MUMPS_DIR}
PATH_SUFFIXES lib lib32 lib64)
NAMES ${mumps_lib}
HINTS ${MUMPS_DIR}
PATH_SUFFIXES lib lib32 lib64)
endforeach()
else()
foreach(mumps_lib ${MUMPS_libs_to_find})
set(MUMPS_${mumps_lib}_LIBRARY "MUMPS_${mumps_lib}_LIBRARY-NOTFOUND")
find_library(MUMPS_${mumps_lib}_LIBRARY
NAMES ${mumps_lib}
HINTS ${_lib_env})
NAMES ${mumps_lib}
HINTS ${_lib_env})
endforeach()
endif()
endif()
......@@ -584,6 +579,7 @@ if(MUMPS_LIBRARIES)
endif()
endforeach()
set(REQUIRED_LIBS "${MUMPS_LIBRARIES}")
# SCALAPACK
if (MUMPS_LOOK_FOR_MPI AND SCALAPACK_FOUND)
if (SCALAPACK_INCLUDE_DIRS)
......@@ -591,7 +587,7 @@ if(MUMPS_LIBRARIES)
endif()
foreach(libdir ${SCALAPACK_LIBRARY_DIRS})
if (libdir)
list(APPEND REQUIRED_LIBDIRS "${libdir}")
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
endforeach()
list(APPEND REQUIRED_LIBS "${SCALAPACK_LIBRARIES}")
......@@ -606,7 +602,7 @@ if(MUMPS_LIBRARIES)
endif()
if (MPI_Fortran_LINK_FLAGS)
if (${MPI_Fortran_LINK_FLAGS} MATCHES " -")
string(REGEX REPLACE " -" "-" MPI_Fortran_LINK_FLAGS ${MPI_Fortran_LINK_FLAGS})
string(REGEX REPLACE " -" "-" MPI_Fortran_LINK_FLAGS ${MPI_Fortran_LINK_FLAGS})
endif()
list(APPEND REQUIRED_LDFLAGS "${MPI_Fortran_LINK_FLAGS}")
endif()
......@@ -617,20 +613,12 @@ if(MUMPS_LIBRARIES)
if (BLAS_INCLUDE_DIRS)
list(APPEND REQUIRED_INCDIRS "${BLAS_INCLUDE_DIRS}")
endif()
if(MUMPS_LOOK_FOR_BLASMT)
set(_mumps_blas_lib ${BLAS_PAR_LIBRARIES})
else()
set(_mumps_blas_lib ${BLAS_SEQ_LIBRARIES})
endif()
if(NOT _mumps_blas_lib)
set(_mumps_blas_lib ${BLAS_LIBRARIES})
endif()
foreach(libdir ${_mumps_blas_lib})
foreach(libdir ${BLAS_LIBRARY_DIRS})
if (libdir)
list(APPEND REQUIRED_LIBDIRS "${libdir}")
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
endforeach()
list(APPEND REQUIRED_LIBS "${_mumps_blas_lib}")
list(APPEND REQUIRED_LIBS "${BLAS_LIBRARIES}")
if (BLAS_LINKER_FLAGS)
list(APPEND REQUIRED_LDFLAGS "${BLAS_LINKER_FLAGS}")
endif()
......@@ -642,7 +630,7 @@ if(MUMPS_LIBRARIES)
endif()
foreach(libdir ${SCOTCH_LIBRARY_DIRS})
if (libdir)
list(APPEND REQUIRED_LIBDIRS "${libdir}")
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
endforeach()
list(APPEND REQUIRED_LIBS "${SCOTCH_LIBRARIES}")
......@@ -654,7 +642,7 @@ if(MUMPS_LIBRARIES)
endif()
foreach(libdir ${PTSCOTCH_LIBRARY_DIRS})
if (libdir)
list(APPEND REQUIRED_LIBDIRS "${libdir}")
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
endforeach()
list(APPEND REQUIRED_LIBS "${PTSCOTCH_LIBRARIES}")
......@@ -666,7 +654,7 @@ if(MUMPS_LIBRARIES)
endif()
foreach(libdir ${METIS_LIBRARY_DIRS})
if (libdir)
list(APPEND REQUIRED_LIBDIRS "${libdir}")
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
endforeach()
list(APPEND REQUIRED_LIBS "${METIS_LIBRARIES}")
......@@ -678,7 +666,7 @@ if(MUMPS_LIBRARIES)
endif()
foreach(libdir ${PARMETIS_LIBRARY_DIRS})
if (libdir)
list(APPEND REQUIRED_LIBDIRS "${libdir}")
list(APPEND REQUIRED_LIBDIRS "${libdir}")
endif()
endforeach()
list(APPEND REQUIRED_LIBS "${PARMETIS_LIBRARIES}")
......@@ -758,8 +746,8 @@ if(MUMPS_LIBRARIES)
message(STATUS "CMAKE_REQUIRED_INCLUDES: ${CMAKE_REQUIRED_INCLUDES}")
message(STATUS "Check in CMakeFiles/CMakeError.log to figure out why it fails")
message(STATUS "Maybe MUMPS is linked with specific libraries. "
"Have you tried with COMPONENTS (MPI/SEQ, SCOTCH, PTSCOTCH, METIS, PARMETIS)? "
"See the explanation in FindMUMPS.cmake.")
"Have you tried with COMPONENTS (MPI/SEQ, SCOTCH, PTSCOTCH, METIS, PARMETIS)? "
"See the explanation in FindMUMPS.cmake.")
endif()
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment