Commit 936d344b authored by MARAIT Gilles's avatar MARAIT Gilles
Browse files

Fix MaPHyS package updating to last version 0.9.8.1

parent 13db0c4c
......@@ -84,31 +84,28 @@ area (CPUs-GPUs, distributed nodes).")
("starpu" ,starpu+fxt)
,@(delete `("starpu" ,starpu) (package-inputs chameleon))))))
(define-public maphys
(package
(name "maphys")
(version "0.9.8.0")
(version "0.9.8.1")
(home-page "https://gitlab.inria.fr/solverstack/maphys/maphys")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)
;; We need the submodule in 'cmake_modules/morse'.
(recursive? #t)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"100459lshxd9s8p7z6vygp6hz5cyw3rai0hh827p698dwqhp73vp"))
(patches (search-patches "inria/patches/maphys-installation-directories.patch"))))
"13mllxhq1yhpd78x9lb8769mdpjy2dfaijpv76vy88cfrdjbal84"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DMAPHYS_SDS_MUMPS=ON"
"-DMAPHYS_SDS_PASTIX=OFF")
;; FIXME: Tests segfault.
#:tests? #f))
'(#:configure-flags '("-DMAPHYS_BUILD_TESTS=ON"
"-DMAPHYS_SDS_MUMPS=ON"
"-DMAPHYS_SDS_PASTIX=ON")
))
(inputs `(("hwloc" ,hwloc "lib")
("openmpi" ,openmpi)
("ssh" ,openssh)
......@@ -116,7 +113,8 @@ area (CPUs-GPUs, distributed nodes).")
("openblas" ,openblas)
("lapack" ,lapack)
("scotch" ,pt-scotch)
("mumps" ,mumps)
("mumps" ,mumps-openmpi)
("pastix" ,pastix)
("metis" ,metis)))
(native-inputs `(("gforgran" ,gfortran)
("pkg-config" ,pkg-config)))
......
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -46,7 +46,7 @@ foreach(_file ${MAPHYS_EXAMPLES})
get_filename_component(_name_exe ${_file} NAME_WE)
add_executable(${_name_exe} ${_file})
target_link_libraries(${_name_exe} maphys mph_toolkit packcg packgmres slatec ${MAPHYS_EXTRA_LIBRARIES})
- install(TARGETS ${_name_exe} DESTINATION ${CMAKE_INSTALL_PREFIX}/examples)
+ install(TARGETS ${_name_exe} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maphys/examples)
endforeach()
# install input files for examples
@@ -76,7 +76,7 @@ if(MAPHYS_ORDERING_PADDLE)
)
endif()
-install(FILES ${MAPHYS_EXAMPLES_INPUT_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/examples)
+install(FILES ${MAPHYS_EXAMPLES_INPUT_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maphys/examples)
# Add tests to CTest
#TODO: make those test more robust (check the solution)
diff --git a/gendistsys/CMakeLists.txt b/gendistsys/CMakeLists.txt
index 125be7e..0659e95 100644
--- a/gendistsys/CMakeLists.txt
+++ b/gendistsys/CMakeLists.txt
@@ -11,7 +11,7 @@ foreach(_file ${MAPHYS_TESTGENDIST})
get_filename_component(_name_exe ${_file} NAME_WE)
add_executable(${_name_exe} ${_file})
target_link_libraries(${_name_exe} maphys mph_toolkit ${MAPHYS_EXTRA_LIBRARIES})
- install(TARGETS ${_name_exe} DESTINATION ${CMAKE_INSTALL_PREFIX}/gendistsys)
+ install(TARGETS ${_name_exe} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maphys/gendistsys)
endforeach()
# install input files for gendistsys
@@ -21,4 +21,4 @@ set(MAPHYS_TESTGENDIST_INPUT_FILES
gds.in
)
-install(FILES ${MAPHYS_TESTGENDIST_INPUT_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/gendistsys)
+install(FILES ${MAPHYS_TESTGENDIST_INPUT_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maphys/gendistsys)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8947caf..ee5d316 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -240,7 +240,7 @@ install(TARGETS maphys
# Copy the fortran module files
install ( CODE
- "EXECUTE_PROCESS (COMMAND \"${CMAKE_COMMAND}\" -E copy_directory \"${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}\" \"${CMAKE_INSTALL_PREFIX}/modules\")"
+ "EXECUTE_PROCESS (COMMAND \"${CMAKE_COMMAND}\" -E copy_directory \"${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}\" \"${CMAKE_INSTALL_PREFIX}/include\")"
)
###
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