Commit 649d39e7 authored by MARAIT Gilles's avatar MARAIT Gilles
Browse files

Remove MaPHyS patch and use fixed versions of MaPHyS and fabulous

parent c470ee36
......@@ -219,33 +219,35 @@ area (CPUs-GPUs, distributed nodes).")
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)
(commit "c11405a13fd32e7bba58fb5468ec0f0a22e5878a")
;;(commit version)
;; We need the submodule in 'cmake_modules/morse'.
(recursive? #t)))
(patches (search-patches "inria/patches/maphys-cmake-paddle.patch"))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0jcgnkjhqwbbsc4x8pc2g6a4chcy2h4j66y9m108a8q93ar30ngb"))))
"1bcg9qsn4z9861lgf5g6y6d46q427swr4d6jdx7lmmqmlpfzgxy7"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DMAPHYS_BUILD_TESTS=ON"
"-DMAPHYS_SDS_MUMPS=ON"
"-DMAPHYS_SDS_PASTIX=ON"
"-DCMAKE_EXE_LINKER_FLAGS=-lstdc++" ;;?
"-DCMAKE_EXE_LINKER_FLAGS=-lstdc++"
"-DMAPHYS_ITE_FABULOUS=ON"
"-DMAPHYS_ORDERING_PADDLE=ON"
)
#:phases (modify-phases %standard-phases
;; For some reason pkg-config bugs without this variable (for fabulous)
;; Without this variable, pkg-config removes paths in already in CFLAGS
;; However, gfortran does not check CPATH to find fortran modules
;; and and the module fabulous_mod cannot be found
(add-before 'configure 'fix-pkg-config-env
(lambda _ (setenv "PKG_CONFIG_ALLOW_SYSTEM_CFLAGS" "1") #t))
;; Allow tests with more MPI processes than available CPU cores,
;; which is not allowed by default by OpenMPI
(add-before 'check 'prepare-test-environment
(lambda _
;; Allow tests with more MPI processes than available CPU cores,
;; which is not allowed by default by OpenMPI
(setenv "OMPI_MCA_rmaps_base_oversubscribe" "1") #t)))))
(inputs `(("hwloc" ,hwloc "lib")
......@@ -330,13 +332,14 @@ moderate number of blocks which ensures a reasonable convergence behavior.")
(method git-fetch)
(uri (git-reference
(url home-page)
(commit "4a63ab6a357048c96e50954663c54fb1649469a2")
(commit "00b34553587ed22806ee46f56fc671769b65dbdf")
;; We need the submodule in 'cmake_modules/morse'.
(recursive? #t)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"1q84a2nnzqvw4gf67rjg9mmy1qfrjpgsz9ffrpnq9j6jyqh9f6ns"))))
"08596i9fxfr4var6js1m9dijfr8fymwppl3irkmrfc5yby44v6qf"
))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DFABULOUS_BUILD_C_API=ON"
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 194334c..99ca350 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -263,6 +263,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
if (PASTIX_INCLUDE_DIRS)
include_directories( ${PASTIX_INCLUDE_DIRS} )
+ message(STATUS "PASTIX include directories found: ${PASTIX_INCLUDE_DIRS}")
endif()
if (PASTIX_LIBRARY_DIRS)
list(REMOVE_DUPLICATES PASTIX_LIBRARY_DIRS)
@@ -403,6 +404,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
if ( MAPHYS_ITE_FABULOUS )
find_package(FABULOUS REQUIRED)
if ( FABULOUS_FOUND )
+ # Dirty way to find modules if include is found...
+ if( FABULOUS_INCLUDE_DIRS AND (NOT FABULOUS_MODULE_DIRS))
+ set( FABULOUS_MODULE_DIRS "${FABULOUS_INCLUDE_DIRS}/fabulous")
+ endif()
message(STATUS "Use FABuLOuS (IB-BGMRES-DR)")
message(STATUS "Include: ${FABULOUS_INCLUDE_DIRS}")
message(STATUS "Modules: ${FABULOUS_MODULE_DIRS}")
@@ -423,11 +428,11 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
# MaPHyS depends on Paddle
#----------------------------
if (MAPHYS_ORDERING_PADDLE)
- if (NOT PADDLE_LIBRARIES)
- message(FATAL_ERROR "Please specify PADDLE_LIBRARIES")
- endif()
- if (NOT PADDLE_INCLUDE_DIRS)
- message(FATAL_ERROR "Please specify PADDLE_INCLUDE_DIRS")
+ if ((NOT PADDLE_LIBRARIES) OR (NOT PADDLE_INCLUDE_DIRS))
+ if(PKG_CONFIG_FOUND AND PKG_CONFIG_EXECUTABLE)
+ message(STATUS "Looking for PADDLE - found using PkgConfig")
+ pkg_search_module(PADDLE paddle)
+ endif()
endif()
add_definitions(-DHAVE_LIBPADDLE)
if (PADDLE_INCLUDE_DIRS)
@@ -436,15 +441,12 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
endforeach()
endif()
if (PADDLE_LIBRARIES)
-
find_package(PTSCOTCH REQUIRED)
-
if(NOT PTSCOTCH_FOUND)
message(FATAL_ERROR "PTSCOTCH is required by PADDLE but was not found. "
"Please provide a PTSCOTCH library in your environment or "
"configure with -DMAPHYS_ORDERING_PADDLE=OFF. ")
endif()
-
list(REMOVE_DUPLICATES PADDLE_LIBRARIES)
list(APPEND MAPHYS_EXTRA_LIBRARIES ${PADDLE_LIBRARIES} ${PTSCOTCH_LIBRARIES})
clean_liblist(PADDLE_LIBRARIES MAPHYS_EXTRA_LINK_FLAGS)
diff --git a/hybrid/xmph_fabulous_mod.F90 b/hybrid/xmph_fabulous_mod.F90
index 111a8a7..8d3b615 100644
--- a/hybrid/xmph_fabulous_mod.F90
+++ b/hybrid/xmph_fabulous_mod.F90
@@ -12,7 +12,6 @@ Module XMPH_Fabulous_mod
Use XMPH_maphys_type
Use XMPH_dense_matrix_mod
Use XMPH_schur_aux_mod
- Use iso_c_binding
Use fabulous_mod
Implicit None
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