From 8b35c8cd612032ebabfd04a8247d588c69acf463 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Sep 2019 12:07:20 +0200 Subject: gnu: hypre: Update texlive-union. * gnu/packages/maths.scm (hypre)[native-inputs]: Replace texlive-generic-xypic and texlive-fonts-xypic with texlive-xypic; add texlive-cm to the texlive-union. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c81e999daa..aa94d057cf 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3828,8 +3828,8 @@ set.") `(("doc++" ,doc++) ("netpbm" ,netpbm) ("perl" ,perl) ; needed to run 'ppmquant' during tests - ("texlive" ,(texlive-union (list texlive-generic-xypic - texlive-fonts-xypic + ("texlive" ,(texlive-union (list texlive-xypic + texlive-cm texlive-latex-hyperref texlive-bibtex))) ("ghostscript" ,ghostscript))) -- cgit v1.2.3 From abed5df7774a637a0104ca05254e8f97226d38d5 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 12 Sep 2019 16:12:31 +0100 Subject: gnu: gmsh: Fetch source from Git. * gnu/packages/maths.scm (gmsh)[source]: Switch to GIT-FETCH. --- gnu/packages/maths.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index aa94d057cf..487f53ead1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1717,11 +1717,16 @@ This is the certified version of the Open Cascade Technology (OCCT) library.") (version "2.16.0") (source (origin - (method url-fetch) - (uri (string-append "http://gmsh.info/src/gmsh-" - version "-source.tgz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.onelab.info/gmsh/gmsh.git") + (commit + (string-append "gmsh_" + (string-map (lambda (x) (if (eq? x #\.) #\_ x)) + version))))) + (file-name (git-file-name name version)) (sha256 - (base32 "1slf0bfkwrcgn6296wb4qhbk4ahz6i4wfb10hnim08x05vrylag8")) + (base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162")) (modules '((guix build utils))) (snippet ;; Remove non-free METIS code -- cgit v1.2.3 From ba05be22495478c6ea3307d0dde6dd635a84e7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 13 Sep 2019 10:10:37 +0200 Subject: gnu: openblas: Set 'NUM_THREADS'. Until now, OpenBLAS would use at most the N threads, where N is the number of cores that happened to be available on the build machine (typically N=8). * gnu/packages/maths.scm (openblas/fixed-num-threads): New variable. (openblas)[replacement]: New field. (openblas-ilp64): Use 'package/inherit'. --- gnu/packages/maths.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 487f53ead1..761cb70abd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3096,6 +3096,10 @@ parts of it.") (define-public openblas (package + ;; TODO: Incorporate 'openblas/fixed-num-threads' changes on the next + ;; rebuild cycle. + (replacement openblas/fixed-num-threads) + (name "openblas") (version "0.3.5") (source @@ -3166,7 +3170,7 @@ parts of it.") (license license:bsd-3))) (define-public openblas-ilp64 - (package (inherit openblas) + (package/inherit openblas (name "openblas-ilp64") (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux")) (arguments @@ -3177,6 +3181,24 @@ parts of it.") (synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)") (license license:bsd-3))) +(define openblas/fixed-num-threads + ;; TODO: Move that to 'openblas' proper on the next rebuild cycle. + (package + (inherit openblas) + (version (match (string-split (package-version openblas) #\.) + ((numbers ... (= string-length len)) + (string-join (append numbers + (list (make-string len #\a))) + ".")))) + (arguments + (substitute-keyword-arguments (package-arguments openblas) + ((#:make-flags flags ''()) + ;; This is the maximum number of threads OpenBLAS will ever use (that + ;; is, if $OPENBLAS_NUM_THREADS is greater than that, then NUM_THREADS + ;; is used.) If we don't set it, the makefile sets it to the number + ;; of cores of the build machine, which is obviously wrong. + `(cons "NUM_THREADS=128" ,flags)))))) + (define* (make-blis implementation #:optional substitutable?) "Return a BLIS package with the given IMPLEMENTATION (see config/ in the source tree for a list of implementations.) -- cgit v1.2.3 From 0746c33effdbd2419a584b3731d752698cbbd2f5 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 13 Sep 2019 14:45:44 +0100 Subject: gnu: gmsh: Update home page. This addresses a 'guix lint' warning. * gnu/packages/maths.scm (gmsh)[home-page]: Update to avoid URL redirection. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 761cb70abd..5380b4a99e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1752,7 +1752,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.") `(#:configure-flags `("-DENABLE_METIS:BOOL=OFF" "-DENABLE_BUILD_SHARED:BOOL=ON" "-DENABLE_BUILD_DYNAMIC:BOOL=ON"))) - (home-page "http://www.geuz.org/gmsh/") + (home-page "http://gmsh.info/") (synopsis "3D finite element grid generator") (description "Gmsh is a 3D finite element grid generator with a built-in CAD engine and post-processor. Its design goal is to provide a fast, light -- cgit v1.2.3