From e9e5e69ce5eba69b784488797b02c089bb276c31 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 20 Nov 2022 20:05:02 +0300 Subject: gnu: opencascade-occt: Update to 7.6.2. * gnu/packages/maths.scm (opencascade-occt): Update to 7.6.2. Signed-off-by: Guillaume Le Vaillant --- 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 975d764a2a..972221798e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2937,7 +2937,7 @@ Open CASCADE library.") (define-public opencascade-occt (package (name "opencascade-occt") - (version "7.6.0") + (version "7.6.2") (source (origin (method git-fetch) @@ -2949,7 +2949,7 @@ Open CASCADE library.") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1rcwm9fkx0j4wrsyikb6g7qd611kpry7dand5dzdjvs5vzd13zvd")) + (base32 "07z5d83vm9f50an7vhimzl7gbmri1dn6p2g999l5fgyaj5sg5f02")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 3d62d7648a87885404f2513e05d7d7e350cf7a23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 05:59:00 +0100 Subject: gnu: arpack-ng: Remove 3.3.0. This package fails to build and has no users in Guix. * gnu/packages/maths.scm (arpack-ng-3.3.0): Remove variable. --- gnu/packages/maths.scm | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 972221798e..15c020e6c4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -894,20 +894,6 @@ large scale eigenvalue problems.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) -(define-public arpack-ng-3.3.0 - (package - (inherit arpack-ng) - (version "3.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference (url (package-home-page arpack-ng)) - (commit version))) - (file-name (git-file-name (package-name arpack-ng) version)) - (sha256 - (base32 - "00h6bjvxjq7bv0b8pwnc0gw33ns6brlqv00xx2rh3w9b5n205918")))))) - (define-public arpack-ng-openmpi (package (inherit arpack-ng) (name "arpack-ng-openmpi") -- cgit 1.4.1 From 41ca8f9c207a04f266b061ec91cb9031967ed109 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 06:47:30 +0100 Subject: gnu: dune-alugrid: Fix build failure. * gnu/packages/maths.scm (dune-alugrid)[arguments]: Provide the INPUTS key in build-tests phase. --- 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 15c020e6c4..98bae9ecb5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6811,7 +6811,7 @@ assemble global function spaces on finite-element grids.") "doc/dune-grid/grids/gridfactory/testgrids")) #t)) (add-after 'build 'build-tests - (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (lambda* (#:key inputs make-flags parallel-build? #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "dune-grid") "/share")) (apply invoke "make" "build_tests" -- cgit 1.4.1 From 7534d8067fc1cb1b4f8fad7c6f9b63390fbbb33c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 9 Sep 2022 14:31:45 +0000 Subject: gnu: suitesparse: Update to 5.13.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (suitesparse): Update to 5.13.0. Signed-off-by: Ludovic Courtès --- 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 98bae9ecb5..d4c1e4922e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4860,7 +4860,7 @@ Fresnel integrals, and similar related functions as well.") (define-public suitesparse (package (name "suitesparse") - (version "5.12.0") + (version "5.13.0") (source (origin (method git-fetch) @@ -4870,7 +4870,7 @@ Fresnel integrals, and similar related functions as well.") (file-name (git-file-name name version)) (sha256 (base32 - "0zpl51pfpv7ap7z97jlryba2la1qdmzm11bhzkn55wlb03xzi6k6")) + "1zwri246yr39p9ymjp18dzv36ch0dn107sf0jghj7capigasfxq2")) (patches (search-patches "suitesparse-mongoose-cmake.patch")) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From ca428f944fa61c63de252af6cc88dd815c074a0f Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 9 Sep 2022 14:31:46 +0000 Subject: gnu: octave: Update to 7.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (octave): Update to 7.2.0. Signed-off-by: Ludovic Courtès --- 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 d4c1e4922e..cfe2dcbcf2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2747,7 +2747,7 @@ can solve two kinds of problems: (define-public octave-cli (package (name "octave-cli") - (version "7.1.0") + (version "7.2.0") (source (origin (method url-fetch) @@ -2755,7 +2755,7 @@ can solve two kinds of problems: version ".tar.xz")) (sha256 (base32 - "0wv26nsfi6cq80np6p4av4wfrvbaflca6szajf6c60mbpdg63m1z")))) + "0w81ncl9d4x1ay3ylsag87k20c0byiyjcmfd9kb7b7ylr71pivsa")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit 1.4.1 From 148c75e75e90d574a2c31c00ad24d1117512bd13 Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 22 Nov 2022 20:49:06 -0600 Subject: gnu: clasp: Update to 3.3.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (clasp): Update to 3.3.9. Signed-off-by: 宋文武 --- 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 cfe2dcbcf2..ebb3a8fbd1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2542,7 +2542,7 @@ between aspif and smodels format or to a human-readable text format.") (define-public clasp (package (name "clasp") - (version "3.3.6") + (version "3.3.9") (source (origin (method git-fetch) (uri (git-reference @@ -2551,7 +2551,7 @@ between aspif and smodels format or to a human-readable text format.") (file-name (git-file-name name version)) (sha256 (base32 - "0rahqiq530jckvx717858h1q5p8znp1kb6sjm95p8blkr4n3pvmj")))) + "163ps9zq7xppqy9hj5qnw6z5lcjnm4xf5fwjsavpia5ynm3hngcw")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCLASP_BUILD_TESTS=on" -- cgit 1.4.1 From fc061ce2979be0ff20423a6cd6dfb085581d7531 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 15 Oct 2022 16:45:33 +0200 Subject: gnu: Add aiger. * gnu/packages/maths.scm (aiger): New variable. --- gnu/packages/maths.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ebb3a8fbd1..d819df2343 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -55,6 +55,7 @@ ;;; Copyright © 2022 Philip McGrath ;;; Copyright © 2022 Marek Felšöci ;;; Copyright © 2022 vicvbcun +;;; Copyright © 2022 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -7362,6 +7363,59 @@ back to C with improved data structures, better scheduling of inprocessing and optimized algorithms and implementation.") (license license:expat))) +(define-public aiger + (package + (name "aiger") + (version "1.9.9") + (source (origin + (method url-fetch) + (uri (string-append "http://fmv.jku.at/aiger/aiger-" + version ".tar.gz")) + (sha256 + (base32 + "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y")))) + (outputs (list "out" "static")) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; no check target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "aiger.c" + (("\"(gzip|gunzip)" all cmd) + (string-append + "\"" + (search-input-file inputs (string-append "bin/" cmd))))))) + (add-after 'unpack 'patch-build-files + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "makefile.in" + (("test -d .*") "true") + (("/usr/local") (assoc-ref outputs "out"))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "./configure.sh" configure-flags))) + (add-after 'install 'install-static + (lambda* (#:key outputs #:allow-other-keys) + (apply invoke #$(ar-for-target) "rcs" "libaiger.a" + (find-files "." "\\.o$")) + (let* ((static (assoc-ref outputs "static")) + (lib (string-append static "/lib")) + (incl (string-append static "/include/aiger"))) + (mkdir-p lib) + (mkdir-p incl) + (install-file "libaiger.a" lib) + (for-each (lambda (f) (install-file f incl)) + (find-files "." "\\.h$")))))))) + (inputs (list gzip)) + (home-page "http://fmv.jku.at/aiger") + (synopsis "Utilities for And-Inverter Graphs") + (description "AIGER is a format, library and set of utilities for +@acronym{AIG, And-Inverter Graphs}s. The focus is on conversion utilities and a +generic reader and writer API.") + (license (list license:expat + license:bsd-3)))) ; blif2aig + (define-public libqalculate (package (name "libqalculate") -- cgit 1.4.1 From 58c24ec748f9f01d6c56a737a81a22e60ff88d55 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 15 Oct 2022 16:45:44 +0200 Subject: gnu: Add lingeling. * gnu/packages/maths.scm (lingeling): New variable. --- gnu/packages/maths.scm | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d819df2343..fedee36c55 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7416,6 +7416,88 @@ generic reader and writer API.") (license (list license:expat license:bsd-3)))) ; blif2aig +(define-public lingeling + (let ((commit "72d2b13eea5fbd95557a3d0d199cd98dfbdc76ee") + (revision "1")) + (package + (name "lingeling") + (version (git-version "sc2022" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arminbiere/lingeling") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16s30x8s2cw6icchwm65zj56ph4qwz6i07g3hwkknvajisvjq85c")))) + (build-system gnu-build-system) + (arguments + (list #:test-target "test" + #:modules `((ice-9 match) + ,@%gnu-build-system-modules) + #:configure-flags #~(list "--aiger=.") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-aiger + (lambda* (#:key inputs #:allow-other-keys) + (invoke #$(ar-for-target) "x" + (search-input-file inputs "lib/libaiger.a") + "aiger.o") + (copy-file + (search-input-file inputs "include/aiger/aiger.h") + "aiger.h"))) + (add-after 'unpack 'hard-code-commit + (lambda _ + (substitute* "mkconfig.sh" + (("`\\./getgitid`") #$commit)))) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (list "treengeling.c" "lgldimacs.c") + (("\"(gunzip|xz|bzcat|7z)" all cmd) + (string-append + "\"" + (search-input-file inputs (string-append "bin/" cmd))))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "./configure.sh" configure-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") + "/bin"))) + (mkdir-p bin) + (for-each + (lambda (file) + (install-file file bin)) + '("blimc" "ilingeling" "lglddtrace" "lglmbt" + "lgluntrace" "lingeling" "plingeling" + "treengeling"))))) + (add-after 'install 'wrap-path + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (string-append + (assoc-ref outputs "out") + "/bin") + (for-each + (lambda (file) + (wrap-program + file + '("PATH" suffix + #$(map (lambda (input) + (file-append (this-package-input input) "/bin")) + '("gzip" "bzip2" "xz" "p7zip"))))) + ;; These programs use sprintf on buffers with magic + ;; values to construct commands (yes, eww), so we + ;; can't easily substitute* them. + '("lglddtrace" "lgluntrace" "lingeling" "plingeling")))))))) + (inputs (list `(,aiger "static") gzip bzip2 xz p7zip)) + (home-page "http://fmv.jku.at/lingeling") + (synopsis "SAT solver") + (description "This package provides a range of SAT solvers, including +the sequential @command{lingeling} and its parallel variants +@command{plingeling} and @command{treengeling}. A bounded model checker is +also included.") + (license license:expat)))) + (define-public libqalculate (package (name "libqalculate") -- cgit 1.4.1 From d3ce4a2619784e58876ae81cef0cf099e9206be4 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 15 Oct 2022 16:46:40 +0200 Subject: gnu: Add louvain-community. * gnu/packages/maths.scm (louvain-community): New variable. --- gnu/packages/maths.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fedee36c55..5fc93fa4d8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7498,6 +7498,37 @@ the sequential @command{lingeling} and its parallel variants also included.") (license license:expat)))) +(define-public louvain-community + (let ((commit "8cc5382d4844af127b1c1257373740d7e6b76f1e") + (revision "1")) + (package + (name "louvain-community") + (version (git-version "1.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/meelgroup/louvain-community") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ss00hkdvr9bdkd355hxf8zd7xycb3nm8qpy7s75gjjf6yng0bfj")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ; tests appear to require missing files + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'encode-git-hash + (lambda _ + (substitute* "CMakeLists.txt" + (("GIT-hash-notfound") #$commit))))))) + (native-inputs (list python)) + (home-page "https://github.com/meelgroup/louvain-communities") + (synopsis "Multi-criteria community detection") + (description "This package provides a C++ implementation of the Louvain +community detection algorithm.") + (license license:lgpl3+)))) + (define-public libqalculate (package (name "libqalculate") -- cgit 1.4.1 From 2404afea8b51b5ddf3f29d1f050d6a5a93aeb0b1 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 15 Oct 2022 16:47:03 +0200 Subject: gnu: Add cryptominisat. * gnu/packages/maths.scm (cryptominisat): New variable. Co-authored-by: Maximilian Heisinger --- gnu/packages/maths.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5fc93fa4d8..531e3f0324 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2022 Marek Felšöci ;;; Copyright © 2022 vicvbcun ;;; Copyright © 2022 Liliana Marie Prikler +;;; Copyright © 2022 Maximilian Heisinger ;;; ;;; This file is part of GNU Guix. ;;; @@ -159,6 +160,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) @@ -7529,6 +7531,55 @@ also included.") community detection algorithm.") (license license:lgpl3+)))) +(define-public cryptominisat + (package + (name "cryptominisat") + (version "5.11.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/msoos/cryptominisat") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1izjn44phjp9670s7bxrdx4p0r59idqwv3bm6sr0qnlqlha5z4zc")))) + (build-system cmake-build-system) + (arguments + (list + #:build-type "Release" + #:test-target "test" + #:configure-flags #~(list "-DENABLE_TESTING=ON" "-DSTATS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(utils/lingeling-ala\\)") "")) + ;; Transitively included in vendored gtest.h. Fixed in + ;; upstream: + ;; https://github.com/msoos/cryptominisat/pull/686 + (substitute* "tests/assump_test.cpp" + (("#include ") + "#include \n#include ")) + (substitute* "tests/CMakeLists.txt" + (("add_subdirectory\\(\\$\\{GTEST_PREFIX\\} gtest\\)") + "find_package(GTest REQUIRED)") + (("add_subdirectory\\(\\$\\{PROJECT_SOURCE_DIR\\}/utils/.*\\)") + ""))))))) + (inputs (list boost louvain-community python python-numpy sqlite zlib)) + (native-inputs (list googletest lingeling python python-wrapper python-lit)) + (synopsis "Incremental SAT solver") + (description + "CryptoMiniSat is an incremental SAT solver with both command line and +library (C++, C, Python) interfaces. The command-line interface takes a +@acronym{CNF, Conjunctive Normal Form} as an input in the DIMACS format with +the extension of XOR clauses. The library interfaces mimic this and also +allow incremental solving, including assumptions.") + (home-page "https://github.com/msoos/cryptominisat") + (license license:expat))) + (define-public libqalculate (package (name "libqalculate") -- cgit 1.4.1 From 3423d32838ab159904ae02eda95df069d338592e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 27 Nov 2022 08:36:53 +0100 Subject: gnu: Add libfixmath. * gnu/packages/maths.scm (libfixmath): New variable. --- gnu/packages/maths.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 531e3f0324..c0bc07977b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2415,6 +2415,43 @@ and quadratic objectives using the Simplex algorithm.") systems and applications. It provides a modular and extensible solver.") (license license:expat))) +(define-public libfixmath + (let ((commit "1416c9979635c69f344d3c1de84b3246001a6540") + (revision "1")) + (package + (name "libfixmath") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PetteriAimonen/libfixmath") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vnpycw30rq3xwqyvj20l7pnw74dc4f27304i0918igsrdsjw501")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (let ((includes (string-append #$output "/include/libfixmath")) + (lib (string-append #$output "/lib"))) + (mkdir-p includes) + (for-each (lambda (file) + (install-file file includes)) + (find-files "../source" "\\.h(pp)?$")) + (for-each (lambda (file) + (install-file file lib)) + (find-files "." "\\.a$")))))))) + (home-page "https://code.google.com/archive/p/libfixmath/") + (synopsis "Cross platform fixed point maths library") + (description "This library implements the @file{math.h} functions in +fixed point (16.16) format.") + (license license:expat)))) + (define-public libflame (package (name "libflame") -- cgit 1.4.1