[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: gnu: petsc, slepc: Use 'parallel-job-count'.
From: |
Eric Bavier |
Subject: |
03/07: gnu: petsc, slepc: Use 'parallel-job-count'. |
Date: |
Wed, 9 Aug 2017 02:57:55 -0400 (EDT) |
bavier pushed a commit to branch master
in repository guix.
commit 9731c412e9ef2fad66181460e768b01cb3c600da
Author: Eric Bavier <address@hidden>
Date: Tue Aug 8 00:21:20 2017 -0500
gnu: petsc, slepc: Use 'parallel-job-count'.
* gnu/packages/maths.scm (petsc, slepc)[arguments]: Set #:make-flags to
override default unlimited '-j'.
(petsc)[arguments]: Scrub build machine cores from installed files in
'clean-local-references' phase.
---
gnu/packages/maths.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 54db44b..cc9a9a4 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1247,6 +1247,10 @@ September 2004}")
(assoc-ref %build-inputs "superlu") "/include")
,(string-append "--with-superlu-lib="
(assoc-ref %build-inputs "superlu")
"/lib/libsuperlu.a"))
+ #:make-flags
+ ;; Honor (parallel-job-count) for build. Do not use --with-make-np,
+ ;; whose value is dumped to $out/lib/petsc/conf/petscvariables.
+ (list (format #f "MAKE_NP=~a" (parallel-job-count)))
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -1261,13 +1265,17 @@ September 2004}")
(format #t "configure flags: ~s~%" flags)
(zero? (apply system* "./configure" flags)))))
(add-after 'configure 'clean-local-references
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "^petsc(conf|machineinfo).h$")
;; Prevent build directory from leaking into compiled code
(((getcwd)) out)
;; Scrub timestamp for reproducibility
((".*Libraries compiled on.*") ""))
+ (substitute* (find-files "." "petscvariables")
+ ;; Do not expose build machine characteristics, set to
defaults.
+ (("MAKE_NP = [:digit:]+") "MAKE_NP = 2")
+ (("NPMAX = [:digit:]+") "NPMAX = 2"))
#t)))
(add-after 'install 'clean-install
;; Try to keep installed files from leaking build directory names.
@@ -1364,6 +1372,8 @@ scientific applications modeled by partial differential
equations.")
#:configure-flags
`(,(string-append "--with-arpack-dir="
(assoc-ref %build-inputs "arpack") "/lib"))
+ #:make-flags ;honor (parallel-job-count)
+ `(,(format #f "MAKE_NP=~a" (parallel-job-count)))
#:phases
(modify-phases %standard-phases
(replace 'configure
- branch master updated (0260519 -> d84b09e), Eric Bavier, 2017/08/09
- 01/07: gnu: petsc: Update to 3.7.6., Eric Bavier, 2017/08/09
- 04/07: gnu: suitesparse: Use modify-phases., Eric Bavier, 2017/08/09
- 06/07: gnu: stress-make: Patch default shell., Eric Bavier, 2017/08/09
- 02/07: gnu: slepc: Update to 3.7.4., Eric Bavier, 2017/08/09
- 07/07: gnu: dealii: Update to 8.5.0., Eric Bavier, 2017/08/09
- 03/07: gnu: petsc, slepc: Use 'parallel-job-count'.,
Eric Bavier <=
- 05/07: gnu: suitesparse: Update to 4.5.5., Eric Bavier, 2017/08/09