Commit 36076fce authored by MARAIT Gilles's avatar MARAIT Gilles
Browse files

Fix lapackpp; maphys++

parent 887b6be8
...@@ -396,11 +396,16 @@ solve massive sparse systems efficiently.") ...@@ -396,11 +396,16 @@ solve massive sparse systems efficiently.")
(add-before 'configure 'fixgcc7 (add-before 'configure 'fixgcc7
(lambda _ (lambda _
(unsetenv "C_INCLUDE_PATH") (unsetenv "C_INCLUDE_PATH")
(unsetenv "CPLUS_INCLUDE_PATH")))) (unsetenv "CPLUS_INCLUDE_PATH") #t))
(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)))
)) ))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs `(("lapack" ,openblas) (inputs `(("blaspp" ,blaspp)
("blaspp" ,blaspp) ("lapackpp" ,lapackpp)
("pastix" ,pastix))) ("pastix" ,pastix)))
(propagated-inputs `(("mpi" ,openmpi) (propagated-inputs `(("mpi" ,openmpi)
("ssh" ,openssh))) ("ssh" ,openssh)))
...@@ -436,7 +441,7 @@ such as: namespaces, templates, exceptions, etc.") ...@@ -436,7 +441,7 @@ such as: namespaces, templates, exceptions, etc.")
#:tests? #f)) #:tests? #f))
;;'(#:configure-flags '("-DBLASPP_BUILD_TESTS=ON") ;;'(#:configure-flags '("-DBLASPP_BUILD_TESTS=ON")
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs `(("openblas" ,openblas))) ;; technically only blas (propagated-inputs `(("openblas" ,openblas))) ;; technically only blas
(native-inputs `(("gfortran" ,gfortran))) (native-inputs `(("gfortran" ,gfortran)))
(license #f))) (license #f)))
...@@ -466,8 +471,7 @@ etc.") ...@@ -466,8 +471,7 @@ etc.")
'(#:configure-flags '("-DBUILD_LAPACKPP_TESTS=OFF") '(#:configure-flags '("-DBUILD_LAPACKPP_TESTS=OFF")
#:tests? #f)) #:tests? #f))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs `(("openblas" ,openblas) ;; technically only lapack (inputs `(("blaspp" ,blaspp)))
("blaspp" ,blaspp)))
(native-inputs `(("gfortran" ,gfortran))) (native-inputs `(("gfortran" ,gfortran)))
(license #f))) (license #f)))
......
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