From patchwork Thu Oct 5 21:34:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54502 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 B8A6527BBE9; Thu, 5 Oct 2023 22:37: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=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 C3CA627BBE2 for ; Thu, 5 Oct 2023 22:37:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW1h-0002vf-8Z; Thu, 05 Oct 2023 17:36: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 1qoW1W-0002u9-5Q for guix-patches@gnu.org; Thu, 05 Oct 2023 17:36:47 -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 1qoW1U-0003hx-HV for guix-patches@gnu.org; Thu, 05 Oct 2023 17:36:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW1m-0002XC-RX for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 01/20] gnu: suitesparse: Tweak description. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:37: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.16965418139654 (code B ref 66129); Thu, 05 Oct 2023 21:37:02 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:36:53 +0000 Received: from localhost ([127.0.0.1]:48680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1d-0002Ve-5o for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:36:53 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1Z-0002VI-F2 for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:36:51 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0C0C7240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541785; bh=5ZVY33KklUsThy0yDqxkibZfHMdcRKnpXj4EN+d58WU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=A5ualiwgv0D5KjrOcZs5VTQPgMnfdD2M4zLtuqsrl6Fhe6zEIs50nAjPV025pf/48 39UB5GADDK0RpTSWvQAQnaB5PvGDDysMKcqXIvaQIUvlX+aNGAg4tDwiDEHyFZM3y3 WjvokioIK50rfGXxAMjVBIti59AkfzFG5CeApEr6UFZ85mF6djd3oma0mht+0htSIS +IHNNggUMWE7Tirx/ySED1pFGQhmJCNto1gRWMCSMK/yVOM88OLcHfkLPwvW1jGIFD LBaTbHkrA/BZrJH2oATHANYQFh8fEP3VOtMhIBCuZk6M4ky+Zvu0zhp9sSIF26U34N jHXPlmOtHSW2g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHX1kwlz6txv; Thu, 5 Oct 2023 23:36:24 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:44 +0000 Message-ID: <87f0342710c8193d576bdecd0d10a1f36b4a8a48.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 27ca2d5f18..c796501e72 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5111,7 +5111,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 Thu Oct 5 21:34:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54503 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 E110D27BBEA; Thu, 5 Oct 2023 22:37:10 +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 7C92627BBE2 for ; Thu, 5 Oct 2023 22:37:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW1d-0002v2-Gd; Thu, 05 Oct 2023 17:36:53 -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 1qoW1W-0002uA-5L for guix-patches@gnu.org; Thu, 05 Oct 2023 17:36:47 -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 1qoW1V-0003iB-Cj for guix-patches@gnu.org; Thu, 05 Oct 2023 17:36:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW1n-0002Xb-PJ for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 02/20] gnu: Add suitesparse-config. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:37: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.16965418219724 (code B ref 66129); Thu, 05 Oct 2023 21:37:03 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:01 +0000 Received: from localhost ([127.0.0.1]:48697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1k-0002WY-Aj for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:01 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1g-0002VX-OM for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:36:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id AB5CD240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541792; bh=ySnZPQdaXD+FJ07zt8JKpbiffZAK8tFTMIPXbHfQRPs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=HUNVnEzb+tYN/i6UkEXwD+ghEv3YCPJvD/Hco1jc8qY5VQxxOYYuAbuAICLBIuzj6 0vud4NKFunreDKUBO7n9KAufRT6Ron0e5aEvzI4zyreGtGY+mqoK46Ag5Hguzvr46D cvw6CpFt4pA4eP62JMgonGUlYaWKQDETVfbjMV75NNoU8K8jCwa7RjVlCb6HPaCv72 XU0jOXU2Rd6wTaohOhVgxQ7PQ75sq5+YbDwXPcWbtoVcH7X8DYs83N7ifamUPaBg/i iml3HJbYaOiz4Hpu6VxkhQH4MdOeHxMFmWsbZT3q/f1yiE/COpmw6i2ExnoyUk0l2W r+LyJQgty6u4Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHh29cfz6tvd; Thu, 5 Oct 2023 23:36:32 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:45 +0000 Message-ID: <6da1d5a872da0741da2c225ae724e45decc6ac7a.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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-source variable contains the entire SuiteSparse source code, which is used for all subpackages. * gnu/packages/maths.scm (suitesparse-version, suitesparse-source, suitesparse-config): New variables. --- gnu/packages/maths.scm | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c796501e72..0dcd456a2e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5039,6 +5039,87 @@ (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-source + (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-public suitesparse-config + (package + (name "suitesparse-config") + (version suitesparse-version) + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "SuiteSparse_config")))))) + (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 Thu Oct 5 21:34:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54504 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 CA28727BBEB; Thu, 5 Oct 2023 22:37:11 +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 7364F27BBE2 for ; Thu, 5 Oct 2023 22:37:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW1d-0002v5-Qk; Thu, 05 Oct 2023 17:36:53 -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 1qoW1W-0002uB-5q for guix-patches@gnu.org; Thu, 05 Oct 2023 17:36:47 -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 1qoW1U-0003i4-V4 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:36:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW1n-0002XP-C4 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 03/20] gnu: Add suitesparse-amd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:37: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.16965418209709 (code B ref 66129); Thu, 05 Oct 2023 21:37:03 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:00 +0000 Received: from localhost ([127.0.0.1]:48691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1j-0002WJ-Fi for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1h-0002VZ-FL for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:36:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 67632240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541793; bh=5t5IxCQQiFUiKCQrSNL+AYB4CQc6Dr7ukLyuuA2gbf8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Pwh+20wR3Uoj9hv2XV3OvXmeaFQOqOww09QBGFhLA7/ITaAjfItXQ6KIqISa0mfb/ hhHtiSrpN6q5KZ14AN5nPhh0acByvnWUhaVv8wLxpSY+bHQP2xlsvWnucwMaZ1Xu4S /s6ZZGjr3bqn7n0OaEwDKiyhlv0BY/JeAezI1i1kAX2Z+21DffoBRe+2YdT7GGsNX4 LhxXNCXzU/EVNKDx0l5GLvUrWhbLu6S7/JR0GojEZFJnLmmO+fHkQRQVFzf7zbOEr7 jRIwiBAt3oMFAAHFiOm81luKXFQlVBdWzmNpkDbreq3hJyuLYvWyIREjeviL2dVpjX gLw1HCwbDPDOg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHj0G6Sz6tvc; Thu, 5 Oct 2023 23:36:33 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:46 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0dcd456a2e..2216cc67b8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5120,6 +5120,54 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "AMD"))) + (add-after 'chdir '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 "../AMD/Doc" + (invoke "make")))) + ;; Required for suitesparse-umfpack + (add-after 'install 'install-internal-header + (lambda _ + (install-file "../AMD/Include/amd_internal.h" + (string-append #$output "/include")))) + (add-after 'install-internal-header 'install-doc + (lambda _ + (install-file "../AMD/Doc/AMD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../AMD/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 Thu Oct 5 21:34:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54507 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 7C7A427BBEA; Thu, 5 Oct 2023 22:38:12 +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 639C527BBE2 for ; Thu, 5 Oct 2023 22:38:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2T-0003Ah-WD; Thu, 05 Oct 2023 17:37:46 -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 1qoW2S-00039w-D4 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:44 -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 1qoW2S-00042D-4x for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2k-0002cG-IB for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 04/20] gnu: Add suitesparse-btf. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418259805 (code B ref 66129); Thu, 05 Oct 2023 21:38:02 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:05 +0000 Received: from localhost ([127.0.0.1]:48701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1l-0002Wn-7m for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1i-0002Vd-6j for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:36:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 226E6240027 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541794; bh=NRhXhauNALfcE0jDAXE2CCJIhk61A8OTqdZO/js6poo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=cBP3EG5eR5fC50sGenJer7+aMvW1CyhDs9ZTeGV6XmjVDSPTWrgVFcaCS8XJBMVxs KcCdT3IhLn20SRBHU0/sfYtxwoMOHzDM10ki+VBqUuVgaq/1z+6fpNIiHT2CZW7q/V SXi8c63pvhMiqDcnY89SNFjgAiUb6YZdLw1Qdz3U8fr7IUTJ0wyhazN0JBVRwsmabJ YgFyAUyHqkt5+uBuPP7GBGtVIfQ4brGLUpD9PVUwv0oXdgh+eRIur05JQCvQgT96b3 mrlY2uH8fxCQ67YXcTblttYbZRNlVu9CPn6PLLjZe/GD7zIFh4YyHn9TulDtVJADFS K8V0oeZ8HjZJQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHj5Nj9z6tvc; Thu, 5 Oct 2023 23:36:33 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:47 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2216cc67b8..1b1a39688b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5168,6 +5168,39 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "BTF"))) + (add-after 'chdir '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 "../BTF/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 Thu Oct 5 21:34:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54512 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 2EC6A27BBEA; Thu, 5 Oct 2023 22:38:28 +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 8FDBC27BBE9 for ; Thu, 5 Oct 2023 22:38:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2V-0003Cv-Mv; Thu, 05 Oct 2023 17:37:47 -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 1qoW2T-0003AU-Ba for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:45 -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 1qoW2T-00042c-3R for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2l-0002cV-GC for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 05/20] gnu: Add suitesparse-camd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418279837 (code B ref 66129); Thu, 05 Oct 2023 21:38:03 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:07 +0000 Received: from localhost ([127.0.0.1]:48721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1q-0002YK-2e for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:57719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1j-0002Vl-3Q for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:36:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 096FA240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541795; bh=pjVjQKztvtRkH11PE9EUhBIZIgJ+SmuBnZpqJij/rzI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=OG6QcRZ9qQQsfNJv2UWXpPeOCEOgnlcN6j587k9pSjf96ZZIj15KNCLiOpUfBbTmE Fa1kYm9gXTyaLXv7tJLs5Y1kjAfEO41NjUNdaM3cgO3cxO6Nvbg/uXI91naH5LFX1G ukH+b7y8Z6zOwt5Akc4EsqfVHBqOSePjUmJuy+RL/Fjogs8Q7FajMMyQoKn54dtWIg KuoxgWCIE4pihgRxr23MAkFPaKGtz9+Injusxjr7yPsuNV7gMIhvMPQNo8K7BKPOcW 2+Z3zxNU4duiYjz0evROaD7soIcfP4MUG/QzI5QIJbJ4pK4mh3r0FWWzTEyqd2QSZq 9MmGLGFnjegxA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHk4Ctmz9rxL; Thu, 5 Oct 2023 23:36:34 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:48 +0000 Message-ID: <943f64252992493d9103981f2f5ae8fd8331d629.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1b1a39688b..e2c0492ccb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5201,6 +5201,51 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CAMD"))) + (add-after 'chdir '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 "../CAMD/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../CAMD/Doc/CAMD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../CAMD/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 Thu Oct 5 21:34:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54505 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 E553827BBEA; Thu, 5 Oct 2023 22:37: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 5CB2627BBE9 for ; Thu, 5 Oct 2023 22:37:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2V-0003DG-WF; Thu, 05 Oct 2023 17:37:48 -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 1qoW2U-0003Aq-7r for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:46 -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 1qoW2T-000434-VM for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2m-0002cj-BS for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 06/20] gnu: Add suitesparse-colamd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418299864 (code B ref 66129); Thu, 05 Oct 2023 21:38:04 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:09 +0000 Received: from localhost ([127.0.0.1]:48727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1s-0002Yp-Hc for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:09 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44275) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1j-0002Vn-PE for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:00 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B24F3240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541795; bh=Z53/4YTfxUUpRT8zUTMsO7LqdMxpJ67CTddoHLKzhEQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=a0hKHYwGNwEcUsvugDcRTVTtnOsKKBRgbHzdvLnG6BejyHJZQxWt5blpPM9Iu5kfh CjXSahTS38GWHvQciGbmmcp3S3mvCwxLirTUO5Ju+Tb8RMDIRbkZ5eplcNPh0iqX8y X8Dw3gOs7Grz2L3MruMu2vk7PIdjDSrCKyX4UXsU5tO15KN1p3kiGg3tgykwtXB8Ku 4RQJEN3ZNRC0VZkpVk+iXrz3mDKv4x8+ia7BIm3xHHxO5Y0eawJPci/N5/sbBWAfrA tXYSW22pdT5pIPSJcApgeJjlm9oPPLF9lCeqXIZflJ5q5bwt8AHUOWPbXQQzktsMnP 5b3JeCRIxMg7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHl2dy0z9rxL; Thu, 5 Oct 2023 23:36:35 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:49 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e2c0492ccb..fade383ca7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5246,6 +5246,39 @@ (define-public suitesparse-camd ordering.") (license license:bsd-3))) +(define-public suitesparse-colamd + (package + (name "suitesparse-colamd") + (version "3.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "COLAMD"))) + (add-after 'chdir '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 "../COLAMD/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 Thu Oct 5 21:34:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54510 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 A15CD27BBEB; Thu, 5 Oct 2023 22:38:17 +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 1F49E27BBE2 for ; Thu, 5 Oct 2023 22:38:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2W-0003DP-8P; Thu, 05 Oct 2023 17:37:48 -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 1qoW2U-0003BC-Jg for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:46 -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 1qoW2U-00043H-BG for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2m-0002cr-N8 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 07/20] gnu: Add suitesparse-ccolamd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418299872 (code B ref 66129); Thu, 05 Oct 2023 21:38:04 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:09 +0000 Received: from localhost ([127.0.0.1]:48730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1t-0002Z2-4b for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:09 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1k-0002Vp-Gp for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 73B61240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541796; bh=0tFxqp7jVErgrhevtKbu11fxdyPjcbcwC+g5daOmKtE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=XVbjlsl9hKk4G/gIzPJCWECpOAJlwiyQKsZBFNZ563zm8jiiWa+7VfgZ0kUi8LONC 1ZTFspaR2gHwTVxSpF1TAwWBV7+PoSOG80SPJnQFj4djL60N67K0LnbRjchQxjfvn8 KNzGr0lEvDxa5Q7ishUSWbEBkNwts8OFmLjfB/vtQwaMTv3ySCbCleLzznkC0I0U70 PK7Gsl+OsHgoxJsZ17Pk1krbaKqYt6cY5Jxm5jAKuuc/U4sLJS90v4ZE4AvXslR0Pu li7G5NVyFvbfSCmeTh48TsTA6G+7Ht7T1P6iFHuStuBZzO6MOFA9LbCgZQfRB8+0Li G2R9ICe6BiIfQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHm0pC1z9rxK; Thu, 5 Oct 2023 23:36:36 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:50 +0000 Message-ID: <820167c09777373cda5294f448b7908722e1beb6.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fade383ca7..30d6351a0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5279,6 +5279,40 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CCOLAMD"))) + (add-after 'chdir '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 "../CCOLAMD/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 Thu Oct 5 21:34: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: 54518 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 0EF4C27BBEB; Thu, 5 Oct 2023 22:38: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=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 9C21A27BBE9 for ; Thu, 5 Oct 2023 22:38:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2W-0003Dh-Kt; Thu, 05 Oct 2023 17:37:48 -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 1qoW2V-0003Bu-EH for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:47 -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 1qoW2V-00043f-4m for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2n-0002d5-HO for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 08/20] gnu: Add gklib. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418339899 (code B ref 66129); Thu, 05 Oct 2023 21:38:05 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:13 +0000 Received: from localhost ([127.0.0.1]:48736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1x-0002ZZ-3l for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:13 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1l-0002Vq-97 for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:02 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3800B240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541797; bh=DUxg/yVu+HeE6EzxgfLgVH1xwcNROGG+BtftuakaMS8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=qGrbApuHKkozCOO3ufkucYOKF46vffBvIFoTlYthNXKpER3LUq907wvQdEoKz0Ijr HWnpJpbyXY29NPUvoWI//nH5k/2pqWcNm7kIPP2Vmb/gjeBgQUdn+FrZmtSh2ZKSCd pmyE/NVaj+HvQmbMzwxwmobNie2sE5oi347axeZcXyBp1CKS23MSkP3+u2491d1auN T5nqKKnN5yD/J1eNZvjvc1o6yHCMT9Si4OUCERg58dEi+DLWebALE/DUHXEYKJgb9h LpCtE0CV7g7BXyb3U/Y/fuR5Zj+qC5yaq1wWkRkfFa45MaP6RS4jjbax+GAuReJBWK U+1LivKlvKT3Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHm654sz9rxL; Thu, 5 Oct 2023 23:36:36 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:51 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 30d6351a0a..cef899fc8a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4344,6 +4344,42 @@ (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" + #$@(if (target-x86?) + '() + '("-DNO_X86=1"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-march=native + (lambda _ + (substitute* "GKlibSystem.cmake" + (("-march=native") ""))))))) + (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 Thu Oct 5 21:34: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: 54508 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 6395827BBE2; Thu, 5 Oct 2023 22:38:14 +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 C1E6F27BBEA for ; Thu, 5 Oct 2023 22:38:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2U-0003B5-Dz; Thu, 05 Oct 2023 17:37:46 -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 1qoW2S-0003A4-Sw for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:44 -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 1qoW2S-00042S-KY for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2l-0002cN-0s for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 09/20] gnu: Add metis-5.2. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418269819 (code B ref 66129); Thu, 05 Oct 2023 21:38:02 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:06 +0000 Received: from localhost ([127.0.0.1]:48715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1p-0002Y6-6F for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1i-0002VZ-9l for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:36:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 20D8B240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541798; bh=l2QGEWfJsHPv9LXeye+9LMerVkls6pFsJuApH/lL7Ns=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=WjbVvaBlXvqnhq/a8OfwboHd6EfJOWmT7ThGYDNC7Lk8IEIM+YAU6MaoJpKK7F/Ij kPuKquwTIUNqKdF2ajuVKNrpp4WT7saqvUDOfiDxLeiEg33mrcwAyIoks7GSNpmQVD z0dGc4mK6b66E/IioIm60qAXO4ozybdhWqIsN/AqGoJieeESl1o5fB23Nr6IKoHszp jtlmlacYAn6mtk0iz6hGXljx0RfPZCDq94ytLKLUq94bZbLcIcO7WdPd3UsxNLjTf2 7xc8DmXXEIRWJKYQ5NoMhLm3W1dsuiNK45BP5gi4T8w0VnCA6QIAXtJscfndsLJYaH F/tYqvxvpI0jw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHn4Zcwz9rxH; Thu, 5 Oct 2023 23:36:37 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:52 +0000 Message-ID: <5dd10e61fd6612e04353b474e5dcf134b27bb8d0.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 cef899fc8a..76d770466f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4381,6 +4381,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") @@ -4414,6 +4415,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 Thu Oct 5 21:34: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: 54515 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 7F76827BBEA; Thu, 5 Oct 2023 22:38: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 BD76827BBE2 for ; Thu, 5 Oct 2023 22:38:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2b-0003H6-Hi; Thu, 05 Oct 2023 17:37:53 -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 1qoW2W-0003DR-AG for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:48 -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 1qoW2W-000444-1f for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2o-0002dK-EI for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 10/20] gnu: Add gklib-suitesparse. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418349914 (code B ref 66129); Thu, 05 Oct 2023 21:38:06 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:14 +0000 Received: from localhost ([127.0.0.1]:48740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1x-0002Zj-So for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:14 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1n-0002W5-GN for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E2B9B240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541798; bh=chkAOVDLOZZpdCNoxYMsAqPweQ4MNK3Y1HKjzXOV5+U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=CBkk9mVVVXMx/j0TdzfAXS1vBJun9p8vV0EFoFPoZH8HmMA+fYAfVOqTiFcTrifTn MT7LQxLS420RCM/hvs+g8ZiR0pTVK+lceJApZR2a4nfpwZxwvbqrgA6FXTwwLW8L5q qlOlGjBLkDe1RX9rk2X8527aik2oS7YVr5zp4LUbCMLWAgm8nk4ZvSyyLwqCS4wFHg gjH0ZlxCphwz/JMks4r0QR6s35wzYsI/cj2T08fy+fZFiBA2KweWkFmPtD/c9LU5cg aEKUsRhGZzf57Lar4Ew086fW3p7lU280RxgaxKeilFbRepvHz2t7ua5gHW24rAlYcx G4x4nZWH7iVPA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHp3dc2z9rxL; Thu, 5 Oct 2023 23:36:38 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:53 +0000 Message-ID: <62cc2ef0bb3d731697494694dabb74fe946d2fc0.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 76d770466f..a096b24cfe 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5397,6 +5397,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 Thu Oct 5 21:34: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: 54513 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 8727D27BBE2; Thu, 5 Oct 2023 22:38: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=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 D5E5927BBEA for ; Thu, 5 Oct 2023 22:38:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2Z-0003GI-QN; Thu, 05 Oct 2023 17:37:51 -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 1qoW2W-0003Dl-QO for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:48 -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 1qoW2W-00044G-I1 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2o-0002dS-VG for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 11/20] gnu: Add metis-suitesparse. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418349920 (code B ref 66129); Thu, 05 Oct 2023 21:38:06 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:14 +0000 Received: from localhost ([127.0.0.1]:48742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1y-0002Zr-Dr for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1n-0002W7-ON for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A763A240027 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541799; bh=0XrOBzYTvCj/21mlvg585BEQ7AqBdrLfZhREVmVq3F8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=QSGJE/lvKBe9oO7hVQ8PsMmx5MKg4fF4td82uvToTPmVj57+8xFGtjP0GXyQaG1Py tED7LH1oc+BDUWTPWnEJXxQfl3HFbSJSkcOjAS2me4W1vq9dDjgVyREX87YU+r7GrJ NBCVQeu2P3VNaAtQJoCwKpKM3kUiJG+lWpAhlDjp6kAqA40AniM2qAmxxiAitFbhgp by3oP1YNK/sPMX/mvg5BLFkoMaTHV0a/34SqcGzYbTgO35cxhZKSj1xCGWmuQ5ZbaQ A06bCPLvstIXJG/aIkqfGn90f/9cI3Mx6O5Aftj3ehgFlpqnYwqkszkl/LUbc489YD BMRrOQvwK4M9g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHq1q7mz9rxL; Thu, 5 Oct 2023 23:36:39 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:54 +0000 Message-ID: <24b9257141e62a20c5ab20943b496f6ba37f2687.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 a096b24cfe..e2018d4540 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5422,6 +5422,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 Thu Oct 5 21:34: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: 54509 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 72FE427BBE9; Thu, 5 Oct 2023 22:38:16 +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 7B22227BBE2 for ; Thu, 5 Oct 2023 22:38:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2W-0003DN-5z; Thu, 05 Oct 2023 17:37:48 -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 1qoW2T-0003Ac-Qc for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:45 -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 1qoW2T-00042p-IB for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2l-0002cc-VG for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 12/20] gnu: Add suitesparse-cholmod. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418279850 (code B ref 66129); Thu, 05 Oct 2023 21:38:03 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:07 +0000 Received: from localhost ([127.0.0.1]:48725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1q-0002Yc-Si for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1j-0002VZ-8i for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:00 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6570F240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541800; bh=J3fYxWt0aFI82e0XzABoC5fpLCn/vJQseWzdu/ah98k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ezS2qJC4e5wjymfd2PnBoZQ7VsvBVllpiQ/KB7XpYsYfcXTCCW8OScRDAuPSs3mCx w7nG6YOtkHVmckaLivviy42vc5+yFaTlhnNPZk/Fp+7e4MHNvzXl0b1ANNywtO2YVN 4EX2/JsRn1GmjP0jFJvuyfJKYwUq0ZWfyjc1Oz2JslKcbwqf69liLUQyT9/88WeZdQ /7JqaE134jhULuSs5XV6TblIWBxwybqIy2jV+FP9I5jcvDklqYJ5bipG3UGMa6zOmr fhDi1PrPdEduKAINzIoffBsjDH+n7JWTFF34K5ggafmV8K2UMJNTapDCWuoBBKfvkA efSPmni3Mj31A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHr097Rz6tvc; Thu, 5 Oct 2023 23:36:40 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:55 +0000 Message-ID: <1649491d0950adcd3e86012a40a128c17169fef7.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e2018d4540..ad08f36931 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5448,6 +5448,91 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CHOLMOD"))) + (add-after 'chdir '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 'chdir '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 "../CHOLMOD/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../CHOLMOD/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 "../CHOLMOD/Doc/License.txt" out) + (install-file "../CHOLMOD/Core/lesser.txt" out) + (install-file "../CHOLMOD/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 Thu Oct 5 21:34: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: 54514 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 68A2127BBEC; Thu, 5 Oct 2023 22:38: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=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 D764827BBEA for ; Thu, 5 Oct 2023 22:38:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2Z-0003Ft-Fd; Thu, 05 Oct 2023 17:37:51 -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 1qoW2Y-0003FM-3N for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:50 -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 1qoW2X-00044q-RF for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2q-0002dp-7c for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 13/20] gnu: Add suitesparse-cxsparse. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418369943 (code B ref 66129); Thu, 05 Oct 2023 21:38:08 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:16 +0000 Received: from localhost ([127.0.0.1]:48748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1z-0002aD-ND for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:16 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1p-0002WR-6h for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:06 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1D6F9240028 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541801; bh=4N20ZXo+VFDbLQqkHc8lLSjIwEtQFOzjHJ+jiYV3lYg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=EZygckkSybbSeMnfFk2LWLsG3xLsCwvQ16UKKx7n3w00YLALTlAe3FKMDEXn4PDQT CexUrwj/K09xMBX8FKcbVFDyUcfTNQC6VNZkuIRocHpQ0NcwVrb8WwG2oEKfkjbpD8 wXSZrCtbGDseDWdtRJynv7YnkZRzRKDuNjnHUqISBI1WhsQv+2iOrdIQ8sEZ4eLQqa L9HOTen4ayi4xwnhM5qtyOImlx7wQyEaq5kJMxsCLKHTQa/ijbidBbe5sWmgvBGQ70 fO1hqFkkuNWkGGDBTiCovONmAfXEcPa2hVX2MQ1qN/8yDfwHdpVHr8P4I4fS6Whjoa JJIoKmj8Hfr2w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHr5DdFz6tvc; Thu, 5 Oct 2023 23:36:40 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:56 +0000 Message-ID: <05737981063c3d219e7b84555902122981f6440c.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ad08f36931..b2da54239f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5533,6 +5533,40 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CXSparse"))) + (add-after 'chdir '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 "../CXSparse/Doc/License.txt" out) + (install-file "../CXSparse/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 Thu Oct 5 21:34: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: 54506 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 7B8D627BBEA; Thu, 5 Oct 2023 22:38:03 +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 A584227BBE2 for ; Thu, 5 Oct 2023 22:38:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2a-0003GZ-44; Thu, 05 Oct 2023 17:37:52 -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 1qoW2Y-0003FW-Fm for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:50 -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 1qoW2Y-00045F-7o for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2q-0002dw-Kp for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 14/20] gnu: Add suitesparse-klu. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418369951 (code B ref 66129); Thu, 05 Oct 2023 21:38:08 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:16 +0000 Received: from localhost ([127.0.0.1]:48750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW20-0002aK-3v for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:16 -0400 Received: from mout01.posteo.de ([185.67.36.65]:44829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1p-0002Wf-V3 for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:07 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D9662240027 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541801; bh=TNDCetoHG9YYtM3R4gkAIBzt5hZuD47V8aP0Xi/djTg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=PivfgiTD2zDnD57vK+xAJT91IRlGF6n3m7OaHoC6clH1KtPF2ETQW6F8ODzdJ8Om1 4R7nT+d+kfRooqM0Il1rsH/XHxs/PJHdkjgHL/xmZETvuBHWwoIDZK01mpyQZWdM9J K+JgwxYR22bYDzgwaxTs680M92GDta/09OgD4rsm4etiF5jCuIhm5KLRHEgnP4AqTP 2pm7nAxJMFSF5f3pPRtsZX/00leqD3Ur204z8gEm/3FMfZNtHAy6XRY4oCnT6autC5 r3jbCapbBeJ4I2JfjGfdSYptM8/3L93ekMrhvDZdbJNZXTh+pohyIytBSWAh5iV2gJ G33/GbpYjZaig== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHs36T0z9rxP; Thu, 5 Oct 2023 23:36:41 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:57 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b2da54239f..9e52207512 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5567,6 +5567,69 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "KLU"))) + (add-after 'chdir '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* "../KLU/Doc/Makefile" + (("\\.\\./\\.\\./BTF/Include/btf.h") + (string-append #$suitesparse-btf "/include/btf.h"))) + (with-directory-excursion "../KLU/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../KLU/Doc/KLU_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../KLU/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 Thu Oct 5 21:34: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: 54511 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 EDF0B27BBEA; Thu, 5 Oct 2023 22:38:19 +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 5AD5E27BBE2 for ; Thu, 5 Oct 2023 22:38:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2W-0003Dc-Gx; Thu, 05 Oct 2023 17:37:48 -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 1qoW2U-0003BX-Us for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:46 -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 1qoW2U-00043P-MU for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2n-0002cy-2h for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 15/20] gnu: Add suitesparse-ldl. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418309879 (code B ref 66129); Thu, 05 Oct 2023 21:38:05 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:10 +0000 Received: from localhost ([127.0.0.1]:48732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1t-0002ZB-Kt for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:10 -0400 Received: from mout02.posteo.de ([185.67.36.66]:57719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1l-0002Vl-F0 for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:02 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9519B240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541802; bh=/gNFm5ii0ymmw4v1mqvzTgvgZOyWQ9uTzGifeG5Iv8M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ChvgtPpxlkZ/Tg1Q+0QiYxuqQbZAiegHMrBvSGjD/hYnUVZn7uwC4XMiC9kt0hsKQ 7yfxQSbgzeNWfSXBSbc+htYjyaLibPsVvY1sjrsIaTwWq/8AEri6FIlvWcc4gPk3aQ IiBBcn+hC/J8OiJVl/Gcgfj/F//6h2e/SllNX05PssKv9aGn2nS+CpbHITlLorQTdD 5buXw0uxsOjTyhDQnwVhTJpzEYDEB7Pp9YpGNNXTL9u7M1umKBgXLLb7sWmvivGQod +Hq5jx5/GYWEDwz3WpMKjfHmMHZknC1vo7avvIby7jWP2X0i2MWCJcQnGXVahyx08c 9HPSjWjpaRzWg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHt1Ltvz9rxQ; Thu, 5 Oct 2023 23:36:42 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:58 +0000 Message-ID: <1804c0e57e4fc90037c0162b36f7638bed3c433a.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9e52207512..988bf28ac2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5630,6 +5630,60 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "LDL"))) + (add-after 'chdir '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* "../LDL/Doc/Makefile" + (("\\.\\./\\.\\./BTF/Include/btf.h") + (string-append #$suitesparse-btf "/include/btf.h"))) + (with-directory-excursion "../LDL/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../LDL/Doc/ldl_userguide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../LDL/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 Thu Oct 5 21:34: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: 54517 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 9F49227BBEA; Thu, 5 Oct 2023 22:38:38 +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 04AA927BBE2 for ; Thu, 5 Oct 2023 22:38:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2b-0003Hv-Bn; Thu, 05 Oct 2023 17:37:53 -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 1qoW2Y-0003Ff-VG for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:51 -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 1qoW2Y-00045S-NL for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2r-0002e5-3i for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 16/20] gnu: Add suitesparse-rbio. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38:09 +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.16965418379958 (code B ref 66129); Thu, 05 Oct 2023 21:38:09 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:17 +0000 Received: from localhost ([127.0.0.1]:48752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW20-0002aS-JG for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:16 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1r-0002X3-Dv for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:09 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 58FD4240028 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541803; bh=kU/59wtXys/xiaMseXv7cmces7aWYwZaQpf66eyNyPs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=LtaULI6ye+qHJaEoj6cAt0GwBeLsO3nC6nCqjfKIy5/4rqeIwi1zNLZUEcfnBC7K7 CC3ScGXIudVLTQpzwdLxjYM4w/ik88voW+aormSxHi0Oz2OngQvVYs4ndbVkNf/ts4 pOuFwCErQLY3PlFrydxk43gqLrBHIjo5nDQ4z1dPMs+wcOGcArFrh47Ci86mINyjW0 8Js3DSapB13sUH4kXuHnjfLneYdT7rnWwJHNR58F/FbX/tYVXZXsc43DBWZb3DO8pM Fsjs/G80L1sXUdC4pLJxPefTYHTk3PxcPlRzuFVrVaR+EdgAPmaCZzLCUmdZ8xanqA JJeRmONUMqjyg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHt6hnkz9rxQ; Thu, 5 Oct 2023 23:36:42 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:34:59 +0000 Message-ID: <04c0796fdb0b6afc6c68eae4aafcbdd5d9e34a1b.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 988bf28ac2..2cb1f01358 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5684,6 +5684,44 @@ (define-public suitesparse-ldl code.") (license license:lgpl2.1+))) +(define-public suitesparse-rbio + (package + (name "suitesparse-rbio") + (version "4.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "RBio"))) + (add-after 'chdir '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 "../RBio/Doc/License.txt" out) + (install-file "../RBio/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 Thu Oct 5 21:35: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: 54519 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 D20F627BBE9; Thu, 5 Oct 2023 22:38: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 62E2A27BBE2 for ; Thu, 5 Oct 2023 22:38:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2W-0003Do-TU; Thu, 05 Oct 2023 17:37:48 -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 1qoW2V-0003D5-Ss for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:47 -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 1qoW2V-00043r-JM for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2o-0002dD-0N for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 17/20] gnu: Add suitesparse-mongoose. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418349906 (code B ref 66129); Thu, 05 Oct 2023 21:38:05 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:14 +0000 Received: from localhost ([127.0.0.1]:48738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1x-0002Zc-FN for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:13 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1m-0002Vp-Vi for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1EF19240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541804; bh=eiOoAbXOOUKqHfVXgqr6CtWSOKhzphawJz4kHm+OhIE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Uo0GRmSEJwViVMh06FOScIGRdGzV2J2MSI6ZkpTCNtrnxJ6Kq2EbIpf8/A9S7ZsON Ub88OkQoGI4/CQF4Ws9H8+05N1RK4htoQPISBpumcy/8IC6apf9IXej+pxVc8LYltu ZDHgqDYcjnMPu6MDzjG67z1p/OKhBKNPcMb4soM/ZPfM+xPs+SoojwV13JZngg2hjB 6l5S9Rt2eZWaQ/QNQWAhaXG+fERLH7kDUMBmk3Edxgv2F+HHr+S8ZuYjisQdrr43OR +sXZlx477AI9m1daOeHAyavbkQelJfhFj5q/0+RoQWUkQfzSP3rbZsT13YUtDngKxd 91LhHNhEqg1sQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHv52dFz9rxQ; Thu, 5 Oct 2023 23:36:43 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:35:00 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2cb1f01358..9a013825de 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5722,6 +5722,81 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "Mongoose"))) + (add-after 'chdir '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 "../Mongoose/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 "../Mongoose/Doc/Mongoose_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../Mongoose/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 Thu Oct 5 21:35: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: 54521 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 5AA5327BBEA; Thu, 5 Oct 2023 22:39:02 +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 6BA7F27BBE2 for ; Thu, 5 Oct 2023 22:39:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2Z-0003Fo-8B; Thu, 05 Oct 2023 17:37:51 -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 1qoW2X-0003EQ-8V for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:49 -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 1qoW2X-00044Q-08 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2p-0002dZ-DF for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 18/20] gnu: Add suitesparse-spex. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418359928 (code B ref 66129); Thu, 05 Oct 2023 21:38:07 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:15 +0000 Received: from localhost ([127.0.0.1]:48744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1y-0002a2-PH for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:15 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1n-0002Vq-Mu for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id CFABF240101 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541804; bh=K+pN6WAcj9J+O7YAbesH4vrclQYHGXQqnJC6MmViivU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=f2SwVgNim3ytZ86YiNe/xDGvUfKlHA2HW27C9jWIdHbNx8zOmiLF5qKHAoZQzorTr iblRnBZMTKTe4+HcstFNNqId1caxzqSZuVYP6mIUQF2hre5OJrc0WIh20huToCGe/U q0Ex26BTtjm4BGBgwOv/m0vddsVhtbpUMPyT3DyQz8uyj3BiR9WmVZrmoGpGCMET30 jcHPTEO2AqKQiJdkwd5tsazyPKt9CSo4aQCzi5OIYmosUPqKv6o4+3SlrBEAnMF1ij o6Mkom42PwCai9VC7Fuoe7QkSgFyFArscExktsxA+GrRK5DBCnyEyUw1QuYzw9cIoF bf2pnO99jUTGw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHw39Cpz9rxQ; Thu, 5 Oct 2023 23:36:44 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:35:01 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9a013825de..b41b2be6e9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5797,6 +5797,76 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "SPEX"))) + (add-after 'chdir '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 "../SPEX/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../SPEX/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 Thu Oct 5 21:35: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: 54516 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 338E627BBEA; Thu, 5 Oct 2023 22:38:36 +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 9A41C27BBE2 for ; Thu, 5 Oct 2023 22:38:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2b-0003IN-L2; Thu, 05 Oct 2023 17:37:53 -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 1qoW2Z-0003Fp-C1 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:51 -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 1qoW2Z-00045b-4C for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2r-0002eD-HC for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 19/20] gnu: Add suitesparse-spqr. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38:09 +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.16965418379964 (code B ref 66129); Thu, 05 Oct 2023 21:38:09 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:17 +0000 Received: from localhost ([127.0.0.1]:48754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW21-0002aZ-0B for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:17 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1t-0002Xx-R0 for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:10 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8EB95240027 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541805; bh=RD6ekbPPI6QL7XyIHfRgwdFKYVmvS28AsPR4ax+AVDk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=KbJSTFwwGdCqitN9tHtbIXE5CDXNmvPYrnqgjYcvKEKmAcgPVTsDLbQSV0d++fyzf BxQGuYPZuWuI1dNo4inwGCoF9Jfg/DZp9qoDhlBwAbDcziNoedlJUZrfxvz53AHnBe yOELvAmBLWI3yV6UoYYMp5gFEjyr1Bfvgw/ikDE/a1NM/57o6XhjtA8y3EnCKSwaav mD4ZF18sIoJp/bupBFRVGvfUP4vgaiDesNZAUQzJmCKRGdpp9UJ5j4AzCW8gzfcKKn CBzo+1k3nlZ/r7Jngw5IiYsGEq4wbwIzN7uxiCVE0BaiEw3h1Ro4v8c5A16jIHIyoy tjsyPBqGJzERg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHx1HBGz6tvd; Thu, 5 Oct 2023 23:36:45 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:35:02 +0000 Message-ID: <580f0ce4bdf76aef46b5bcf611f0e12ebeb566cc.1696541452.git.david.elsing@posteo.net> In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b41b2be6e9..fa0bd2d406 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5867,6 +5867,68 @@ (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-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "SPQR"))) + (add-after 'chdir '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 "../SPQR/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../SPQR/Doc/spqr_user_guide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../SPQR/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 Thu Oct 5 21:35: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: 54520 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 E5B1F27BBEA; Thu, 5 Oct 2023 22:38:59 +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 53A0B27BBE2 for ; Thu, 5 Oct 2023 22:38:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoW2Z-0003Fi-5B; Thu, 05 Oct 2023 17:37:51 -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 1qoW2X-0003F9-Ma for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:49 -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 1qoW2X-00044c-E9 for guix-patches@gnu.org; Thu, 05 Oct 2023 17:37:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoW2p-0002di-QO for guix-patches@gnu.org; Thu, 05 Oct 2023 17:38:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66129] [PATCH v3 20/20] gnu: Add suitesparse-umfpack. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:38: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.16965418359936 (code B ref 66129); Thu, 05 Oct 2023 21:38:07 +0000 Received: (at 66129) by debbugs.gnu.org; 5 Oct 2023 21:37:15 +0000 Received: from localhost ([127.0.0.1]:48746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1z-0002a5-8O for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:15 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoW1p-0002Vp-4j for 66129@debbugs.gnu.org; Thu, 05 Oct 2023 17:37:06 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4803A240103 for <66129@debbugs.gnu.org>; Thu, 5 Oct 2023 23:36:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1696541806; bh=dUAPTpc+To/Sevp3oGnl0yPdebGBBsOeIEbEaBbf43Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=AAJ7P2Tb4HEAv+KbFlm7hJmc+Rg9ECIW5rwW4M9WzsyOFCx78iBLflCSOc3rp8YEY toPDANxNEc42V9TYTxFLw5k+pBrG9oHEy5OuVW3xZP0J9eZFojmVwsa2bLFuk2ByIE 2UTZzd0CxgtyA+XvSbqLEmmGZIhbfW7rthm9ieVDrm9O9Spu05Dpy4A4EvjK9rTK6h M0cxzh2j6yXsoRoZGXR6MU6O+9bQE6LG0qKS4UWK0/pFhseAP9lFbB8QnXboTlLUD5 A3k9aPeDSWNUqLV4sHVcYuRhQGXeRpPdD4Q91beMNJxcGV34+vQ51x3RCZSKVOHN0M DYMkHFIPx9FRg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S1lHx6WLNz6tvc; Thu, 5 Oct 2023 23:36:45 +0200 (CEST) From: David Elsing Date: Thu, 5 Oct 2023 21:35:03 +0000 Message-ID: In-Reply-To: <7ylecgah6b.fsf@posteo.net> References: <7ylecgah6b.fsf@posteo.net> 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 | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fa0bd2d406..e648d43748 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5929,6 +5929,77 @@ (define-public suitesparse-spqr matrices.") (license license:gpl2+))) +(define-public suitesparse-umfpack + (package + (name "suitesparse-umfpack") + (version "6.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "UMFPACK"))) + (add-after 'chdir '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 "../UMFPACK/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (let ((outdir + (string-append #$output "/share/doc/" + #$name "-" #$version))) + (install-file "../UMFPACK/Doc/UMFPACK_UserGuide.pdf" outdir) + (install-file "../UMFPACK/Doc/UMFPACK_QuickStart.pdf" outdir)))) + (replace 'install-license-files + (lambda _ + (let ((outdir + (string-append #$output "/share/doc/" + #$name "-" #$version))) + (install-file "../UMFPACK/Doc/License.txt" outdir) + (install-file "../UMFPACK/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")