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