From patchwork Wed Sep 20 22:07:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54083 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C8B727BBE9; Wed, 20 Sep 2023 23:09:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6E63B27BBE2 for ; Wed, 20 Sep 2023 23:09:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NP-00073O-AP; Wed, 20 Sep 2023 18:08:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NN-00072t-PE for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NN-00059Z-H2 for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5NW-0005SE-SF for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 01/20] gnu: suitesparse: Tweak description. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524772720801 (code B ref 66129); Wed, 20 Sep 2023 22:09:02 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:08:47 +0000 Received: from localhost ([127.0.0.1]:60479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NH-0005PQ-4x for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:47 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5ND-0005P8-En for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:45 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 72CF9240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247707; bh=/yGXd07D3rbX+AOX2mZo2QmDOJSLbizreDv2zfXRO14=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=GdiAvJ7I94wjl68Ocf4NjFGlnYH5GN0sWxD+CVA8J/GVsiHeKdAd39f6DkTm1/HNo EfSM4uRn4/uElG93CsgEqooIljE4/FzGv6FoeWNm5xxaVpQHCzaHh+WMXsBNpSazwq ssxVZ+pyS9TuEbOQbMrDDLp6B/Py4cc4y+OnEV/7beDM3RXN4Nkvj5Au4WZysmdQhT MQBohLUUgdgTVYvdT1hyJCKjb+rYLyD1d7lf8aCo7Pz4sBBRAeQU30qiLa/ySmvHKX qmea56ASsJg3mQjZS9qzB6HGwfuVKomIhksls39bPWFK+JMnrJdHBREGzZwaCgJrso IQZZWAiJf/jWQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjQ6bZKz9rxF; Thu, 21 Sep 2023 00:08:26 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:51 +0000 Message-ID: <2e6dce4c1faecf1e5516f477a1b372da205573ba.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse)[description]: Mention that all subpackages are included. --- gnu/packages/maths.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6141c09886..a77928f9b6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4960,7 +4960,10 @@ (define-public suitesparse multifrontal QR; KLU and BTF, sparse LU factorization, well-suited for circuit simulation; ordering methods (AMD, CAMD, COLAMD, and CCOLAMD); CSparse and CXSparse, a concise sparse Cholesky factorization package; and many other -packages.") +packages. + +This package contains all of the above-mentioned parts. +") ;; LGPLv2.1+: ;; AMD, CAMD, BTF, COLAMD, CCOLAMD, CSparse, CXSparse, KLU, LDL ;; GPLv2+: From patchwork Wed Sep 20 22:07:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54084 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 67CC527BBE9; Wed, 20 Sep 2023 23:09:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DF6A727BBE2 for ; Wed, 20 Sep 2023 23:09:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NP-00073S-Hl; Wed, 20 Sep 2023 18:08:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NO-000734-OZ for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NO-00059o-H3 for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5NY-0005Si-1V for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 02/20] gnu: Add suitesparse-config. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524773420849 (code B ref 66129); Wed, 20 Sep 2023 22:09:03 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:08:54 +0000 Received: from localhost ([127.0.0.1]:60486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NN-0005Q7-Dl for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:54 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NK-0005PG-G4 for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 39A7B240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247715; bh=8T8P7H9xqc+PCIBmM2rxSuyDyJzf5o8C1M6wbKchOco=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=TIw3lIe22sb0gxzCLjDx/CYO42c5eRZZ1z3kWNIt18sALqJ45n6ALqszGgf4BxvEP 5PYncaTz+rr5vRgiGx1udtajWBde+IEHEieUdMW43HittE09v6VMHrMtvkUU3MFBvS Js//14IVhNcuHdyJLPbTOeMoWQoG9sDtzeUQJK5M/zW9v2maZ5iZ/DjsLUlDgSzDgr pRO2CErWK/Hn9icj7gPmc05S/09munY1TJzTuWeNzw732IqmQcCQkhLWzL0HJYQuLP vCxGdmje4RYXkIc/f6GzgKdTdPFTRuuEUjP7ZtZpD8VTf053sG16eUhL4yJmbat1UZ RvzNFLiJUSluA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjZ5ht5z9rxF; Thu, 21 Sep 2023 00:08:34 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:52 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The suitesparse-src variable contains the entire SuiteSparse source, from which the source for the subpackages is extracted with the suitesparse-package-src function using 'computed-origin-method'. * gnu/packages/maths.scm (suitesparse-version, suitesparse-src, suitesparse-config): New variable. --- gnu/packages/maths.scm | 88 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a77928f9b6..23c27c1746 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4888,6 +4888,94 @@ (define-public openspecfun ;; public domain software. (license (list license:expat license:public-domain)))) +;; Source for the modular SuiteSparse packages. When updating, also update the +;; (different) versions of the subpackages. +(define suitesparse-version "7.2.0") +(define suitesparse-src + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse") + (commit (string-append "v" suitesparse-version)))) + (file-name (git-file-name "suitesparse" suitesparse-version)) + (sha256 + (base32 + "1draljn8i46862drc6008cnb2zjpklf74j8c34jirjazzpf53kaa")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Delete autogenerated and bundled files + (for-each delete-file (find-files "." "\\.pdf$")) + ;; ssget + (delete-file-recursively "ssget") + ;; SuiteSparse_config + (delete-file "SuiteSparse_config/SuiteSparse_config.h") + ;; CHOLMOD + (delete-file-recursively "CHOLMOD/SuiteSparse_metis") + ; GraphBLAS + (delete-file "GraphBLAS/README.md") + (delete-file "GraphBLAS/Config/GB_config.h") + (delete-file "GraphBLAS/Config/GB_prejit.c") + (delete-file-recursively "GraphBLAS/cpu_features") + (delete-file "GraphBLAS/CUDA/GB_cuda_common_jitFactory.hpp") + (delete-file "GraphBLAS/JITpackage/GB_JITpackage.c") + (delete-file-recursively "GraphBLAS/lz4/lz4.c") + (delete-file-recursively "GraphBLAS/lz4/lz4.h") + (delete-file-recursively "GraphBLAS/lz4/lz4hc.c") + (delete-file-recursively "GraphBLAS/lz4/lz4hc.h") + (delete-file "GraphBLAS/GraphBLAS/Config/GB_config.h") + (delete-file "GraphBLAS/Tcov/PreJIT/GB_prejit.c") + (delete-file-recursively "GraphBLAS/Source/FactoryKernels") + (delete-file "GraphBLAS/Source/GB_AxB__include1.h") + (delete-file "GraphBLAS/xxHash/xxhash.h") + (delete-file-recursively "GraphBLAS/zstd/zstd_subset") + ;; KLU + (delete-file "KLU/Include/klu.h") + (delete-file "KLU/Doc/klu_version.tex") + ;; LDL + (delete-file "LDL/Include/ldl.h") + (delete-file "LDL/Doc/ldl_version.tex") + ;; RBio + (delete-file "RBio/Include/RBio.h") + ;; SPEX + (delete-file "SPEX/Include/SPEX.h") + (delete-file "SPEX/Doc/SPEX_version.tex") + ;; SPQR + (delete-file "SPQR/Include/SuiteSparseQR_definitions.h") + (delete-file "SPQR/Doc/spqr_version.tex") + ;; UMFPACK + (delete-file "UMFPACK/Include/umfpack.h") + (delete-file "UMFPACK/Doc/umfpack_version.tex"))))) + +(define (suitesparse-package-src name path) + (origin + (method (@@ (guix packages) computed-origin-method)) + (file-name + (string-append name "-" suitesparse-version)) + (sha256 #f) + (uri + (delay + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (copy-recursively + (string-append #$suitesparse-src "/" #$path) #$output))))))) + +(define-public suitesparse-config + (package + (name "suitesparse-config") + (version suitesparse-version) + (source (suitesparse-package-src name "SuiteSparse_config")) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) + (inputs (list openblas)) + (native-inputs (list pkg-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Configuration for all SuiteSparse packages") + (description "SuiteSparse is a suite of sparse matrix algorithms. This +package contains a library with common configuration options.") + (license license:bsd-3))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:07:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54085 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 50D4B27BBE9; Wed, 20 Sep 2023 23:09:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 22FBF27BBE2 for ; Wed, 20 Sep 2023 23:09:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NR-000748-0D; Wed, 20 Sep 2023 18:08:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NP-00073Q-GU for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NP-00059x-8Z for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5NY-0005T0-Qu for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 03/20] gnu: Add suitesparse-amd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524773820892 (code B ref 66129); Wed, 20 Sep 2023 22:09:04 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:08:58 +0000 Received: from localhost ([127.0.0.1]:60493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NS-0005Qs-2R for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NL-0005PN-QY for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3F5C3240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247716; bh=nRdXmEgds6g4jHWelS+aXO0YE48Quxrfnwyk4Yoo0m4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ma03w0z5XPZITtRYHk/WGjUfNJSUF6HfaWDdr2L98YCnOgcYDBtuRdWKDznC9ckD0 JER+4gtrnkODh00hEeOUei9YEl2sEyTtFi2CfpgbXHaSBbjChV8zrUH0mS0wqyG72y BLPYMrGc/63rtAEdw+a57euiuDf1Jln9eK2KLWhTuPBRTrWN58MdYOZIOMdkIhm80b Tp3PlGu+zfeOh+d0kmlPaVW80fIpBarQtcoWLNB63ffLjHcsMErdkQEbnVHFyB92bs eTY2S04dVP1Uf1LtM9j+aiYa64WEvFFj5qLXZ/uSqvpENCvwr/HpbmRh7zLFIqEdLm muEWPQfax+SJA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjb6Cp8z6ty8; Thu, 21 Sep 2023 00:08:35 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:53 +0000 Message-ID: <42245d665abf95b4a09098f550b614249ec2a887.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-amd): New variable. --- gnu/packages/maths.scm | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 23c27c1746..356e2e1d9d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4976,6 +4976,51 @@ (define-public suitesparse-config package contains a library with common configuration options.") (license license:bsd-3))) +(define-public suitesparse-amd + (package + (name "suitesparse-amd") + (version "3.2.0") + (source (suitesparse-package-src name "AMD")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../source/Doc" + (invoke "make")))) + ;; Required for suitesparse-umfpack + (add-after 'install 'install-internal-header + (lambda _ + (install-file "../source/Include/amd_internal.h" + (string-append #$output "/include")))) + (add-after 'install-internal-header 'install-doc + (lambda _ + (install-file "../source/Doc/AMD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-config)) + (native-inputs (list gfortran (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Sparse matrix ordering for Cholesky factorization") + (description "AMD is a set of routines for ordering a sparse matrix prior +to Cholesky factorization (or for LU factorization with diagonal pivoting).") + (license license:bsd-3))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:07:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54082 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 97EF727BBEA; Wed, 20 Sep 2023 23:09:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EFB127BBE2 for ; Wed, 20 Sep 2023 23:09:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NS-00074O-Kb; Wed, 20 Sep 2023 18:08:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NQ-00073n-3P for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NP-0005A5-RN for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5NZ-0005TC-EC for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 04/20] gnu: Add suitesparse-btf. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524773920901 (code B ref 66129); Wed, 20 Sep 2023 22:09:05 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:08:59 +0000 Received: from localhost ([127.0.0.1]:60495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NS-0005Qv-FY for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NM-0005PR-BJ for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 15783240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247717; bh=sWme91IrZJhR6FavMe/IPPyWWXCmGmcgFBI80B+rhHc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=H9oFRpFw2xYlpnDkkj0ZdTXAL+WAyMKy0yPNUrh4/oE3+zEQKEtpsxdDZgO8hWKnL UywQCOEgmM7ySz/mqQmoUVdL12wOlcfmgIv8g9ofIshB2eY5gKp1JB8EYfAr9mDh+9 rnWwEHrr3bE45p67DacbQmHwg6EvxitBeVomRMoz0yBwVWJ4L6w44E3a9YT4ew2esi 4gx9xOx3O9UEa3B66QwI/+uc03DMV/ykVftEwEvmxuKiJh5tXU5mtPlzylaw4R4GDb botAtCS0ec/eVUlUeaY3nC0tGr/LPVWe4fOs1Za1SQ4lXXea9mmGj7HSsZP+zmwaNh lETvR+l4Yr4LA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjc4mwLz9s07; Thu, 21 Sep 2023 00:08:36 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:54 +0000 Message-ID: <25679b00e8c5380bbeb32b821829bd0f32434ff0.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-btf): New variable. --- gnu/packages/maths.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 356e2e1d9d..f2c6f136a8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5021,6 +5021,36 @@ (define-public suitesparse-amd to Cholesky factorization (or for LU factorization with diagonal pivoting).") (license license:bsd-3))) +(define-public suitesparse-btf + (package + (name "suitesparse-btf") + (version "2.2.0") + (source (suitesparse-package-src name "BTF")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Library for permuting matrices into block upper triangular form") + (description "BTF (Block Triangular Form) is a C library for permuting a +matrix into block upper triangular form.") + (license license:lgpl2.1+))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:07:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54087 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D56CD27BBEA; Wed, 20 Sep 2023 23:09:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 45FD527BBE9 for ; Wed, 20 Sep 2023 23:09:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NT-000768-6F; Wed, 20 Sep 2023 18:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NQ-000749-WE for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NQ-0005AL-Nz for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5Na-0005TW-BL for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 05/20] gnu: Add suitesparse-camd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524774020929 (code B ref 66129); Wed, 20 Sep 2023 22:09:06 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:00 +0000 Received: from localhost ([127.0.0.1]:60500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NT-0005RD-D4 for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NN-0005PZ-45 for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:53 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D37ED240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247717; bh=i0KalSraWhf1UoJrsjbDsvkQMOti2n6qTGkINcsvlno=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=pOS6iksTH2Sr65gwZTovrLkZrsklbnc9RCL+LS9eREhcYXKotME/fjegl8TWcBKfr a6u81FbyHNWj8/T6ZUGZ2bNCxPhdcD9kYW+mm8ycaKuXCYFDlByXqBe2tg1++YSdE1 MY9jabor02bbJgpeDHVW/hie5ddmx2JsQPxchBr93qqsnCncEB7e8zuUDjoA3xwGSK RPcAL2S34/WA9FrcRYsPlRcHh97SID5/icg+A8XrsmDKOAbaHM+V+DoKPMMt5IsNOk G8sqNs9Kvo+9otu0Hs2FF64qYr9pVKQzcH9PYE6vf/MgPgKuGpifDRfZPcgl46VpaS L7LUaYXI/Ii/w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjd3Zsqz6ty8; Thu, 21 Sep 2023 00:08:37 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:55 +0000 Message-ID: <6e9b6a766a7953fafb9f01850c09783ea913331c.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-camd): New variable. --- gnu/packages/maths.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f2c6f136a8..875e7dc391 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5051,6 +5051,48 @@ (define-public suitesparse-btf matrix into block upper triangular form.") (license license:lgpl2.1+))) +(define-public suitesparse-camd + (package + (name "suitesparse-camd") + (version "3.2.0") + (source (suitesparse-package-src name "CAMD")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../source/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../source/Doc/CAMD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-config)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Sparse matrix ordering for Cholesky factorization with constraints") + (description "CAMD is a set of routines for ordering a sparse matrix prior +to Cholesky factorization (or for LU factorization with diagonal pivoting). +It is a variant of AMD which has the the option to apply constraints to the +ordering.") + (license license:bsd-3))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:07:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54088 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A314E27BBEC; Wed, 20 Sep 2023 23:09:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0356227BBE2 for ; Wed, 20 Sep 2023 23:09:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NT-00076G-Fx; Wed, 20 Sep 2023 18:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NR-00074H-CY for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NR-0005AR-4I for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5Na-0005Te-Nk for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 06/20] gnu: Add suitesparse-colamd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524774120936 (code B ref 66129); Wed, 20 Sep 2023 22:09:06 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:01 +0000 Received: from localhost ([127.0.0.1]:60503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NU-0005RW-Bu for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NN-0005Pb-Vd for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:54 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B06F3240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247718; bh=Q3KI3R1jB4dOuoALhSy1m444NmbwPXjG21vhtbvdjWs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Asf+DIv6FJjX+Zem/LN4572bFbWJRYvlfNbizJVPaAMKocl6pmt0lmjy/lWfsndrn OGzbqwaQFFHSsi1l/qRx5tJ1DOCxaHI6dn/Z8/CC3xyjasfxlVrGyOvAZ2Z8LDYTyV tZIEA/nekkWN3CCyqI7YOoD0UPprqHv9moLnei1fBvLQlXOUeA04Z1+VLHStZRqFEU sC+mxi4Fd7jm6UYwo3K3PGhRxhkVHI335NyYslU4Mvas+9wNDIp3LTIZAfqLIQoxal reQ+rNTB+Zi1Lfrs4tmVkx26GtxgeSK/dmIPzwp9nxyfGUcrU3nOspR7uHEbUlhNk+ GhKcNJqh4K/QA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjf201tz9rxk; Thu, 21 Sep 2023 00:08:38 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:56 +0000 Message-ID: <3ff56bbfa5ba73c25af50cbae50210421a176237.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-colamd): New variable. --- gnu/packages/maths.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 875e7dc391..9a48a1fc65 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5093,6 +5093,36 @@ (define-public suitesparse-camd ordering.") (license license:bsd-3))) +(define-public suitesparse-colamd + (package + (name "suitesparse-colamd") + (version "3.2.0") + (source (suitesparse-package-src name "COLAMD")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Column Approximate Minimum Degree Ordering") + (description "COLAMD is library for computing a permutation vector for a +matrix with which the LU factorization becomes sparser.") + (license license:bsd-3))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:07:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54089 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 57F8C27BBE2; Wed, 20 Sep 2023 23:09:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2811127BBEA for ; Wed, 20 Sep 2023 23:09:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NT-00076F-E3; Wed, 20 Sep 2023 18:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NS-00075n-Ng for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NR-0005Ab-FX for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5Nb-0005Tl-2u for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 07/20] gnu: Add suitesparse-ccolamd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524774120944 (code B ref 66129); Wed, 20 Sep 2023 22:09:07 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:01 +0000 Received: from localhost ([127.0.0.1]:60505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NU-0005Rd-Q5 for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:01 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NO-0005Pc-Nr for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:55 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 766B7240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247719; bh=PJNoib38tE3pFlzR3R4/nH0uJr5D0c+qxw9lidJOQ4c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=NGAAYma6Sp/UZlkKxH1RBlN3Aa2fnj8mCh5XQi5SN/VQRpWCZbzfr38uHm3Kwk1Jk uBOA0zBxcAw8jCZlPzwnN7lLwiUdnPFxF1lRSTz/QgcEdJxh3y8T2+fDfP0ObXu73B fKK1JDi/6AwSJ3d7YqOQwbs+BeJ6wGsEDzv6WaTNXZMuXbKvdNfCF4462G35d+xzda 7WqBqEtBlIlKlbgRUbhAnE4m795lIfTQl2pk7Miis/e84Nx2gR+C8mgrB3Cuo6/3aW JU4JVBwUUkca7uIlCES0ng85hYtMtO+f4Jb+7x6fmyVEVNkIEZblJgRt9vPucEpfkt N8LDyY55TAevw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjg0g83z6ty8; Thu, 21 Sep 2023 00:08:39 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:57 +0000 Message-ID: <5f57cf3264823354212a4077a8c8bb71a31ef554.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-ccolamd): New variable. --- gnu/packages/maths.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9a48a1fc65..8f27134ba8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5123,6 +5123,37 @@ (define-public suitesparse-colamd matrix with which the LU factorization becomes sparser.") (license license:bsd-3))) +(define-public suitesparse-ccolamd + (package + (name "suitesparse-ccolamd") + (version "3.2.0") + (source (suitesparse-package-src name "CCOLAMD")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Column Approximate Minimum Degree Ordering with constraints") + (description "CCOLAMD is library for computing a permutation vector for a +matrix with which the LU factorization becomes sparser. It is a variant of +COLAMD which has the the option to apply constraints to the ordering.") + (license license:bsd-3))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:07:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54090 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 95E1E27BBEB; Wed, 20 Sep 2023 23:09:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5C50227BBEA for ; Wed, 20 Sep 2023 23:09:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NT-00076I-MZ; Wed, 20 Sep 2023 18:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NS-00075F-4G for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NR-0005Ai-S3 for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5Nb-0005Ts-FN for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 08/20] gnu: Add gklib. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524774120951 (code B ref 66129); Wed, 20 Sep 2023 22:09:07 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:01 +0000 Received: from localhost ([127.0.0.1]:60507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NV-0005Rl-5W for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:01 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NP-0005Pe-S6 for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4AD99240027 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247720; bh=Y7uQN5mkLrPhI14bbyRzSQpQwepsP2fjs7im04EyVnM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Pf9I8oZ71aaRhNBEC4/4zivzH6l2ylMshnM1Nu/lv8QSIYE8y4GRJF/p/J/EKLB/M 0l5/CPV93qCOcV+L63msgSkb4wqXiZbZdrCvbNunNNon2uPi0js3g7Igi86xFzC8Du QNy5yfh0j4UTKT3R7JXBzv2TSjdfQkj9fyhrK5VOLI+xallKNuc8mxuvRBNhJzUazM LU0GFsSW6HV1SadCNkzv+PWLxa5PTATOQni4MLyx9WW0DVua2nrAewK3Sh6DSjhAIw +pNBxcIhKBS6T+/qJZEYhuRdd53SMAssW1cBLPQ/L22geujNx2BqZrFuTBKLgb/WMC PB01Iay2I2+HA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjg68TYz9rxk; Thu, 21 Sep 2023 00:08:39 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:58 +0000 Message-ID: <6c9d1fedc03930be77e82c1c3317ed2160f8e72b.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (gklib): New variable. --- gnu/packages/maths.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8f27134ba8..8e17629caa 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4193,6 +4193,32 @@ (define-public scotch-shared (define-public pt-scotch-shared (deprecated-package "pt-scotch-shared" pt-scotch)) +(define-public gklib + (let ((commit "8bd6bad750b2b0d90800c632cf18e8ee93ad72d7") + (revision "1")) + (package + (name "gklib") + (version (git-version "5.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KarypisLab/GKlib") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08k4zzyd7zsisdhfmnwz7zb9w3pzpgagyjq52mwk8i6sqajdxsdn")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"))) + (home-page "https://github.com/KarypisLab/GKlib") + (synopsis "Helper library for METIS") + (description + "GKlib is a library of various helper routines and frameworks used by +software from KarypisLab, such as METIS.") + (license license:asl2.0)))) (define-public metis (package From patchwork Wed Sep 20 22:07:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54092 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 28C5F27BBEB; Wed, 20 Sep 2023 23:09:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D0D1927BBE2 for ; Wed, 20 Sep 2023 23:09:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NT-00076J-OJ; Wed, 20 Sep 2023 18:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NS-00075j-He for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NS-0005At-9D for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5Nb-0005U0-SU for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 09/20] gnu: Add metis-5.2. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524774220964 (code B ref 66129); Wed, 20 Sep 2023 22:09:07 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:02 +0000 Received: from localhost ([127.0.0.1]:60509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NV-0005Rs-GT for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:01 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58183) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NQ-0005Pg-B9 for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 11220240027 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247721; bh=xfXd52c1QFMjuvobWLG4AK6XQQ2uCwQt5RXtkeC7kfc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=gdxtn4d+JwrXM87KC+BJbFh161Twjl382agqy/gRUOwIeNH4k1f+uXLgI4JGdkRa4 vNZqrBxFGkyR9rFRe3ybxu3BWDENnSJRS5x4gLB7Q4y/0AtQasOpVW9uV+bMhbi0jv 4dIraQvENQDRdmMuQgBSe/ILNSkgDxj2hQ0xyYgxkOtf+VUTnYB6QyVwzEXNHfGU9E UzCTDdqQVOilY4muDmCjmdcb1CstTGFdpWROGS2htDXofMXxV+b8ZvszRRamUEiEiC 2zuBjpEn4G5pEDDNEWs8DnnxSRs/oOR5UpEieGnHtEHMInXEQOzxudV0dHpjkKEGBd R5LAd0MnoFc7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjh4srdz6v2Q; Thu, 21 Sep 2023 00:08:40 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:07:59 +0000 Message-ID: <4ad2b7c14325639a4b400ed6a230fb3ee2f9d158.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (metis-5.2): New variable. --- gnu/packages/maths.scm | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8e17629caa..3150bac47f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4220,6 +4220,7 @@ (define-public gklib software from KarypisLab, such as METIS.") (license license:asl2.0)))) +;; XXX: Remove once the full SuiteSparse package is replaced. (define-public metis (package (name "metis") @@ -4253,6 +4254,53 @@ (define-public metis schemes.") (license license:asl2.0))) ;As of version 5.0.3 +(define-public metis-5.2 + (package + (name "metis") + (version "5.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KarypisLab/METIS") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19vi1wsi2gp2m5vb715yfnzd2g7brm4r40qxg65ysrzgl13lpmvr")) + (snippet + #~(delete-file "manual/manual.pdf")))) + (build-system cmake-build-system) + (inputs (list gklib openblas)) + (arguments + (list + #:tests? #f ; Tests are not automatic + #:configure-flags + #~(list "-DSHARED=ON" + (string-append "-DGKLIB_PATH=" #$gklib)) + #:phases + #~(modify-phases %standard-phases + ;; The original Makefile copies some files and invokes CMake. + (add-before 'configure 'prepare-cmake + (lambda _ + (substitute* "Makefile" + (("config: distclean") "config:") + (("BUILDDIR =.*") + "BUILDDIR = .\n") + ((".*cmake.*") "")) + (substitute* "CMakeLists.txt" + (("build/") "../source/")) + (invoke "make" "config")))))) + (home-page "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview") + (synopsis "Graph partitioning and fill-reducing matrix ordering library") + (description + "METIS is a set of serial programs for partitioning graphs, partitioning +finite element meshes, and producing fill-reducing orderings for sparse +matrices. The algorithms implemented in METIS are based on the multilevel +recursive-bisection, multilevel k-way, and multi-constraint partitioning +schemes.") + (license license:asl2.0))) + (define-public p4est (package (name "p4est") From patchwork Wed Sep 20 22:08:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54091 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D30CA27BBEB; Wed, 20 Sep 2023 23:09:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D92A927BBEA for ; Wed, 20 Sep 2023 23:09:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NT-00076N-S6; Wed, 20 Sep 2023 18:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NS-000760-Vw for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NS-0005B6-Nm for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5Nc-0005U7-8R for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 10/20] gnu: Add gklib-suitesparse. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524774320980 (code B ref 66129); Wed, 20 Sep 2023 22:09:08 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:03 +0000 Received: from localhost ([127.0.0.1]:60511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NV-0005S5-VN for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:43273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NR-0005Pi-5e for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DC992240027 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247721; bh=nylsSrxQ/rut+G0abrH1PDDHWzAoXwEsOTj+nVeysrU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=SCYcSv+W5UmW29Ti5sOqt1/ZO237H+hVEV+C+EfEmXuTJNE9KzPokZcf5UE+JSqo2 L0IcGTYMsCHyjgRn+WU6TzIHO7nXvNySDIMV2Rj17j14fxF4n/zfT8q3+vCKs/nl2x E74BJxaKWrn07zy3+RWGsjwb5QS0gQ+16c8VapsIfWqChjfiqaM2MQBLYovL7nitSu St6jDvM8k5XHcGcLfglUPHwLUKUGQ8huz/Baa/x4LZLS1wAkGODQ2HoSIm2nULnoxj YXIHrK+BGELgcZ9Mkp4EcHX0X1VzlP2mccgitfgApaDS+59aYa4qWsDeGicpO5Z3OT BQgje0LnG/Gmg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjj3FkRz9ryn; Thu, 21 Sep 2023 00:08:41 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:00 +0000 Message-ID: <28bb0d1f9a1530497514d57a15aabeb1990536a8.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (gklib-suitesparse): New variable. --- gnu/packages/maths.scm | 25 ++++++++ gnu/packages/patches/gklib-suitesparse.patch | 65 ++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 gnu/packages/patches/gklib-suitesparse.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3150bac47f..668d564edc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5228,6 +5228,31 @@ (define-public suitesparse-ccolamd COLAMD which has the the option to apply constraints to the ordering.") (license license:bsd-3))) +(define-public gklib-suitesparse + (package/inherit gklib + (name "gklib-suitesparse") + (source (origin + (inherit (package-source gklib)) + (patches (cons + (search-patch + "gklib-suitesparse.patch") + (origin-patches (package-source gklib)))))) + (arguments + (substitute-keyword-arguments (package-arguments gklib) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("add_library\\(GKlib.*" all) + (string-append + all + "target_link_libraries(GKlib PUBLIC" + " ${SUITESPARSE_CONFIG_LIBRARIES} m)\n"))))))))) + (inputs + (modify-inputs (package-inputs gklib) + (prepend suitesparse-config))))) + (define-public suitesparse (package (name "suitesparse") diff --git a/gnu/packages/patches/gklib-suitesparse.patch b/gnu/packages/patches/gklib-suitesparse.patch new file mode 100644 index 0000000000..8b6c708b6a --- /dev/null +++ b/gnu/packages/patches/gklib-suitesparse.patch @@ -0,0 +1,65 @@ +This patch contains the relevant changes to GKlib made in SuiteSparse +(CHOLMOD) for the version 7.2.0 +(https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/8a7641cdb4809533c681417e94f98058c07c5da2). +The disabling of signal handling when MATLAB_MEX_FILE is defined is omitted. + +diff -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,8 @@ + + option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) + ++find_package ( SuiteSparse_config 7.1.0 REQUIRED ) ++ + get_filename_component(abs "." ABSOLUTE) + set(GKLIB_PATH ${abs}) + unset(abs) +diff -ur a/GKlib.h b/GKlib.h +--- a/GKlib.h ++++ b/GKlib.h +@@ -59,6 +59,24 @@ + #include + #endif + ++/* -------------------------------------------------------------------------- */ ++/* Added for incorporation into SuiteSparse. ++ Tim Davis, Oct 31, 2022, Texas A&M University. */ ++#include "SuiteSparse_config.h" ++#define malloc SuiteSparse_config_malloc ++#define calloc SuiteSparse_config_calloc ++#define realloc SuiteSparse_config_realloc ++#define free(p) \ ++{ \ ++ if ((p) != NULL) \ ++ { \ ++ SuiteSparse_config_free (p) ; \ ++ (p) = NULL ; \ ++ } \ ++} ++ ++/* -------------------------------------------------------------------------- */ ++ + + + +diff -ur a/memory.c b/memory.c +--- a/memory.c ++++ b/memory.c +@@ -108,6 +108,8 @@ + /*************************************************************************/ + int gk_malloc_init() + { ++ gkmcore = NULL; ++#if 0 + if (gkmcore == NULL) + gkmcore = gk_gkmcoreCreate(); + +@@ -115,6 +117,7 @@ + return 0; + + gk_gkmcorePush(gkmcore); ++#endif + + return 1; + } From patchwork Wed Sep 20 22:08:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54086 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7640327BBEA; Wed, 20 Sep 2023 23:09:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E824127BBE2 for ; Wed, 20 Sep 2023 23:09:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5NR-00074y-SD; Wed, 20 Sep 2023 18:08:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5NQ-00073v-KK for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5NQ-0005AF-CD for guix-patches@gnu.org; Wed, 20 Sep 2023 18:08:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5NZ-0005TP-W3 for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 11/20] gnu: Add metis-suitesparse. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:09:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524773920910 (code B ref 66129); Wed, 20 Sep 2023 22:09:05 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:08:59 +0000 Received: from localhost ([127.0.0.1]:60497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NS-0005R4-Sq for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NM-0005PN-Np for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:53 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A6061240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247722; bh=9Lw4m3Xegpy6MKnVWzSIbI8AH9cFBnXLRDObvMzB+60=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=GM4eB3Cnliy9XrWks1jtYjtilbQqg+wVQSSkrTFVM+n934dUnCLtXfg7IQfYw3nHu VT8Kk1M+Xjeq3qCr+VxwgJs/dT4qcGvYEXtcOMa3R3PANEwh4sQnP4rR57FBF3IOdh 7WgjBY1eoq/a+t6pq4rixjejohs30oeXmqZX0piF4F2hT2EywnAYCX5/nVj9kPAFfJ VaHtCaU7NSW+OHF+qJC6craoPwbcpiLa/5v14TNo7/W6IYIG1tIU58+qYMjiierjN0 QTnoc7M7cv+iVK8BVL2GD2tkip6nMwGGPQMLq4ok0UGlvO00OFWKSbez1AU3ooJ6ar ZFXuMH56BapRQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjk1tRfz9ryn; Thu, 21 Sep 2023 00:08:42 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:01 +0000 Message-ID: <1ea9d34d76746c0de86d11b368fc0acbcccb1bfd.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (metis-suitesparse): New variable. --- gnu/packages/maths.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 668d564edc..b34ad70321 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5253,6 +5253,32 @@ (define-public gklib-suitesparse (modify-inputs (package-inputs gklib) (prepend suitesparse-config))))) +(define-public metis-suitesparse + (package/inherit metis-5.2 + (name "metis-suitesparse") + (arguments + (substitute-keyword-arguments (package-arguments metis-5.2) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'prepare-cmake 'set-idxwidth + (lambda _ + (substitute* "Makefile" + (("IDXWIDTH.*=.*") + "IDXWIDTH = \"\\#define IDXTYPEWIDTH 64\"\n")))) + (add-before 'prepare-cmake 'link-suitesparse-config + (lambda _ + (substitute* "programs/CMakeLists.txt" + (("include_directories.*" all) + (string-append + all "find_package(SuiteSparse_config REQUIRED)\n")) + (("(target_link_libraries.*)GKlib(.*)" _ start end) + (string-append + start "GKlib ${SUITESPARSE_CONFIG_LIBRARIES}" end))))))) + ((#:configure-flags _) + #~(list "-DSHARED=ON" + (string-append "-DGKLIB_PATH=" #$gklib-suitesparse))))) + (inputs (list suitesparse-config gklib-suitesparse)))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54097 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ACC2827BBEB; Wed, 20 Sep 2023 23:10:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9B1D427BBE9 for ; Wed, 20 Sep 2023 23:10:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OO-0007mH-Sh; Wed, 20 Sep 2023 18:09:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5ON-0007l3-5V for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0005S0-T9 for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OW-0005XL-GM for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 12/20] gnu: Add suitesparse-cholmod. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777921188 (code B ref 66129); Wed, 20 Sep 2023 22:10:04 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:39 +0000 Received: from localhost ([127.0.0.1]:60545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5O6-0005VY-JB for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:38 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NS-0005Q8-Pc for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:08:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7E5C8240027 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247723; bh=f56Z6aw3lONGgsk6WBehQaOOQfKFJJs9mkhFiUEJT6A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Igo7+uiIS4oZKZCeQKGMBxM43YqWdi3hRpFc0p9WQzUGDo1mBpj+kHc6/XYERgrd6 g6nUvc7eDzvavLRgKU+8HrPKiCOvomqARmlwyv00iTRn5fO8wkf348qm9wc2PIRqs5 HGGaRSy+nVNZTT3h135EbUEC8a/1lLUx8pDdK0fRd3iprbUBBs5S149a8PERNkXMpT nhx781fqpHYCr9251YdCR4+yeDNh3VLCPn/h3adD8DWLQg9Y7orxML6lnEl4vXrusg AOfPGWtU9N3x7D5Fvid8JV18GWQk6VtmykXNKCwkPQjd9Ns4zGjlqV2DP8kVmMKtXe LeUjrCe5J69Zg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjl0htrz9ryn; Thu, 21 Sep 2023 00:08:43 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:02 +0000 Message-ID: <7e45de00421cbe7b85c84000df7d8020d03563d6.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-cholmod): New variable. --- gnu/packages/maths.scm | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b34ad70321..1dfd12af76 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5279,6 +5279,88 @@ (define-public metis-suitesparse (string-append "-DGKLIB_PATH=" #$gklib-suitesparse))))) (inputs (list suitesparse-config gklib-suitesparse)))) +(define-public suitesparse-cholmod + (package + (name "suitesparse-cholmod") + (version "4.2.0") + (source (suitesparse-package-src name "CHOLMOD")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n")) + (("add_subdirectory.*GPU.*") "\n") + ((".*cmake_modules/FindCHOLMOD_CUDA.cmake.*") "\n")))) + (add-after 'unpack 'use-external-metis + (lambda _ + (let ((port (open-file "CMakeLists.txt" "a"))) + (display + (string-append + "find_library(METIS_LIBRARY NAME metis PATHS ENV LIBRARY_PATH) +get_filename_component(METIS_LIBRARY ${METIS_LIBRARY} REALPATH) +find_library(GKLIB_LIBRARY NAME GKlib PATHS ENV LIBRARY_PATH) +get_filename_component(GKLIB_LIBRARY ${GKLIB_LIBRARY} REALPATH) +target_link_libraries(CHOLMOD PRIVATE ${METIS_LIBRARY} ${GKLIB_LIBRARY}) +target_link_libraries(CHOLMOD_static PRIVATE ${METIS_LIBRARY} ${GKLIB_LIBRARY})") + port) + (close-port port)) + (delete-file "Partition/cholmod_metis_wrapper.c") + (delete-file "Partition/cholmod_metis_wrapper.h") + (substitute* "Partition/cholmod_metis.c" + (("#include \"cholmod_metis_wrapper\\.h\"") "") + (("#include \"SuiteSparse_metis/include/metis.h\"") + "#include ") + (("SuiteSparse_metis_METIS") "METIS")))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../source/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../source/Doc/CHOLMOD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (let ((out (string-append #$output + "/share/doc/" #$name "-" #$version))) + (install-file "../source/Doc/License.txt" out) + (install-file "../source/Core/lesser.txt" out) + (install-file "../source/MatrixOps/gpl.txt" out))))))) + (inputs + (list gklib-suitesparse + metis-suitesparse + openblas + suitesparse-amd + suitesparse-camd + suitesparse-ccolamd + suitesparse-colamd + suitesparse-config)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Library for solving sparse symmetric positive definite linear +equations") + (description "CHOLMOD is a set of routins for factorizing sparse symmetrix +positive definite matrices, updating/downdating sparse Cholesky factorizations +and other related operations.") + (license (list license:gpl2+ license:lgpl2.1+)))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54095 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 43B1527BBEA; Wed, 20 Sep 2023 23:10:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B2C327BBE9 for ; Wed, 20 Sep 2023 23:10:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OM-0007jp-6y; Wed, 20 Sep 2023 18:09:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5OK-0007jH-Ar for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OK-0005Ql-2g for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OT-0005WU-M6 for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 13/20] gnu: Add suitesparse-cxsparse. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777021130 (code B ref 66129); Wed, 20 Sep 2023 22:10:01 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:30 +0000 Received: from localhost ([127.0.0.1]:60531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5Ny-0005Uj-0i for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:30 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NT-0005QL-Ju for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:00 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 55D78240027 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247724; bh=d03SBBVzZCNzW8AWhWJl8T0TfkE3GDjtQ8XinfHjlHM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=fUt5e4jwrdqeYaL9wWFVTx6f1YNBjRFtkEQIOfXbdjBiEhQ/VQW4QmGm6AdD6hjoq iDVqy/IU9iYzz8YlH+ttmZjJ83mOfVnnzqYPNOnjD5OdqY4gJT4mcTIJRJQfYOKq35 dzE1HWdh8BdtIVRWjafho1R0sPKzFFidQIGeJzJ7Me/NsuKZvnW9M8aSe8Lo9tNl6N hGBhVDDSKWH/5MIzrnkJSQe5zBdJakbAcExUFMZdt65cq8H8QfIIPvsU0RwDXmP/E2 i4oD6qzwBDRY7bkM+JJdArRyrhI6PYK6QJA6IdNSsrwPzYsSl3S3zZKSDN39Oo2MTo RKM8yvQwcok9w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjl6Y2wz9rxk; Thu, 21 Sep 2023 00:08:43 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:03 +0000 Message-ID: <88ac0a8ff23aef774b68ebf1c43d55dafd651be8.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-cxsparse): New variable. --- gnu/packages/maths.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1dfd12af76..57e3f82fa8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5361,6 +5361,37 @@ (define-public suitesparse-cholmod and other related operations.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public suitesparse-cxsparse + (package + (name "suitesparse-cxsparse") + (version "4.2.0") + (source (suitesparse-package-src name "CXSparse")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (let ((out (string-append #$output + "/share/doc/" #$name "-" #$version))) + (install-file "../source/Doc/License.txt" out) + (install-file "../source/Doc/lesser.txt" out))))))) + (inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Concise eXtended Sparse Matrix Package") + (description "CXSparse is a collection of sparse matrix algorithms for +direct methods on both real and complex matrices.") + (license license:lgpl2.1+))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54100 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0AB6E27BBE9; Wed, 20 Sep 2023 23:10:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6188527BBE2 for ; Wed, 20 Sep 2023 23:10:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OO-0007lR-Cf; Wed, 20 Sep 2023 18:09:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0007jx-Ky for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OK-0005R7-RP for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OU-0005Wj-Ea for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 14/20] gnu: Add suitesparse-klu. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777121145 (code B ref 66129); Wed, 20 Sep 2023 22:10:02 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:31 +0000 Received: from localhost ([127.0.0.1]:60535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5Nz-0005Ut-0r for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:31 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NV-0005Qe-Tl for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2640D240028 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247725; bh=+6LY2D/qBOfYYUq7nF5MG6Q7wxGmFi4MDkiR25sl+08=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=RUF2nmgb5/qH8h76+va3plM2VKCToluFHVp1e2CBcnJYRdTjmc3CrJBRr+ksxUxkN 4QCAJxTaSSh40yhrPUnJ491Yxxu7dHedfMsez5+fN7VakbVCPheRD7L7K4ix5yVZHs zk4gsIKtLUZSaKvOVxG0R6Gn4/RIuw7yt3Gx7aEDwErf/AbSC/Zm7VE6moEZ3j6uQo ipVRsTYXcw6hJxYdWYx4Pw8y3mUqgOjRzDHFhuIvZG05Cv4UIaPh/Q1SpLa+HfR+Bu iHwnRnn3mORVYfeRg+gsTB8xik8MkUVCX+eVnk4dMxAV2NfOtlNhvAeGJUtbtMI+hh 0G/cYC50ocspA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjm5M5nz6v3j; Thu, 21 Sep 2023 00:08:44 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:04 +0000 Message-ID: <6a2c9a11789ab3a57d043d017265aca9b079c0ad.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-klu): New variable. --- gnu/packages/maths.scm | 61 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 57e3f82fa8..cfa631b975 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5392,6 +5392,67 @@ (define-public suitesparse-cxsparse direct methods on both real and complex matrices.") (license license:lgpl2.1+))) +(define-public suitesparse-klu + (package + (name "suitesparse-klu") + (version "2.2.0") + (source + (suitesparse-package-src name "KLU")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-btf + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-cholmod + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (substitute* "../source/Doc/Makefile" + (("\\.\\./\\.\\./BTF/Include/btf.h") + (string-append #$suitesparse-btf "/include/btf.h"))) + (with-directory-excursion "../source/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../source/Doc/KLU_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs + (list suitesparse-amd + suitesparse-btf + suitesparse-camd + suitesparse-ccolamd + suitesparse-cholmod + suitesparse-colamd + suitesparse-config)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Routines for solving sparse linear problems with a LU factorization") + (description "KLU is a method for computing the LU factorization of sparse +for real and complex matrices.") + (license license:lgpl2.1+))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54093 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 338B327BBEA; Wed, 20 Sep 2023 23:09:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 930C627BBE2 for ; Wed, 20 Sep 2023 23:09:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OM-0007jq-Dk; Wed, 20 Sep 2023 18:09:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5OK-0007jW-MN for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OK-0005Qv-EJ for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OU-0005Wb-1X for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 15/20] gnu: Add suitesparse-ldl. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777121138 (code B ref 66129); Wed, 20 Sep 2023 22:10:02 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:31 +0000 Received: from localhost ([127.0.0.1]:60533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5Ny-0005Ul-Iv for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:30 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NV-0005Qd-Tk for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DCFCA240028 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247725; bh=5jsdvB+Fab5g0JPigCTK3NieEboIwA2Uv9hRgOvD3K4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=RwsuJSMODUu2UPYHRRu4Uu+PT6xv1UOPUNcQ6E2jp8BRNmUldids+dcAdcEu7jlY/ p89NdSnzCFILo+LQW3djR1ryudPgMBKB5swbaZwblcuYI+CDquzUV8AduydYk1XXPJ RyFfndmgM3a2jl7EjpfMTK8wbWDe+54FX7e+Gzk9O1mJYll2BWR34uP/NwJ4UoFYSu TkDVUN+R2mLcN+umasPx1UC6n5eItV1syebFuf+tGZGEEowJLVOLua6RRyLn2OXCcP tq3Uqf8EWgqasYJpD2vFUX5JEUIHh5P9ilHRJvva7S9nNLVePIwaizE6jISV6wgMFs fAqmGIDEBlHqw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjn3mShz6trs; Thu, 21 Sep 2023 00:08:45 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:05 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-ldl): New variable. --- gnu/packages/maths.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cfa631b975..b317b1b18a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5453,6 +5453,57 @@ (define-public suitesparse-klu for real and complex matrices.") (license license:lgpl2.1+))) +(define-public suitesparse-ldl + (package + (name "suitesparse-ldl") + (version "3.2.0") + (source (suitesparse-package-src name "LDL")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (substitute* "../source/Doc/Makefile" + (("\\.\\./\\.\\./BTF/Include/btf.h") + (string-append #$suitesparse-btf "/include/btf.h"))) + (with-directory-excursion "../source/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../source/Doc/ldl_userguide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs + (list suitesparse-amd + suitesparse-config)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "LDL' factorization method for sparse, symmetric matrices") + (description "This package contains a set of routines for computing the +LDL' factorization of sparse, symmetric matrices. Its focus lies on concise +code.") + (license license:lgpl2.1+))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54101 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D17DB27BBE9; Wed, 20 Sep 2023 23:10:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C489A27BBE2 for ; Wed, 20 Sep 2023 23:10:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OO-0007lq-L8; Wed, 20 Sep 2023 18:09:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0007jy-Mi for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OL-0005RC-8X for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OU-0005Wq-Rs for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 16/20] gnu: Add suitesparse-rbio. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777121152 (code B ref 66129); Wed, 20 Sep 2023 22:10:02 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:31 +0000 Received: from localhost ([127.0.0.1]:60537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5Nz-0005V0-FQ for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:31 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NW-0005Qk-8e for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9C292240028 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247726; bh=b+LhzvGHI7CRM5YsQdgjXKX35QR72iQOIK88ha6Syig=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=pON4frBcjEoTKbOq0sMFucg4ETuTft3zyCsIC8n0aCbKWu9PiFWy6nuPgmRIqvGhe qVMHymFcISU5fvhIz8xXMq9aFP3PYFZUmkYqvaodNgE7dazl8o+p+38KdyYlNMjDXU 7G1NuLKfQtfKeJSz/v48C2zPPRgyprgqH2x1/5kYXtYAlIRkRFEOlW7KvVQzrE0EnL Dj2D9U9ZTp2uiCmG0Lm1k3e5Uv0HrmlpoPsLmgzaGwthHgm2CXlZ+nVtuykTUBDCbv G/LYfb1GhdbJ1+MC6XhO2ERFVqrne97e7fVKJNOio/B6pGbxqTfQu+Vtf5373qh6ne llGDEeF2PUKZQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjp2CnYz6trs; Thu, 21 Sep 2023 00:08:46 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:06 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-rbio): New variable. --- gnu/packages/maths.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b317b1b18a..84ad02b3df 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5504,6 +5504,41 @@ (define-public suitesparse-ldl code.") (license license:lgpl2.1+))) +(define-public suitesparse-rbio + (package + (name "suitesparse-rbio") + (version "4.2.0") + (source (suitesparse-package-src name "RBio")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (let ((out (string-append #$output + "/share/doc/" #$name "-" #$version))) + (install-file "../source/Doc/License.txt" out) + (install-file "../source/Doc/gpl.txt" out))))))) + (inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Library for the Rutherford/Boeing sparse matrix format") + (description "This package provides the C library of RBio. It can be used +for reading and writing sparse matrices in the Rutherford/Boeing format.") + (license license:gpl2+))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54094 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 51E2F27BBE2; Wed, 20 Sep 2023 23:10:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D18527BBE9 for ; Wed, 20 Sep 2023 23:10:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5ON-0007lH-MN; Wed, 20 Sep 2023 18:09:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0007k8-OD for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OL-0005RF-LG for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OV-0005Wx-8T for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 17/20] gnu: Add suitesparse-mongoose. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777221160 (code B ref 66129); Wed, 20 Sep 2023 22:10:03 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:32 +0000 Received: from localhost ([127.0.0.1]:60539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5Nz-0005V7-SS for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:32 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NW-0005Ql-NH for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 70652240103 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247727; bh=811gxcmvEbG5QarPTEqEw+vTk/gWeP3XqLbSkvszhrs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=qwdS34kgwv9Q6PlMl3hy1jW9+/nYm8/tr9Kos3UH4S6f2vFu/7UuYjHOi2iKwURkn ntNmUu44KpSE4rMCK0hrwRuyqCaH/9Iy0OcQp0S76tYBXY7v17a3eRCompgz96N5+3 Xlb4T8ND3e1MuBdM3s+HegWp5PcOsjmMYWRdXA8pbZIrm8sjwZuPA2R/8eoK8AusX2 YLqjnOS+Yft9jDaNxpLhqqtzGADwz6W6J4S0SoQ9Z6/1KQL8S6CRWfExhi1QjT2Vo/ nbgpArfrg/ZNOhnZI1Z+oslCobH7Q5l6lXmHjoAx7r4MzSQ+GPV+nHmiV/e/baPwN9 wIRfPU+QiNAgw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjq0qgfz6ty8; Thu, 21 Sep 2023 00:08:47 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:07 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-mongoose): New variable. --- gnu/packages/maths.scm | 72 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 84ad02b3df..e958e6521b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5539,6 +5539,78 @@ (define-public suitesparse-rbio for reading and writing sparse matrices in the Rutherford/Boeing format.") (license license:gpl2+))) +(define-public suitesparse-mongoose + (package + (name "suitesparse-mongoose") + (version "3.2.0") + (source (suitesparse-package-src name "Mongoose")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + ;; XeLaTeX fails with .eps graphics + (with-directory-excursion "../source/Doc" + (for-each + (lambda (name) + (invoke "epstopdf" name)) + (find-files "Figures" "\\.eps$")) + (substitute* "Mongoose_UserGuide.tex" + (("\\.eps") ".pdf")) + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../source/Doc/Mongoose_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-config)) + (native-inputs + (list texlive-epstopdf + (texlive-updmap.cfg + (list texlive-algorithmicx + texlive-booktabs + texlive-lastpage + texlive-multirow + texlive-pgf + texlive-caption + texlive-etoolbox + texlive-csquotes + texlive-fancybox + texlive-enumitem + texlive-microtype + texlive-cancel + texlive-sourcecodepro + texlive-xkeyval + texlive-fontspec + texlive-wasy + texlive-wasysym + texlive-float + texlive-tcolorbox + texlive-environ + texlive-xcolor + texlive-xetex + texlive-listings)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Graph partitioning library") + (description "Mongoose is a library for graph partitioning by computing +edge cuts using a coarsening and refinement framework.") + (license license:gpl3))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54098 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3964927BBEA; Wed, 20 Sep 2023 23:10:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8B4EB27BBE2 for ; Wed, 20 Sep 2023 23:10:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OO-0007mJ-Uy; Wed, 20 Sep 2023 18:09:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0007k2-NM for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0005RL-21 for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OV-0005X6-LJ for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 18/20] gnu: Add suitesparse-spex. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777821172 (code B ref 66129); Wed, 20 Sep 2023 22:10:03 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:38 +0000 Received: from localhost ([127.0.0.1]:60541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5O0-0005VF-9X for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:38 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NX-0005Qt-GJ for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3ADF6240103 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247728; bh=25ulTnYX1xPmSpGZL+DojZajwH/eVEY4mEBGNmnnxJc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=iPF5EMr9d+Keu9kO3N5xBhklpduL+/OrlLYJaJNiQH2r5dJFcx3O/dhkUDSsiIPV2 NnXv7OFtq7R5GmK849g8/GjHDF8TyXbuK+7SB877QRmffrnvtL+XoFYAnIzH7LzYjz pWM7IANpdp1JevBhZqDr23wSdo8K2UJwFBl5fwuCZTfKFEe2RsqO1Jc2dqaEslne1s YlRCSBTLrn8aErF7bsvgoIZnFXfWj0xNs8KceXZ2ZXjlk697T9yqdzCUf9qW+AsenH IGi2Cr5N/35XjT9ll42yIG+m9t+NSoLKNXPcDIFLLTB4RWxnCW373T55ukK26rZ8Ky cV2W/T2lr4cLg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjq6Qrfz6trs; Thu, 21 Sep 2023 00:08:47 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:08 +0000 Message-ID: <3777ca6f78db8169cf1df75d6b01888e7bc3eff9.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-spex): New variable. --- gnu/packages/maths.scm | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e958e6521b..0c9b983ab0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5611,6 +5611,73 @@ (define-public suitesparse-mongoose edge cuts using a coarsening and refinement framework.") (license license:gpl3))) +(define-public suitesparse-spex + (package + (name "suitesparse-spex") + (version "2.2.0") + (source (suitesparse-package-src name "SPEX")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../source/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../source/Doc/SPEX_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs + (list gmp + mpfr + suitesparse-amd + suitesparse-colamd + suitesparse-config)) + (native-inputs + (list (texlive-updmap.cfg + (list texlive-paralist + texlive-comment + texlive-psfrag + texlive-soul + texlive-multirow + texlive-algorithms + texlive-float + texlive-algorithmicx + texlive-cprotect + texlive-bigfoot + texlive-caption + texlive-listings + texlive-xcolor + texlive-framed + texlive-mdframed + texlive-etoolbox + texlive-zref + texlive-needspace)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Package for SParse EXact algebra") + (description "SPEX is a set of routines for sparse exact linear algebra. +It contains the SPEX Left LU library for computing a sparse exact left-looking +LU factorization for solving unsymmetric sparse linear systems.") + ;; Dual licensed. + (license (list license:lgpl3+ license:gpl2+)))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54099 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7A37327BBEB; Wed, 20 Sep 2023 23:10:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A426227BBE9 for ; Wed, 20 Sep 2023 23:10:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OO-0007lS-Cu; Wed, 20 Sep 2023 18:09:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0007k9-OG for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5OM-0005RS-Er for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OW-0005XD-1s for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 19/20] gnu: Add suitesparse-spqr. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777821179 (code B ref 66129); Wed, 20 Sep 2023 22:10:04 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:38 +0000 Received: from localhost ([127.0.0.1]:60543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5O6-0005VR-5U for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:38 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NY-0005RA-9G for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0395A240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247729; bh=hm/pKKYHUTtOxRd8xV0Ui2fz4t01Eho5xcS2GEaRxNs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=dAMhfftEARj3KxVSFePVD/7/2dSoWKhvFghAeDoASiW6vvHdn9tIfeWC9U9EwSji8 5/GiK8lcquq4SCvKyOsRUb3zK5ZB54uhuSZxPS+fabqUGrrsyBnQKqDaLBqxT6TLlA ngxRhqCH1J0N9kaON1VGFXCZjlycfWwoeFKbzhOmeG2MWypsnwcV2KuYhibC/RIeHY FFPn3ZohWbVKm0Sigl3Qn3jBCHxxluMC9zGv0uiY0xerSNAGRgbf9FU5TISeHqeSaA vaSrfzhBqRCPFMU5aoNwY2pE4FHUpHeTk5VohFxxd3MjhUvpQ0vwCcIrHaCh7hAIxj dmVqQo5f2GTpA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjr4lX5z6trs; Thu, 21 Sep 2023 00:08:48 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:09 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-spqr): New variable. --- gnu/packages/maths.scm | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0c9b983ab0..f45ff900cf 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5678,6 +5678,65 @@ (define-public suitesparse-spex ;; Dual licensed. (license (list license:lgpl3+ license:gpl2+)))) +(define-public suitesparse-spqr + (package + (name "suitesparse-spqr") + (version "4.2.0") + (source (suitesparse-package-src name "SPQR")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-cholmod + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../source/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../source/Doc/spqr_user_guide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../source/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs + (list openblas + suitesparse-amd + suitesparse-camd + suitesparse-ccolamd + suitesparse-cholmod + suitesparse-colamd + suitesparse-config)) + (native-inputs + (list (texlive-updmap.cfg + (list texlive-epsf)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Sparse QR factorization method") + (description "The SPQR (SuiteSparseQR) package provides sparse QR +factorization based on the multifrontal method, using BLAS for the frontal +matrices.") + (license license:gpl2+))) + (define-public suitesparse (package (name "suitesparse") From patchwork Wed Sep 20 22:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54096 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EFB5A27BBE9; Wed, 20 Sep 2023 23:10:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F38627BBE2 for ; Wed, 20 Sep 2023 23:10:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qj5OQ-0007nx-7i; Wed, 20 Sep 2023 18:09:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qj5ON-0007lE-Hv for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qj5ON-0005SB-9p for guix-patches@gnu.org; Wed, 20 Sep 2023 18:09:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qj5OW-0005XS-TR for guix-patches@gnu.org; Wed, 20 Sep 2023 18:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH 20/20] gnu: Add suitesparse-umfpack. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 22:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66129 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66129@debbugs.gnu.org Cc: David Elsing Received: via spool by 66129-submit@debbugs.gnu.org id=B66129.169524777921194 (code B ref 66129); Wed, 20 Sep 2023 22:10:04 +0000 Received: (at 66129) by debbugs.gnu.org; 20 Sep 2023 22:09:39 +0000 Received: from localhost ([127.0.0.1]:60547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5O7-0005Vh-0W for submit@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:39 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qj5NZ-0005RO-1s for 66129@debbugs.gnu.org; Wed, 20 Sep 2023 18:09:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C0AF7240101 for <66129@debbugs.gnu.org>; Thu, 21 Sep 2023 00:08:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695247729; bh=/EY3tYxJ5N/9QyEr5mHxtHfvla6DdaavTsMoO5C1FfI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=TyvLhiiQjtSzJUGnTkA1CXMMwbDbO6TMqt1aTiBV7PfsRWT6Ly9t2MyjNHueCKXuE JgxlyPPqMyFl1oVVDB1dyLDGZHnE5ZDoSgEk5OiyMjV4iJZ0QWE5+ys0j1SMPZpb2m a6TohXDnD0Brf0HFh9J16EKeeJod3pBJz6crVBWBOsaGYWjcj+uQioqtSpbqZIiHiN AotnE+GuQUHK9EHdqdkbZiq6BrBgCYzCev/Uf71ry/Y0weFMjypGrnETIKUeeNMcV7 331ImtIpGZ0k8WDsenr7eMUFmzyt2l1FFp43EAXd2rwGNxsnr4kdm9lIJ3E+//NN68 eXfp2Jzl0y9cw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RrXjs3Gj7z6trs; Thu, 21 Sep 2023 00:08:49 +0200 (CEST) From: David Elsing Date: Wed, 20 Sep 2023 22:08:10 +0000 Message-ID: <8e74bc2facc6f585b5a61d29a2ddc3cd6384fefa.1695246169.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (suitesparse-umfpack): New variable. --- gnu/packages/maths.scm | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f45ff900cf..eeff1b5ece 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5737,6 +5737,74 @@ (define-public suitesparse-spqr matrices.") (license license:gpl2+))) +(define-public suitesparse-umfpack + (package + (name "suitesparse-umfpack") + (version "6.2.0") + (source (suitesparse-package-src name "UMFPACK")) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-cholmod + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../source/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (let ((outdir + (string-append #$output "/share/doc/" + #$name "-" #$version))) + (install-file "../source/Doc/UMFPACK_UserGuide.pdf" outdir) + (install-file "../source/Doc/UMFPACK_QuickStart.pdf" outdir)))) + (replace 'install-license-files + (lambda _ + (let ((outdir + (string-append #$output "/share/doc/" + #$name "-" #$version))) + (install-file "../source/Doc/License.txt" outdir) + (install-file "../source/Doc/gpl.txt" outdir))))))) + (inputs + (list openblas + suitesparse-amd + suitesparse-camd + suitesparse-ccolamd + suitesparse-cholmod + suitesparse-colamd + suitesparse-config)) + (native-inputs + (list (texlive-updmap.cfg + (list texlive-etoolbox + texlive-framed + texlive-mdframed + texlive-needspace + texlive-xcolor + texlive-zref)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Routines for solving sparse linear problems via LU factorization") + (description "UMFPACK is a set of routines for solving unsymmetric sparse +linear systems using the Unsymmetric MultiFrontal method and direct sparse LU +factorization.") + (license license:gpl2+))) + (define-public suitesparse (package (name "suitesparse")