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")