From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uK1yJ0BoT2cVuwAAe85BDQ:P1 (envelope-from ) for ; Tue, 03 Dec 2024 20:21:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id uK1yJ0BoT2cVuwAAe85BDQ (envelope-from ) for ; Tue, 03 Dec 2024 21:21:20 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=tMvxr9Kg; dkim=fail ("headers rsa verify failed") header.d=inria.fr header.s=dc header.b="csUk/zkA"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=inria.fr (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733257280; a=rsa-sha256; cv=none; b=kOLFY2475kHZkABwPD1eeP3r9HQoaiAVsRW5xmHmkX+ZGwZ6EIrnPmHCOzDjbuRR4iJeqW RnGlvTfZV7XoPOMvX+Vg/6II05q0GxLMRKzL8SQX45qGbz+UATb3aO4atPRgGLYRWjseeQ 8A0vLCd2ZdhTan7qsMcQcIhGWH77NBtBGgq6ruq3xMiKdrj3g8SPo7guuxXb7F+aHo2ivV pv7yd1Oh5cupCxmGax2oX0YDFLoxuYcPcIK+m4wSVhTq9ufaHY7SEKu42wbL8Bj9NUYIpO 8UYuHQTaEh6aogs3BRXTqPWa7840jaEiWfNP3zgWdPWkp6RkFXk7ch4zQrT7bw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=tMvxr9Kg; dkim=fail ("headers rsa verify failed") header.d=inria.fr header.s=dc header.b="csUk/zkA"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=inria.fr (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733257280; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=A0ZJsTsO/nbtTQW79iDUq7wl6guFqJvM7qKHD/EK3w4=; b=WaJ/fph055HBbN21ZT9xt15ACQOipbqE8gnANlT4c4bkhzPzlL227xSruWwnoII9cqzfyG W8vE+LeLeLHGAKfEHxJjn53C4g4i1nQg7A8mewMoPB+5IlablItCMNTLVFQRkSgWp2Dgoa Q2A7UjytG2cWxUkiHWoXI1BFftM+YfdhVS0AVGZwLIMf/DARn/1XeLHHEY82EU1YXB20Nt 7lPUXx11VB3zNv1GBEo+USLP5VZEcW0NHSIUogNTMjlht6Cvh5hT+7ZiI03K8NVeVimahB cYejGnrIa0gC/6FTtCyJd5NzKnW2zR3SvbkYWs/NoiRk50LTm+LGseXhsjKAQQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BFFF080E8B for ; Tue, 03 Dec 2024 21:21:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIZOM-0003lc-Pg; Tue, 03 Dec 2024 15:21:06 -0500 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 1tIZOJ-0003jg-7W for guix-patches@gnu.org; Tue, 03 Dec 2024 15:21:03 -0500 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 1tIZOH-0005ue-Ve for guix-patches@gnu.org; Tue, 03 Dec 2024 15:21:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=A0ZJsTsO/nbtTQW79iDUq7wl6guFqJvM7qKHD/EK3w4=; b=tMvxr9KgDcDV1HhuYABRKne5TDvxTg65zIpjsW/mzGm3dBTq7hFZ3ZFUbqSAkUknLGHCksa8P5DzpqmcGtpwOrHkl2UZNSCX6bqMKBSZ8OZ13OPPQXkLBSRFLP6h/0if/EUpT40Aw7eTqsyA8tiHApYQSqrLSLFBpGBWWZXoeb70X2th/ZIf8jCMlzt0MjwyiiOUubLbLgb8Cy1niXTh1lVF6pOQD6MIaPEbCkf2JICIda7Ra4LBYw9CgOqT1W2Gf3rE7updCcxGb7wbG/4+PzAnFeKw7arEvvhZCG2DtJt3IizrF3wyXNR0ZRn07P3QHOH4BUzEn7H765xgy7P7eA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIZOH-0001kR-PS for guix-patches@gnu.org; Tue, 03 Dec 2024 15:21:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74675] [PATCH 1/1] Add a hypre-sans-doc package, make hypre inherit from it, and add a variant hypre-openmpi-sans-doc. References: <20241203201618.5533-1-luca.cirrottola@inria.fr> In-Reply-To: <20241203201618.5533-1-luca.cirrottola@inria.fr> Resent-From: Luca Cirrottola Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Dec 2024 20:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74675@debbugs.gnu.org Cc: Luca Cirrottola Received: via spool by 74675-submit@debbugs.gnu.org id=B74675.17332572356670 (code B ref 74675); Tue, 03 Dec 2024 20:21:01 +0000 Received: (at 74675) by debbugs.gnu.org; 3 Dec 2024 20:20:35 +0000 Received: from localhost ([127.0.0.1]:33067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIZNq-0001jW-G8 for submit@debbugs.gnu.org; Tue, 03 Dec 2024 15:20:35 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:59228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIZNn-0001jD-LS for 74675@debbugs.gnu.org; Tue, 03 Dec 2024 15:20:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=A0ZJsTsO/nbtTQW79iDUq7wl6guFqJvM7qKHD/EK3w4=; b=csUk/zkAFKDUN6oltWQr5rorkazTU93UciD/MvDh10NB5Gf/h0D6IhgN p1qqXeHPAzHZFmTA/7hyF2ZOuQ9sQT72bpIQdLf+D581h2MyOW0r0wVNl 3mTFcsnM/hnRpS/9YIGxBhrx6kuHH/aUzKu2GWU0OiOqexS3k7/nHiLgp U=; X-IronPort-AV: E=Sophos;i="6.12,206,1728943200"; d="scan'208";a="103339927" Received: from 167.152.65.81.rev.sfr.net (HELO canard..) ([81.65.152.167]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2024 21:20:26 +0100 From: Luca Cirrottola Date: Tue, 3 Dec 2024 21:20:13 +0100 Message-Id: <20241203202013.5739-1-luca.cirrottola@inria.fr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: BFFF080E8B X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.10 X-Spam-Score: -3.10 X-TUID: 9vCC7m681WkS --- gnu/packages/maths.scm | 131 ++++++++++++++++++++++++++--------------- 1 file changed, 85 insertions(+), 46 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 893877a5e5..bbc307c286 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7291,9 +7291,9 @@ (define-public xaos (home-page "https://xaos-project.github.io/") (license license:gpl2+))) -(define-public hypre +(define-public hypre-sans-doc (package - (name "hypre") + (name "hypre-sans-doc") (version "2.20.0") (source (origin @@ -7305,6 +7305,63 @@ (define-public hypre (sha256 (base32 "14iqjwg5sv1qjn7c2cfv0xxmn9rwamjrhh9hgs8fjbywcbvrkjdi")))) (build-system gnu-build-system) + (inputs + (list openblas)) + (arguments + (list #:modules `((srfi srfi-1) + ,@%default-gnu-modules) + #:configure-flags #~'("--enable-shared" + "--disable-fortran" + "--without-MPI" + "--with-openmp" + "--with-fei" + "--with-lapack" + "--with-blas") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'chdir-src + (lambda _ + (chdir "src"))) + (replace 'configure + (lambda* (#:key build target configure-flags + #:allow-other-keys #:rest args) + (let* ((configure (assoc-ref %standard-phases 'configure))) + (apply configure + (append args + (list #:configure-flags + (cons (string-append "--host=" + (or target build)) + configure-flags))))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/hypre/lib")) + (setenv "PATH" + (string-append "." ":" (getenv "PATH"))) + (invoke "make" "check" "CHECKRUN=") + (for-each (lambda (filename) + (let ((size (stat:size (stat filename)))) + (when (positive? size) + (error (format #f + "~a size ~d; error indication~%" + filename size))))) + (find-files "test" ".*\\.err$")))))))) + (home-page "https://computing.llnl.gov/projects\ +/hypre-scalable-linear-solvers-multigrid-methods") + (synopsis "Library of solvers and preconditioners for linear equations") + (description + "HYPRE is a software library of high performance preconditioners and +solvers for the solution of large, sparse linear systems of equations. It +features multigrid solvers for both structured and unstructured grid +problems.") + (properties '((tunable? . #t))) + (license license:lgpl2.1))) + +(define-public hypre + (package + (inherit hypre-sans-doc) + (name "hypre") (outputs '("out" ;5.3 MiB of headers and libraries "doc")) ;12 MiB of documentation (native-inputs @@ -7352,57 +7409,18 @@ (define-public hypre texlive-wrapfig texlive-xcolor texlive-xypic)))) - (inputs - (list openblas)) (arguments - (list #:modules `((srfi srfi-1) - ,@%default-gnu-modules) - #:configure-flags #~'("--enable-shared" - "--disable-fortran" - "--without-MPI" - "--with-openmp" - "--with-fei" - "--with-lapack" - "--with-blas") - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'chdir-src - (lambda _ - (chdir "src"))) - (replace 'configure - (lambda* (#:key build target configure-flags - #:allow-other-keys #:rest args) - (let* ((configure (assoc-ref %standard-phases 'configure))) - (apply configure - (append args - (list #:configure-flags - (cons (string-append "--host=" - (or target build)) - configure-flags))))))) + (substitute-keyword-arguments (package-arguments hypre-sans-doc) + ((#:phases phases) + #~(modify-phases #$phases (add-after 'build 'build-docs (lambda _ (invoke "make" "-C" "docs"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/hypre/lib")) - (setenv "PATH" - (string-append "." ":" (getenv "PATH"))) - (invoke "make" "check" "CHECKRUN=") - (for-each (lambda (filename) - (let ((size (stat:size (stat filename)))) - (when (positive? size) - (error (format #f - "~a size ~d; error indication~%" - filename size))))) - (find-files "test" ".*\\.err$"))))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) ;; Custom install because docs/Makefile doesn't honor ${docdir}. (let* ((doc (assoc-ref outputs "doc")) - (docdir (string-append doc "/share/doc/hypre-" - #$version))) + (docdir (string-append doc "/share/doc/hypre"))) (with-directory-excursion "docs" (for-each (lambda (base) (install-file (string-append base @@ -7411,7 +7429,7 @@ (define-public hypre "-html") (string-append docdir "/" base))) - '("usr-manual" "ref-manual"))))))))) + '("usr-manual" "ref-manual")))))))))) (home-page "https://computing.llnl.gov/projects\ /hypre-scalable-linear-solvers-multigrid-methods") (synopsis "Library of solvers and preconditioners for linear equations") @@ -7444,6 +7462,27 @@ (define-public hypre-openmpi parallel computers. It features parallel multigrid solvers for both structured and unstructured grid problems."))) +(define-public hypre-openmpi-sans-doc + (package + (inherit hypre-sans-doc) + (name "hypre-openmpi-sans-doc") + (inputs (modify-inputs (package-inputs hypre-sans-doc) + (prepend openmpi))) + (arguments + (substitute-keyword-arguments (package-arguments hypre-sans-doc) + ((#:configure-flags flags) + #~`("--with-MPI" ,@(delete "--without-MPI" #$flags))) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'check 'mpi-setup + #$%openmpi-setup))))) + (synopsis "Parallel solvers and preconditioners for linear equations") + (description + "HYPRE is a software library of high performance preconditioners and +solvers for the solution of large, sparse linear systems of equations on +parallel computers. It features parallel multigrid solvers for both +structured and unstructured grid problems."))) + (define-public matio (package (name "matio") -- 2.34.1