diff options
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b0944f307b..ef90bf7010 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2019 Steve Sprang <[email protected]> ;;; Copyright © 2019 Robert Smith <[email protected]> ;;; Copyright © 2020 Jakub Kądziołka <[email protected]> -;;; Copyright © 2020, 2021 Felix Gruber <[email protected]> +;;; Copyright © 2020–2022 Felix Gruber <[email protected]> ;;; Copyright © 2020 R Veera Kumar <[email protected]> ;;; Copyright © 2020 Vincent Legoll <[email protected]> ;;; Copyright © 2020 Nicolò Balzarotti <[email protected]> @@ -319,7 +319,7 @@ triangulations.") (define-public python-cvxopt (package (name "python-cvxopt") - (version "1.2.3") + (version "1.2.7") (source (origin (method git-fetch) (uri (git-reference @@ -328,7 +328,7 @@ triangulations.") (file-name (git-file-name name version)) (sha256 (base32 - "1kiy2m62xgs2d5id6dnnwy4vap85cd70p7pgkb9nh23qf9xnak7b")))) + "114z34wwx1bsv4q6xj9p5q99dffgnj9s4i4arx10g191xq9q8i5y")))) (build-system python-build-system) (arguments `(#:phases @@ -357,9 +357,6 @@ extensive standard library and on the strengths of Python as a high-level programming language.") (license license:gpl3+))) -(define-public python2-cvxopt - (package-with-python2 python-cvxopt)) - (define-public units (package (name "units") @@ -2437,7 +2434,7 @@ satisfiability checking (SAT).") (define-public ceres (package (name "ceres-solver") - (version "1.14.0") + (version "2.0.0") (home-page "http://ceres-solver.org/") (source (origin (method url-fetch) @@ -2445,7 +2442,7 @@ satisfiability checking (SAT).") version ".tar.gz")) (sha256 (base32 - "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27")))) + "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h")))) (build-system cmake-build-system) (arguments ;; TODO: Build HTML user documentation and install separately. @@ -2464,11 +2461,11 @@ satisfiability checking (SAT).") (propagated-inputs (list glog)) ;for #include <glog/glog.h> (inputs - `(("eigen" ,eigen) - ("blas" ,openblas) - ("lapack" ,lapack) - ("suitesparse" ,suitesparse) - ("gflags" ,gflags))) + (list eigen + openblas + lapack + suitesparse + gflags)) (synopsis "C++ library for solving large optimization problems") (description "Ceres Solver is a C++ library for modeling and solving large, @@ -2506,21 +2503,24 @@ can solve two kinds of problems: "pkg-config" "eigen3" "--cflags")))) - (define (compile-file file) - (let ((source (string-append file ".cc"))) - (format #t "building '~a'...~%" file) - (apply invoke "c++" "-fopenmp" "-O2" "-g" "-DNDEBUG" - source "-lceres" "-lbenchmark" "-lglog" - "-pthread" - "-o" (string-append bin "/" file) - "-I" ".." flags))) + (define (compile-file top-dir) + (lambda (file) + (let ((source (string-append file ".cc"))) + (format #t "building '~a'...~%" file) + (apply invoke "c++" "-fopenmp" "-O2" "-g" "-DNDEBUG" + source "-lceres" "-lbenchmark" "-lglog" + "-pthread" + "-o" (string-append bin "/" file) + "-I" top-dir flags)))) (mkdir-p bin) (with-directory-excursion "internal/ceres" - (for-each compile-file - '("small_blas_gemm_benchmark" - "small_blas_gemv_benchmark" - "autodiff_cost_function_benchmark")))))) + (for-each (compile-file "..") + '("schur_eliminator_benchmark" + "small_blas_gemm_benchmark" + "small_blas_gemv_benchmark")) + (with-directory-excursion "autodiff_benchmarks" + ((compile-file "../..") "autodiff_benchmarks")))))) (delete 'check) (delete 'install)))) (inputs (modify-inputs (package-inputs ceres) @@ -5268,14 +5268,16 @@ A unique design feature of Trilinos is its focus on packages.") (define-public dealii (package (name "dealii") - (version "9.3.1") + (version "9.3.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/dealii/dealii/releases/" "download/v" version "/dealii-" version ".tar.gz")) (sha256 - (base32 "1f0sqvlxvl0myqcn0q6xrn1vnp5pgx143lai4a4jkh1dmdv4cbx6")) + (base32 "1s0kawnljg24jj6nibwrif5gxdgg2daqfylhqqpl1lvmzmmxfhak")) + (patches (search-patches "dealii-fix-compiliation-with-boost-1.78.patch" + "dealii-fix-sundials.patch")) (modules '((guix build utils))) (snippet '(begin @@ -5286,16 +5288,14 @@ A unique design feature of Trilinos is its focus on packages.") (outputs '("out" "doc")) (native-inputs ;; Required to build the documentation. - `(("dot" ,graphviz) - ("doxygen" ,doxygen) - ("perl" ,perl))) + (list graphviz doxygen perl)) (inputs - `(("arpack" ,arpack-ng) - ("blas" ,openblas) - ("gfortran" ,gfortran) - ("lapack" ,lapack) - ("muparser" ,muparser) - ("zlib" ,zlib))) + (list arpack-ng + openblas + gfortran + lapack + muparser + zlib)) (propagated-inputs ;; Some scripts are installed into share/deal.II/scripts that require ;; perl and python, but they are not executable (and some are missing the |