Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit 1616e898 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files
parents bbbca457 ed1bd46a
......@@ -603,6 +603,9 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND O
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
if (MPI_C_LINK_FLAGS)
if (${MPI_C_LINK_FLAGS} MATCHES " -")
string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
endif()
list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
......
......@@ -510,6 +510,9 @@ if(MUMPS_LIBRARIES)
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
if (MPI_Fortran_LINK_FLAGS)
if (${MPI_Fortran_LINK_FLAGS} MATCHES " -")
string(REGEX REPLACE " -" "-" MPI_Fortran_LINK_FLAGS ${MPI_Fortran_LINK_FLAGS})
endif()
list(APPEND REQUIRED_LDFLAGS "${MPI_Fortran_LINK_FLAGS}")
endif()
list(APPEND REQUIRED_LIBS "${MPI_Fortran_LIBRARIES}")
......
......@@ -518,6 +518,9 @@ if(PASTIX_LIBRARIES)
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
if (MPI_C_LINK_FLAGS)
if (${MPI_C_LINK_FLAGS} MATCHES " -")
string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
endif()
list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
......
......@@ -232,6 +232,9 @@ if(PTSCOTCH_LIBRARIES)
list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}")
endif()
if (MPI_C_LINK_FLAGS)
if (${MPI_C_LINK_FLAGS} MATCHES " -")
string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
endif()
list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
......
......@@ -162,7 +162,6 @@ if (NOT _libdir)
list(APPEND _libdir "${BLAS_DIR}/lib32")
list(APPEND _libdir "${BLAS_DIR}/lib/ia32")
endif()
endif ()
elseif (BLAS_LIBDIR)
list(APPEND _libdir "${BLAS_LIBDIR}")
endif ()
......@@ -176,7 +175,6 @@ if (NOT _libdir)
list(APPEND _libdir "${SCALAPACK_DIR}/lib32")
list(APPEND _libdir "${SCALAPACK_DIR}/lib/ia32")
endif()
endif ()
elseif (SCALAPACK_LIBDIR)
list(APPEND _libdir "${SCALAPACK_LIBDIR}")
else()
......@@ -211,7 +209,7 @@ foreach(_library ${_list})
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif (APPLE)
else (BLA_STATIC)
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
# for ubuntu's libblas3gf and libscalapack3gf packages
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)
endif ()
......@@ -320,61 +318,61 @@ if (BLA_VENDOR STREQUAL "Generic" OR
endif ( NOT SCALAPACK_LIBRARIES )
endif ()
#intel scalapack
#if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
# if (NOT WIN32)
# set(LM "-lm")
# endif ()
# if (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
# if(SCALAPACK_FIND_QUIETLY OR NOT SCALAPACK_FIND_REQUIRED)
# find_PACKAGE(Threads)
# else()
# find_package(Threads REQUIRED)
# endif()
#
# set(SCALAPACK_SEARCH_LIBS "")
#
# if (BLA_F95)
# set(SCALAPACK_mkl_SEARCH_SYMBOL "PDGEMM")
# set(_LIBRARIES SCALAPACK95_LIBRARIES)
# set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
# list(APPEND SCALAPACK_SEARCH_LIBS "mkl_scalapack_lp64")
# else()
# set(SCALAPACK_mkl_SEARCH_SYMBOL "pdgemm")
# set(_LIBRARIES SCALAPACK_LIBRARIES)
# set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})
# list(APPEND SCALAPACK_SEARCH_LIBS "mkl_scalapack_lp64")
# endif()
#
# First try empty scalapack libs
# if (NOT ${_LIBRARIES})
# check_scalapack_libraries(
# ${_LIBRARIES}
# BLAS
# ${SCALAPACK_mkl_SEARCH_SYMBOL}
# ""
# ""
# "${_BLAS_LIBRARIES}"
# "mkl_blacs_intelmpi_lp64"
# "${CMAKE_THREAD_LIBS_INIT};${LM}"
# )
# endif ()
if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
if (NOT WIN32)
set(LM "-lm")
endif ()
if (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
if(SCALAPACK_FIND_QUIETLY OR NOT SCALAPACK_FIND_REQUIRED)
find_PACKAGE(Threads)
else()
find_package(Threads REQUIRED)
endif()
set(SCALAPACK_SEARCH_LIBS "")
if (BLA_F95)
set(SCALAPACK_mkl_SEARCH_SYMBOL "PDGEMM")
set(_LIBRARIES SCALAPACK95_LIBRARIES)
set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
list(APPEND SCALAPACK_SEARCH_LIBS "mkl_scalapack_lp64")
else()
set(SCALAPACK_mkl_SEARCH_SYMBOL "pdgemm")
set(_LIBRARIES SCALAPACK_LIBRARIES)
set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})
list(APPEND SCALAPACK_SEARCH_LIBS "mkl_scalapack_lp64")
endif()
# First try empty scalapack libs
if (NOT ${_LIBRARIES})
check_scalapack_libraries(
${_LIBRARIES}
BLAS
${SCALAPACK_mkl_SEARCH_SYMBOL}
""
""
"${_BLAS_LIBRARIES}"
"mkl_blacs_intelmpi_lp64"
"${MPI_Fortran_LIBRARIES}"
)
endif ()
# Then try the search libs
# foreach (IT ${SCALAPACK_SEARCH_LIBS})
# if (NOT ${_LIBRARIES})
# check_scalapack_libraries(
# ${_LIBRARIES}
# BLAS
# ${SCALAPACK_mkl_SEARCH_SYMBOL}
# ""
# "${IT}"
# "${_BLAS_LIBRARIES}"
# "mkl_blacs_intelmpi_lp64"
# "${CMAKE_THREAD_LIBS_INIT};${LM}"
# )
# endif ()
# endforeach ()
# endif ()
#endif()
foreach (IT ${SCALAPACK_SEARCH_LIBS})
if (NOT ${_LIBRARIES})
check_scalapack_libraries(
${_LIBRARIES}
BLAS
${SCALAPACK_mkl_SEARCH_SYMBOL}
""
"${IT}"
"${_BLAS_LIBRARIES}"
"mkl_blacs_intelmpi_lp64"
"${MPI_Fortran_LIBRARIES}"
)
endif ()
endforeach ()
endif ()
endif()
else(BLAS_FOUND AND LAPACK_FOUND AND MPI_FOUND)
message(STATUS "SCALAPACK requires BLAS, LAPACK, and MPI")
endif(BLAS_FOUND AND LAPACK_FOUND AND MPI_FOUND)
......
......@@ -647,6 +647,9 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
endif()
if (MPI_C_LINK_FLAGS)
if (${MPI_C_LINK_FLAGS} MATCHES " -")
string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
endif()
list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
endif()
list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
......
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