From patchwork Fri Apr 18 15:14:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 41771 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 D368527BC4A; Fri, 18 Apr 2025 16:18:54 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 2549727BC49 for ; Fri, 18 Apr 2025 16:18:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5nSc-000690-EF; Fri, 18 Apr 2025 11:16:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u5nS5-0005tY-2g for guix-patches@gnu.org; Fri, 18 Apr 2025 11:16:35 -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 1u5nS3-0005yU-Ls for guix-patches@gnu.org; Fri, 18 Apr 2025 11:16:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=J2fzI/+Rzyg4sOQ2ZZdvMcyL9xiJarJMe1BLkow9rK4=; b=IiNnvJwK6l+aw9nYdbD+6jAdsX8o0Vqt9FaP/uwuo1wjI2p/wjsNIiABwAN8KG5mu1jg40Ijes6ch2/OdVi6t/0gVN08Cc6PNs1H2Aa8eatVmEXYfmoLuHV3RT6foHND7cRYE+Ntm1gVKOdkUGwc9JYp885NsR95sXn3U3dzD3RJef5bedwQFc1nGUiYv0dUY6j/Qi5SaHNeS5+wzagWewfZbKMgZ2CPA3ldJ6qR0N2wFOJ4FubkkCk6yXJpnC3c5APwyRrX8Yeou3RvNiPFCViCVzi+krCqpTqt5lKsFbJWJJgYY0vJdAK//T3f5OdqxI7HJY6vkqYo0Xvfu5PN5w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5nRo-0001vn-24; Fri, 18 Apr 2025 11:16:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77902] [PATCH science-team 1/2] gnu: Add %suitesparse-package-versions. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 15:16:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77902 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77902@debbugs.gnu.org Cc: "X-Debbugs-Cc: Andreas Enge" , Sharlatan Hellseher , Greg Hogan , Eric Bavier , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 77902-submit@debbugs.gnu.org id=B77902.17449893246834 (code B ref 77902); Fri, 18 Apr 2025 15:16:07 +0000 Received: (at 77902) by debbugs.gnu.org; 18 Apr 2025 15:15:24 +0000 Received: from localhost ([127.0.0.1]:52484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5nR1-0001jJ-0g for submit@debbugs.gnu.org; Fri, 18 Apr 2025 11:15:23 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:60792) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u5nQZ-0001Yx-Mi for 77902@debbugs.gnu.org; Fri, 18 Apr 2025 11:15:09 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-6eeb7589db4so21132666d6.1 for <77902@debbugs.gnu.org>; Fri, 18 Apr 2025 08:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1744989283; x=1745594083; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J2fzI/+Rzyg4sOQ2ZZdvMcyL9xiJarJMe1BLkow9rK4=; b=cy0NPnPCju9TGIK3BkaoW7gMEygvZK2ArVEwo/z+IYsid7JawMDP36E+AaAmMmESfE SC8oHdWFmc4I7LDxSS6BiHpAjoA9F3wyCS/dzt5Ld4RyNcFgW/EdNeN0TIQD0MKhgIkx AyfrFDEPSmk5HFs7LUt/Y05fnMasxHghQPUiKZ7IStgcKZHD7ugFZ1zyiwQ0fo8kC2H3 l0UfNLhWRliQ96eOaV77QH53+qAv464KqCTmiYLq19ej8U6s7rFSw0LE2MTz0ztLUOlS 0POp78fQdUVLHJGlo5wIIg7oj0VTnjo2QDf8WtB4MHGmDUxORaXeD8h8Lc3eQtupBUqc A54g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744989283; x=1745594083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J2fzI/+Rzyg4sOQ2ZZdvMcyL9xiJarJMe1BLkow9rK4=; b=Vf520wntb8MUyCuklMh4b5sPC92t/gAM+l4nBiNN+gh+2g+dSW1E6oRABJ0jjboKqr NRGjOj07jZ10j5mwoSPF7GYc6r8FL0I0q7v7n8ig8z3MIQWGEtTIIOlS3he9RIQqFEa7 sbK7TPvm6jWvt2yiCvUFDFNtDIXFK5i/uK34p2UyoNqaARyEj1lrKdBKWfWCJJMvhj/B yc5iMbGsI9FDD2eDgqv660TrZ7jFHQsnhalo0tBwBbH2dncw1nu8aeXuctFbEKZW7rgP nKE76jSsnHwIqm750L/SjjN3/aKLtaorL1teiHO2WDZKj57baqeOQnVIs03E8sJOn+yV a2YA== X-Gm-Message-State: AOJu0YwKx8/DQwm9cyNgrfjj7dH9bRriRSYWg0l2aFWTXToJdjYB8vuE IVX1kowcqWQVwsxhpZHIvDBLPv7zDhn3BP55duZRfc//yv2tG4uLQndOO4USPwLZ7PNyOGfhaUq S X-Gm-Gg: ASbGncuRdu9RvAq7EDQNMUNOypdI60LdxdJ2UT/QMvCpiSGYKCwARsB7h0/IHfTQa86 9C4SWDLsKr6rGsfD5cX80/fiNntqexwb3llrtMXYlCvFClPX2PsGPPhM9C5X7NXLvRsgJhdFxc0 9jDyTQE+tJ0TdLOgMw7HjrYvM4bJvXr/9IpReBF6PSD5ErqMA35cTI/bNQ0tzQJZGhfo34Us2XD lElrXZbLnUzFx6r1EEIUm+q8rgwTWVnogI8njh+L8F+p5tV/D5NlLDVx9SZchX9xLZZH/p4FJMN MLnZQUF5Eg4QCYjBsglGVvXAU1ywLX65SKMgBnitSlEhg3HU3rSCN1POYrgHY7f0R7VpmLeAVKQ LBgL2p4PEJ2vz58+YNq/lnTH60FcsG37ebeeRNziS X-Google-Smtp-Source: AGHT+IFc4KD9rjjys2pgG9FyUD+xsrCYQIsWl9IAZ8IOiUSLLnlK9VVjX8pFEYeYawVIlLlaFQCqQA== X-Received: by 2002:a05:6214:c2f:b0:6e8:ed7f:1a79 with SMTP id 6a1803df08f44-6f2c463fda7mr56769936d6.32.1744989283094; Fri, 18 Apr 2025 08:14:43 -0700 (PDT) Received: from ip-10-117-149-49.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f2c2b0f80asm11563896d6.45.2025.04.18.08.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 08:14:42 -0700 (PDT) From: Greg Hogan Date: Fri, 18 Apr 2025 15:14:09 +0000 Message-ID: <0199e4a26c0ac3f0c07c9e80963f4562f49544e3.1744988258.git.code@greghogan.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (%suitesparse-package-versions): New variable. (suitesparse-version): Update to 7.10.2. (suitesparse-source)[origin]: Update deletion list. (suitesparse-amd, suitesparse-btf, suitesparse-camd, suitesparse-colamd, suitesparse-ccolamd, suitesparse-cholmod, suitesparse-cxsparse, suitesparse-klu, suitesparse-ldl, suitesparse-rbio, suitesparse-monUse goose, suitesparse-spex, suitesparse-spqr, suitesparse-umfpack) [version]: Use %suitesparse-package-versions. (suitesparse-cholmod)[arguments]<#:phases>('install-license-files): Update paths. (suitesparse-klu)[arguments]<#:phases>('build-doc): Update paths. (suitesparse-spex)[native-inputs]: Add texlive-fncychap. (suitesparse-spqr)[native-inputs]: Add texlive-etoolbox. * gnu/packages/patches/gklib-suitesparse.patch: Update version and path. Change-Id: I14a9bfeddb37330c88a2e94b0992c2f1afbc5310 --- gnu/packages/maths.scm | 64 ++++++++++++-------- gnu/packages/patches/gklib-suitesparse.patch | 6 +- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4be9e71320..4cfcd5ba9e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6060,9 +6060,25 @@ (define-public openspecfun ;; public domain software. (license (list license:expat license:public-domain)))) +(define %suitesparse-package-versions + '(("AMD" . "3.3.3") + ("BTF" . "2.3.2") + ("CAMD" . "3.3.3") + ("CCOLAMD" . "3.3.4") + ("CHOLMOD" . "5.3.2") + ("COLAMD" . "3.3.4") + ("CXSparse" . "4.4.1") + ("KLU" . "2.3.5") + ("LDL" . "3.3.2") + ("SuiteSparse_Mongoose" . "3.3.4") + ("RBio" . "4.3.4") + ("SPEX" . "3.2.3") + ("SPQR" . "4.3.4") + ("UMFPACK" . "6.3.5"))) + ;; Source for the modular SuiteSparse packages. When updating, also update the ;; (different) versions of the subpackages. -(define suitesparse-version "7.2.0") +(define suitesparse-version "7.10.2") (define suitesparse-source (origin (method git-fetch) @@ -6072,10 +6088,12 @@ (define suitesparse-source (file-name (git-file-name "suitesparse" suitesparse-version)) (sha256 (base32 - "1draljn8i46862drc6008cnb2zjpklf74j8c34jirjazzpf53kaa")) + "1ndwx2cp5zxrikq4xdrzjrxk1b5ps7lyi6qw34m8jpfpa0ba01ln")) (modules '((guix build utils))) (snippet #~(begin + ;; Empty except for a .gitignore. + (delete-file-recursively "build") ;; Delete autogenerated and bundled files (for-each delete-file (find-files "." "\\.pdf$")) ;; ssget @@ -6086,19 +6104,13 @@ (define suitesparse-source (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 @@ -6144,7 +6156,7 @@ (define-public suitesparse-config (define-public suitesparse-amd (package (name "suitesparse-amd") - (version "3.2.0") + (version (assoc-ref %suitesparse-package-versions "AMD")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6192,7 +6204,7 @@ (define-public suitesparse-amd (define-public suitesparse-btf (package (name "suitesparse-btf") - (version "2.2.0") + (version (assoc-ref %suitesparse-package-versions "BTF")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6225,7 +6237,7 @@ (define-public suitesparse-btf (define-public suitesparse-camd (package (name "suitesparse-camd") - (version "3.2.0") + (version (assoc-ref %suitesparse-package-versions "CAMD")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6270,7 +6282,7 @@ (define-public suitesparse-camd (define-public suitesparse-colamd (package (name "suitesparse-colamd") - (version "3.2.0") + (version (assoc-ref %suitesparse-package-versions "COLAMD")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6303,7 +6315,7 @@ (define-public suitesparse-colamd (define-public suitesparse-ccolamd (package (name "suitesparse-ccolamd") - (version "3.2.0") + (version (assoc-ref %suitesparse-package-versions "CCOLAMD")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6386,7 +6398,7 @@ (define-public metis-suitesparse (define-public suitesparse-cholmod (package (name "suitesparse-cholmod") - (version "4.2.0") + (version (assoc-ref %suitesparse-package-versions "CHOLMOD")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6448,7 +6460,7 @@ (define-public suitesparse-cholmod (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/Check/lesser.txt" out) (install-file "../CHOLMOD/MatrixOps/gpl.txt" out))))))) (inputs (list gklib-suitesparse @@ -6471,7 +6483,7 @@ (define-public suitesparse-cholmod (define-public suitesparse-cxsparse (package (name "suitesparse-cxsparse") - (version "4.2.0") + (version (assoc-ref %suitesparse-package-versions "CXSparse")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6505,7 +6517,7 @@ (define-public suitesparse-cxsparse (define-public suitesparse-klu (package (name "suitesparse-klu") - (version "2.2.0") + (version (assoc-ref %suitesparse-package-versions "KLU")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6537,7 +6549,7 @@ (define-public suitesparse-klu (lambda _ (substitute* "../KLU/Doc/Makefile" (("\\.\\./\\.\\./BTF/Include/btf.h") - (string-append #$suitesparse-btf "/include/btf.h"))) + (string-append #$suitesparse-btf "/include/suitesparse/btf.h"))) (with-directory-excursion "../KLU/Doc" (invoke "make")))) (add-after 'install 'install-doc @@ -6569,7 +6581,7 @@ (define-public suitesparse-klu (define-public suitesparse-ldl (package (name "suitesparse-ldl") - (version "3.2.0") + (version (assoc-ref %suitesparse-package-versions "LDL")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6622,7 +6634,7 @@ (define-public suitesparse-ldl (define-public suitesparse-rbio (package (name "suitesparse-rbio") - (version "4.2.0") + (version (assoc-ref %suitesparse-package-versions "RBio")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6660,7 +6672,7 @@ (define-public suitesparse-rbio (define-public suitesparse-mongoose (package (name "suitesparse-mongoose") - (version "3.2.0") + (version (assoc-ref %suitesparse-package-versions "SuiteSparse_Mongoose")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6735,7 +6747,7 @@ (define-public suitesparse-mongoose (define-public suitesparse-spex (package (name "suitesparse-spex") - (version "2.2.0") + (version (assoc-ref %suitesparse-package-versions "SPEX")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6778,6 +6790,7 @@ (define-public suitesparse-spex texlive-soul texlive-multirow texlive-algorithms + texlive-fncychap texlive-float texlive-algorithmicx texlive-cprotect @@ -6801,7 +6814,7 @@ (define-public suitesparse-spex (define-public suitesparse-spqr (package (name "suitesparse-spqr") - (version "4.2.0") + (version (assoc-ref %suitesparse-package-versions "SPQR")) (source suitesparse-source) (build-system cmake-build-system) (arguments @@ -6851,7 +6864,8 @@ (define-public suitesparse-spqr (propagated-inputs (list suitesparse-cholmod)) (native-inputs (list (texlive-updmap.cfg - (list texlive-epsf)))) + (list texlive-epsf + texlive-etoolbox)))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Sparse QR factorization method") (description "The SPQR (SuiteSparseQR) package provides sparse QR @@ -6862,7 +6876,7 @@ (define-public suitesparse-spqr (define-public suitesparse-umfpack (package (name "suitesparse-umfpack") - (version "6.2.0") + (version (assoc-ref %suitesparse-package-versions "UMFPACK")) (source suitesparse-source) (build-system cmake-build-system) (arguments diff --git a/gnu/packages/patches/gklib-suitesparse.patch b/gnu/packages/patches/gklib-suitesparse.patch index 8b6c708b6a..d207f080b1 100644 --- a/gnu/packages/patches/gklib-suitesparse.patch +++ b/gnu/packages/patches/gklib-suitesparse.patch @@ -1,5 +1,5 @@ This patch contains the relevant changes to GKlib made in SuiteSparse -(CHOLMOD) for the version 7.2.0 +(CHOLMOD) for the version 7.10.2 (https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/8a7641cdb4809533c681417e94f98058c07c5da2). The disabling of signal handling when MATLAB_MEX_FILE is defined is omitted. @@ -10,7 +10,7 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) -+find_package ( SuiteSparse_config 7.1.0 REQUIRED ) ++find_package ( SuiteSparse_config 7.10.2 REQUIRED ) + get_filename_component(abs "." ABSOLUTE) set(GKLIB_PATH ${abs}) @@ -25,7 +25,7 @@ diff -ur a/GKlib.h b/GKlib.h +/* -------------------------------------------------------------------------- */ +/* Added for incorporation into SuiteSparse. + Tim Davis, Oct 31, 2022, Texas A&M University. */ -+#include "SuiteSparse_config.h" ++#include "suitesparse/SuiteSparse_config.h" +#define malloc SuiteSparse_config_malloc +#define calloc SuiteSparse_config_calloc +#define realloc SuiteSparse_config_realloc