Merge branch 'fix/PetSc_MKL' into 'master'

Fix/PetSc_mkl

this fixes blas/lapack detection of the PetSc configuration for systems which have no native blas/lapack installed

When native blas/lapack is enabled, we use this for PetSc (just like before, now we just do it explicitly and not by accident) , when MKL is enabled we use MKL and for all other cases, PetSc will download its own blas/lapack and compile it itself. This might be extended to ACML and other blas/lapack providers in the future but i can only test native and MKL on my systems.

See merge request !740

CMakeLists.txt

@@ -231,7 +231,6 @@ INCLUDE (ThirdPartyBoost)
 INCLUDE (ThirdPartyFFTW)
 INCLUDE (ThirdPartyArpack)
 INCLUDE (ThirdPartyMPI)
-INCLUDE (ThirdPartyPETSc)
 INCLUDE (ThirdPartyVTK)
 INCLUDE (ThirdPartySMV)
 INCLUDE (ThirdPartyOCE)
@@ -304,6 +303,8 @@ ELSE( NEKTAR_USE_MEMORY_POOLS )
     REMOVE_DEFINITIONS(-DNEKTAR_MEMORY_POOL_ENABLED)
 ENDIF( NEKTAR_USE_MEMORY_POOLS )
 
+INCLUDE (ThirdPartyPETSc)
+
 SET(Boost_USE_STATIC_LIBS OFF)
 IF( WIN32 )
     # The auto-linking feature has problems with USE_STATIC_LIBS off, so we use

cmake/FindMKL.cmake

@@ -62,6 +62,7 @@ ENDIF ( MKL_LAPACK_FOUND )
 
 SET( MKL_BLAS_INCLUDE_FILE ${MKL_INCLUDE_DIR}/mkl_blas.h )
 SET( MKL_LAPACK_INCLUDE_FILE ${MKL_INCLUDE_DIR}/mkl_lapack.h )
+GET_FILENAME_COMPONENT(MKL_LIB_DIR ${MKL_CORE} PATH)
 
 IF (MKL_INCLUDE_DIR)
     SET(MKL_FOUND ON)
@@ -78,6 +79,7 @@ ELSE(MKL_FOUND OR MKL_INTEL_FOUND )
 ENDIF (MKL_FOUND OR MKL_INTEL_FOUND )
 
 MARK_AS_ADVANCED(MKL_INCLUDE_DIR)
+MARK_AS_ADVANCED(MKL_LIB_DIR)
 MARK_AS_ADVANCED(MKL_LAPACK)
 MARK_AS_ADVANCED(MKL)
 MARK_AS_ADVANCED(MKL_GUIDE)

cmake/FindNativeBlasLapack.cmake

@@ -4,6 +4,8 @@ SET(NATIVE_BLAS_LAPACK_SEARCH_PATHS /usr/lib /usr/lib64 /usr/local/lib /usr/loca
 
 FIND_LIBRARY(NATIVE_BLAS NAMES blas PATHS ${NATIVE_BLAS_LAPACK_SEARCH_PATHS})
 FIND_LIBRARY(NATIVE_LAPACK NAMES lapack PATHS ${NATIVE_BLAS_LAPACK_SEARCH_PATHS})
+GET_FILENAME_COMPONENT(NATIVE_BLAS_LIB_DIR ${NATIVE_BLAS} PATH)
+GET_FILENAME_COMPONENT(NATIVE_LAPACK_LIB_DIR ${NATIVE_LAPACK} PATH)
 
 
 IF (NATIVE_BLAS AND NATIVE_LAPACK)
@@ -22,4 +24,6 @@ ENDIF (NATIVE_BLAS_LAPACK_FOUND)
 
 MARK_AS_ADVANCED(NATIVE_BLAS)
 MARK_AS_ADVANCED(NATIVE_LAPACK)
+MARK_AS_ADVANCED(NATIVE_BLAS_LIB_DIR)
+MARK_AS_ADVANCED(NATIVE_LAPACK_LIB_DIR)
 

cmake/ThirdPartyBlasLapack.cmake

@@ -40,6 +40,7 @@ IF(THIRDPARTY_BUILD_BLAS_LAPACK)
             -G ${CMAKE_GENERATOR}
             -DCMAKE_Fortran_COMPILER:FILEPATH=${CMAKE_Fortran_COMPILER}
             -DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
+            -DCMAKE_INSTALL_LIBDIR:PATH=${TPDIST}/lib
             -DBUILD_SHARED_LIBS:STRING=ON
             -DBUILD_TESTING:STRING=OFF
             ${TPSRC}/lapack-3.7.0
@@ -47,8 +48,12 @@ IF(THIRDPARTY_BUILD_BLAS_LAPACK)
 
     SET(NATIVE_BLAS blas CACHE FILEPATH "BLAS library" FORCE)
     SET(NATIVE_LAPACK lapack CACHE FILEPATH "LAPACK library" FORCE)
+    SET(NATIVE_BLAS_LIB_DIR ${TPDIST}/lib CACHE FILEPATH "BLAS library dir" FORCE)
+    SET(NATIVE_LAPACK_LIB_DIR ${TPDIST}/lib CACHE FILEPATH "LAPACK library dir" FORCE)
     MARK_AS_ADVANCED(NATIVE_BLAS)
     MARK_AS_ADVANCED(NATIVE_LAPACK)
+    MARK_AS_ADVANCED(NATIVE_BLAS_LIB_DIR)
+    MARK_AS_ADVANCED(NATIVE_LAPACK_LIB_DIR)
 
     LINK_DIRECTORIES(${TPDIST}/lib)
     INCLUDE_DIRECTORIES(${TPDIST}/include)

cmake/ThirdPartyPETSc.cmake

@@ -49,6 +49,27 @@ IF (NEKTAR_USE_PETSC)
             # we use a MUMPS build in ordering here, in the future it might make
             # sense to hook it up with metis/scotch since this MIGHT be faster
             SET(PETSC_MUMPS --download-scalapack --download-mumps)
+            SET(PETSC_DEPS "")
+
+            IF( NEKTAR_USE_BLAS_LAPACK )
+                IF( NEKTAR_USE_MKL AND MKL_FOUND )
+                    SET(PETSC_MUMPS ${PETSC_MUMPS} --with-blas-lapack-dir=${MKL_LIB_DIR})
+                ELSEIF( NEKTAR_USE_WIN32_LAPACK )
+                    SET(PETSC_MUMPS ${PETSC_MUMPS} --with-blas-lapack-dir=${LAPACK_DIR})
+                ELSEIF( NEKTAR_USE_SYSTEM_BLAS_LAPACK )
+                    SET(PETSC_MUMPS ${PETSC_MUMPS} --with-blas-lapack-dir=${NATIVE_LAPACK_LIB_DIR})
+                    IF(THIRDPARTY_BUILD_BLAS_LAPACK)
+                        SET(PETSC_DEPS ${PETSC_DEPS} lapack-3.7.0)
+                    ENDIF()
+                ELSE()
+                    MESSAGE(STATUS "No suitable blas/lapack found, downloading")
+                    SET(PETSC_MUMPS ${PETSC_MUMPS} --download-fblaslapack)
+                ENDIF()
+            ELSE()
+                MESSAGE(STATUS "No suitable blas/lapack found, downloading")
+                SET(PETSC_MUMPS ${PETSC_MUMPS} --download-fblaslapack)
+            ENDIF()
+
         ELSE()
             MESSAGE(WARNING "No Fortran support. Building PETSc without MUMPS support")
             SET(PETSC_Fortran_COMPILER "0")
@@ -56,6 +77,7 @@ IF (NEKTAR_USE_PETSC)
 
         EXTERNALPROJECT_ADD(
             petsc-3.7.2
+            DEPENDS ${PETSC_DEPS}
             PREFIX ${TPSRC}
             STAMP_DIR ${TPBUILD}/stamp
             DOWNLOAD_DIR ${TPSRC}