From patchwork Thu Nov 2 15:37:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55820 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 C19AE27BBE9; Thu, 2 Nov 2023 12:38:36 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 7A99D27BBE2 for ; Thu, 2 Nov 2023 12:38:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyWxy-0003O2-Ug; Thu, 02 Nov 2023 08:38:30 -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 1qyWxv-0003Nd-Kv for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:28 -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 1qyWxv-0004xf-CB for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyWyU-0001jZ-8V for guix-patches@gnu.org; Thu, 02 Nov 2023 08:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66896] [PATCH 1/5] gnu: qd: Use G-expressions. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66896@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 66896-submit@debbugs.gnu.org id=B66896.16989287346597 (code B ref 66896); Thu, 02 Nov 2023 12:39:02 +0000 Received: (at 66896) by debbugs.gnu.org; 2 Nov 2023 12:38:54 +0000 Received: from localhost ([127.0.0.1]:54126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyL-0001iE-LR for submit@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:54 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyJ-0001ht-D8 for 66896@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:52 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-32fb190bf9bso185843f8f.1 for <66896@debbugs.gnu.org>; Thu, 02 Nov 2023 05:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698928690; x=1699533490; 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=fZ/JPuj56M6xTuTITxRw2+cC1UBaXceuyM1lawDWnLc=; b=e1kp/6+IGApGpPkMtrp1Y8fIGYB6LK/F0n6vfUPWDGTMYfwqmuVHD3HNJUkma3vkjZ fG1BKn3l2IpmvYCWb2JivJrnmkmSnYKhtBQpPRyf2dHafDhKaSzTtsXTiaeXO06oh4+T XQmejK00Glcciiyy7vU1tWbovXeb+3XjW9tZkSXiPRfqoU9KkILMobyjvXw0P6jadoGH BYxUERpIxPQBuOSqSm2SIctjTCe0ytF58lUi6VQxz+rMSPv6qXx1buQYMRTu7ezf3Z15 WLzTb3JX64RVrNlMpuGh7cdM0kXl7ZxGrVU7rI4jH6gm1umzxm+QKDVQjdl1THEbupi7 sLKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698928690; x=1699533490; 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=fZ/JPuj56M6xTuTITxRw2+cC1UBaXceuyM1lawDWnLc=; b=s26Nh6J0ejRoYSxiVBEilGOhMPJjM+zEPfehopbFwVy8EWQ5ift+iOr9/i+xJ8y3RO jRmv0xoWyKsZy83ykYlccP8WPpLqK61Xseb710vAxi7+DyrsmdjvQrcuSNj5x8SAW6xf A45g9FvqD7gZNOCd1IVEfrBuW/zvX6FCiM8fYGQXc2IBDUwVKt86amHvc0zZBeMiugZa Tmqzcy0aFDXuKEOQ1i9dNqmbTJNLxEysCCLdIV6P2hRCdmhntufax8snBIe3drZpP+sK VIo0VWUq03Mm5DA5s3cRI/YWPb5qLIUek+y++DpSWW8ARClj6Yep4VoFPU4DW7aE62P7 /NHg== X-Gm-Message-State: AOJu0YxE+oDqqeB0kxoeO4p7VfA1y5u9VCtsC8jevZ8207GTDP868/RB O9WD0l1Be3MyRFBxaCf28xuW0pi7OF6U4w== X-Google-Smtp-Source: AGHT+IFrpyvmv9x2CqUaKt47q/7qcBPZYJAkg5fWuv+/YqFjB5FBSX/Fjs5V/sIl12toCYNgijDsUw== X-Received: by 2002:a05:6000:4011:b0:32f:87e8:707d with SMTP id cp17-20020a056000401100b0032f87e8707dmr6140248wrb.5.1698928690264; Thu, 02 Nov 2023 05:38:10 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id e12-20020adfe7cc000000b003143c9beeaesm2369671wrn.44.2023.11.02.05.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:38:08 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 2 Nov 2023 15:37:46 +0000 Message-ID: <1c3e20f81479ed702270fc6640939db165bd33bc.1698938938.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.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/multiprecision.scm (qd): Adjust package style by using G-expressions. Change-Id: I9265979343e67d1d9e9e69b7b071ea1e429d3ee4 --- gnu/packages/multiprecision.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 3aa5dccfab..11afcfe4a0 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -263,18 +264,18 @@ (define-public qd (native-inputs (list gfortran)) (arguments - `(#:configure-flags `("--disable-enable_fma" ;weird :/ - "--disable-static" - "--enable-shared" - ,,@(if (string-prefix? "aarch64" - (or (%current-target-system) - (%current-system))) - ;; XXX: The qd_test test fails numerical - ;; accuracy checks for 'dd_real::exp()' on - ;; aarch64 with GCC 5.4 at -O2. Disabling - ;; expensive optimizations lets it pass. - '("CXXFLAGS=-O3 -fno-expensive-optimizations") - '("CXXFLAGS=-O3"))))) + (list + #:configure-flags + #~(list "--disable-enable_fma" ;weird :/ + "--disable-static" + "--enable-shared" + #$@(if (target-aarch64?) + ;; XXX: The qd_test test fails numerical + ;; accuracy checks for 'dd_real::exp()' on + ;; aarch64 with GCC 5.4 at -O2. Disabling + ;; expensive optimizations lets it pass. + '("CXXFLAGS=-O3 -fno-expensive-optimizations") + '("CXXFLAGS=-O3"))))) (home-page "https://www.davidhbailey.com/dhbsoftware/") (synopsis "Double-double and quad-double library") (description "This package supports both a double-double From patchwork Thu Nov 2 15:37:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55823 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 205F927BBEA; Thu, 2 Nov 2023 12:39:14 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 7733427BBE2 for ; Thu, 2 Nov 2023 12:39:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyWxz-0003Oi-7d; Thu, 02 Nov 2023 08:38:31 -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 1qyWxv-0003Ne-Vp for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:28 -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 1qyWxv-0004xk-NU for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyWyU-0001jg-KQ for guix-patches@gnu.org; Thu, 02 Nov 2023 08:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66896] [PATCH 2/5] gnu: qd: Apply patch to fix accuracy in angle computation. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66896@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 66896-submit@debbugs.gnu.org id=B66896.16989287366613 (code B ref 66896); Thu, 02 Nov 2023 12:39:02 +0000 Received: (at 66896) by debbugs.gnu.org; 2 Nov 2023 12:38:56 +0000 Received: from localhost ([127.0.0.1]:54129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyN-0001iZ-AI for submit@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:56 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:57783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyL-0001hv-34 for 66896@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:54 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-50931355d48so1070191e87.3 for <66896@debbugs.gnu.org>; Thu, 02 Nov 2023 05:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698928692; x=1699533492; 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=kf59K4lTx7NAdFEoRhzY/9a2a7p+K9E+QYirD6Nlfls=; b=gIlriRBnu4qSS3y+OsO1+2GjQpMBXVccP1R/DC5hyxsM4fjqkYR1V0TWdEPt5H9rEl 1wBh3xYHxp72nTSzDw4IIDpxdxHu3wGkS8ORVZdw6kMZ1HKpdE8qrOZMODEFbkZH5+Sm x3T74qBd28q8ppnIftxjp40P+8DtZOdQGqqoyA9Qbrsjpueo90TMY7CIj+n3eM76zqi+ fMyPoaTAzmU89ULn1gg0jTW/gYyP6gf3UgCubj6yOljqg32RB4WYB9sBXfjn1laRg2N4 AA81f+rAWU0by7D7jQT4aqIi9DiPnwKJJMImT2BjQzdeR10gO8ILcgeo0iSc5wac3/n4 VYow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698928692; x=1699533492; 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=kf59K4lTx7NAdFEoRhzY/9a2a7p+K9E+QYirD6Nlfls=; b=qM6w5mIo4Mjf1ST5LnwNOANjuKAKPFe6/ckeTqZ4VU4oxO13iyKO2rv4qWG/Uz1EJy MEh8sXsPsWeuNm9FRI1fpBHcTw8rLBidqB4TrTOEjuX54cImCxMRd0BUrHTxwa5O5Efn FeBI+ED3AnC5mDHwfXO4ArfUAgW57dWH6263Z3LnwrifqtjOIEckfn/nvwlLjgO/+K5z n5c0T9kCMEp6RP8isjpCP51+xA8Q8yOFiDpTw5backK/T1ZPQs9ar+V6a7oRL7VSpk+P uxQsdO2cJxYS3g2CTGg09tnR0aW+HFjCUub4S2LoUnWRMTJmPKWQyrLn2FbFmHvaHqGD 25RA== X-Gm-Message-State: AOJu0YzyxPEx/M64Ktu6AkStnKHvx+VMu5/A92nC+WLgLtZYiVtNCiNy Sp9tM29BRi6BYUX7b9/xK5doS31Jh2trAQ== X-Google-Smtp-Source: AGHT+IHkPWqx+PV5wj+WfDSPMYl3sGQCWFn61yHkWwgKfA/wrlsGxdzj36LOhAJV+nRamb86iyzH5g== X-Received: by 2002:ac2:593c:0:b0:509:4916:8b6f with SMTP id v28-20020ac2593c000000b0050949168b6fmr1550388lfi.37.1698928691818; Thu, 02 Nov 2023 05:38:11 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id e12-20020adfe7cc000000b003143c9beeaesm2369671wrn.44.2023.11.02.05.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:38:10 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 2 Nov 2023 15:37:47 +0000 Message-ID: <8467e1ff586aa25e5659801006dcb7a0784dc576.1698938938.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.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 During attempt to upgrade python-spherical-geometry there was upstream discussion to adjust qd. Patch is sourced and adjusted based on the proposed one during discussion: https://github.com/spacetelescope/spherical_geometry/issues/227 * gnu/packages/multiprecision.scm (qd): [source]: Apply patch. * gnu/packages/patches/qd-fix-accuracy-in-angle-computation.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ic1dfdbe19b3347367b2ffb846be6bb975a0b89ae --- gnu/local.mk | 1 + gnu/packages/multiprecision.scm | 3 +- ...qd-fix-accuracy-in-angle-computation.patch | 258 ++++++++++++++++++ 3 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qd-fix-accuracy-in-angle-computation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8d817379a7..b6a5113063 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1896,6 +1896,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/python-werkzeug-tests.patch \ %D%/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch \ + %D%/packages/patches/qd-fix-accuracy-in-angle-computation.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-disable-some-qtests-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 11afcfe4a0..453b351a65 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -259,7 +259,8 @@ (define-public qd (uri (string-append "https://crd-legacy.lbl.gov/~dhbailey/mpdist/qd-" version ".tar.gz")) (sha256 - (base32 "09pfd77rmy370hy7qdqw84z21y9zpl3fcwzf93rhiv0kwhfg9smk")))) + (base32 "09pfd77rmy370hy7qdqw84z21y9zpl3fcwzf93rhiv0kwhfg9smk")) + (patches (search-patches "qd-fix-accuracy-in-angle-computation.patch")))) (build-system gnu-build-system) (native-inputs (list gfortran)) diff --git a/gnu/packages/patches/qd-fix-accuracy-in-angle-computation.patch b/gnu/packages/patches/qd-fix-accuracy-in-angle-computation.patch new file mode 100644 index 0000000000..288d56919e --- /dev/null +++ b/gnu/packages/patches/qd-fix-accuracy-in-angle-computation.patch @@ -0,0 +1,258 @@ +From e5ccba8fc889c38f49a247ff3060e8462388f6f9 Mon Sep 17 00:00:00 2001 +From: Sharlatan Hellseher +Date: Thu, 2 Nov 2023 02:49:54 +0000 +Subject: [PATCH] Fix accuracy in angle computation (#224) + +Author: Mihai Cara +Source: https://github.com/spacetelescope/spherical_geometry/pull/224 + +* Fix accuracy in angle computation + +* Enhance comparisons and expose QD 2*pi +--- + include/qd/c_dd.h | 2 ++ + include/qd/c_qd.h | 4 ++- + include/qd/qd_real.h | 11 ++++---- + src/c_dd.cpp | 8 ++++++ + src/c_qd.cpp | 15 +++++++++-- + src/qd_real.cpp | 63 +++++++++++++++++++++++++++----------------- + 6 files changed, 71 insertions(+), 32 deletions(-) + +diff --git a/include/qd/c_dd.h b/include/qd/c_dd.h +index 203a8fa..7ffcb01 100644 +--- a/include/qd/c_dd.h ++++ b/include/qd/c_dd.h +@@ -90,6 +90,8 @@ void c_dd_comp(const double *a, const double *b, int *result); + void c_dd_comp_dd_d(const double *a, double b, int *result); + void c_dd_comp_d_dd(double a, const double *b, int *result); + void c_dd_pi(double *a); ++void c_dd_2pi(double *a); ++double c_dd_epsilon(void); + + #ifdef __cplusplus + } +diff --git a/include/qd/c_qd.h b/include/qd/c_qd.h +index 9062d1d..b118f26 100644 +--- a/include/qd/c_qd.h ++++ b/include/qd/c_qd.h +@@ -65,7 +65,7 @@ void c_qd_copy(const double *a, double *b); + void c_qd_copy_dd(const double *a, double *b); + void c_qd_copy_d(double a, double *b); + +-void c_qd_sqrt(const double *a, double *b); ++int c_qd_sqrt(const double *a, double *b); + void c_qd_sqr(const double *a, double *b); + + void c_qd_abs(const double *a, double *b); +@@ -111,6 +111,8 @@ void c_qd_comp(const double *a, const double *b, int *result); + void c_qd_comp_qd_d(const double *a, double b, int *result); + void c_qd_comp_d_qd(double a, const double *b, int *result); + void c_qd_pi(double *a); ++void c_qd_2pi(double *a); ++double c_qd_epsilon(void); + + #ifdef __cplusplus + } +diff --git a/include/qd/qd_real.h b/include/qd/qd_real.h +index 32079d0..9435678 100644 +--- a/include/qd/qd_real.h ++++ b/include/qd/qd_real.h +@@ -120,16 +120,16 @@ struct QD_API qd_real { + static qd_real rand(void); + + void to_digits(char *s, int &expn, int precision = _ndigits) const; +- void write(char *s, int len, int precision = _ndigits, ++ void write(char *s, int len, int precision = _ndigits, + bool showpos = false, bool uppercase = false) const; +- std::string to_string(int precision = _ndigits, int width = 0, +- std::ios_base::fmtflags fmt = static_cast(0), ++ std::string to_string(int precision = _ndigits, int width = 0, ++ std::ios_base::fmtflags fmt = static_cast(0), + bool showpos = false, bool uppercase = false, char fill = ' ') const; + static int read(const char *s, qd_real &a); + + /* Debugging methods */ + void dump(const std::string &name = "", std::ostream &os = std::cerr) const; +- void dump_bits(const std::string &name = "", ++ void dump_bits(const std::string &name = "", + std::ostream &os = std::cerr) const; + + static qd_real debug_rand(); +@@ -150,7 +150,7 @@ namespace std { + } + + QD_API qd_real polyeval(const qd_real *c, int n, const qd_real &x); +-QD_API qd_real polyroot(const qd_real *c, int n, ++QD_API qd_real polyroot(const qd_real *c, int n, + const qd_real &x0, int max_iter = 64, double thresh = 0.0); + + QD_API qd_real qdrand(void); +@@ -190,6 +190,7 @@ QD_API qd_real operator/(double a, const qd_real &b); + + QD_API qd_real sqr(const qd_real &a); + QD_API qd_real sqrt(const qd_real &a); ++QD_API qd_real fsqrt(const qd_real &a, int &flag); + QD_API qd_real pow(const qd_real &a, int n); + QD_API qd_real pow(const qd_real &a, const qd_real &b); + QD_API qd_real npwr(const qd_real &a, int n); +diff --git a/src/c_dd.cpp b/src/c_dd.cpp +index 1cb2989..1df03e2 100644 +--- a/src/c_dd.cpp ++++ b/src/c_dd.cpp +@@ -311,4 +311,12 @@ void c_dd_pi(double *a) { + TO_DOUBLE_PTR(dd_real::_pi, a); + } + ++void c_dd_2pi(double *a) { ++ TO_DOUBLE_PTR(dd_real::_2pi, a); ++} ++ ++double c_dd_epsilon(void) { ++ return (double) std::numeric_limits::epsilon(); ++} ++ + } +diff --git a/src/c_qd.cpp b/src/c_qd.cpp +index 010cf85..95cffb3 100644 +--- a/src/c_qd.cpp ++++ b/src/c_qd.cpp +@@ -237,11 +237,14 @@ void c_qd_copy_d(double a, double *b) { + } + + +-void c_qd_sqrt(const double *a, double *b) { ++int c_qd_sqrt(const double *a, double *b) { ++ int flag; + qd_real bb; +- bb = sqrt(qd_real(a)); ++ bb = fsqrt(qd_real(a), flag); + TO_DOUBLE_PTR(bb, b); ++ return flag; + } ++ + void c_qd_sqr(const double *a, double *b) { + qd_real bb; + bb = sqr(qd_real(a)); +@@ -447,4 +450,12 @@ void c_qd_pi(double *a) { + TO_DOUBLE_PTR(qd_real::_pi, a); + } + ++void c_qd_2pi(double *a) { ++ TO_DOUBLE_PTR(qd_real::_2pi, a); ++} ++ ++double c_qd_epsilon(void) { ++ return (double) std::numeric_limits::epsilon(); ++} ++ + } +diff --git a/src/qd_real.cpp b/src/qd_real.cpp +index 70988ff..2da15c2 100644 +--- a/src/qd_real.cpp ++++ b/src/qd_real.cpp +@@ -191,7 +191,7 @@ istream &operator>>(istream &s, qd_real &qd) { + ostream &operator<<(ostream &os, const qd_real &qd) { + bool showpos = (os.flags() & ios_base::showpos) != 0; + bool uppercase = (os.flags() & ios_base::uppercase) != 0; +- return os << qd.to_string(os.precision(), os.width(), os.flags(), ++ return os << qd.to_string(os.precision(), os.width(), os.flags(), + showpos, uppercase, os.fill()); + } + +@@ -346,9 +346,9 @@ void qd_real::to_digits(char *s, int &expn, int precision) const { + } + + /* If first digit is 10, shift everything. */ +- if (s[0] > '9') { +- e++; +- for (i = precision; i >= 2; i--) s[i] = s[i-1]; ++ if (s[0] > '9') { ++ e++; ++ for (i = precision; i >= 2; i--) s[i] = s[i-1]; + s[0] = '1'; + s[1] = '0'; + } +@@ -519,7 +519,6 @@ string qd_real::to_string(int precision, int width, ios_base::fmtflags fmt, + if( fabs( from_string / this->x[0] ) > 3.0 ){ + + int point_position; +- char temp; + + // loop on the string, find the point, move it up one + // don't act on the first character +@@ -736,37 +735,53 @@ qd_real qd_real::accurate_div(const qd_real &a, const qd_real &b) { + return qd_real(q0, q1, q2, q3); + } + +-QD_API qd_real sqrt(const qd_real &a) { +- /* Strategy: +- +- Perform the following Newton iteration: ++QD_API qd_real fsqrt(const qd_real &a, int &flag) { ++ /* Uses Heron's method, see: ++ https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method + +- x' = x + (1 - a * x^2) * x / 2; +- +- which converges to 1/sqrt(a), starting with the +- double precision approximation to 1/sqrt(a). +- Since Newton's iteration more or less doubles the +- number of correct digits, we only need to perform it +- twice. ++ 1. x0 = approximate sqrt(a); ++ 2. x_{n+1} = (1/2) * (x_n + a / x_n); ++ 3. repeat 2 until corrections are small + */ + ++ int i; ++ double e, eps; ++ ++ qd_real r, diff; ++ qd_real half = "0.5000000000000000000000000000000000" ++ "000000000000000000000000000000000000"; ++ + if (a.is_zero()) +- return 0.0; ++ return (qd_real) 0.0; + + if (a.is_negative()) { + qd_real::error("(qd_real::sqrt): Negative argument."); + return qd_real::_nan; + } + +- qd_real r = (1.0 / std::sqrt(a[0])); +- qd_real h = mul_pwr2(a, 0.5); ++ eps = std::numeric_limits::epsilon(); + +- r += ((0.5 - h * sqr(r)) * r); +- r += ((0.5 - h * sqr(r)) * r); +- r += ((0.5 - h * sqr(r)) * r); ++ qd_real x = std::sqrt(a[0]); ++ qd_real y; + +- r *= a; +- return r; ++ for (i=0; i < 10; i++) { ++ y = half * (x + a / x); ++ diff = x - y; ++ x = y; ++ e = fabs(((diff[3] + diff[2]) + diff[1]) + diff[0]); ++ if (e < fabs(x.x[0]) * eps) { ++ flag = 0; // convergence achieved ++ return x; ++ } ++ } ++ ++ flag = 1; // failed to converge ++ return x; ++} ++ ++QD_API qd_real sqrt(const qd_real &a) { ++ int flag; ++ return fsqrt(a, flag); + } + + +-- +2.41.0 + From patchwork Thu Nov 2 15:37:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55822 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 734A727BBE9; Thu, 2 Nov 2023 12:39:10 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 0A8D127BBE2 for ; Thu, 2 Nov 2023 12:39:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyWxz-0003Pg-Vx; Thu, 02 Nov 2023 08:38:32 -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 1qyWxx-0003Nt-Ck for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:29 -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 1qyWxx-0004xr-4U for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyWyU-0001jo-W2; Thu, 02 Nov 2023 08:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66896] [PATCH 3/5] gnu: elemental: Update to 0.87.7-0.6eb15a0. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66896@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 66896-submit@debbugs.gnu.org id=B66896.16989287376626 (code B ref 66896); Thu, 02 Nov 2023 12:39:02 +0000 Received: (at 66896) by debbugs.gnu.org; 2 Nov 2023 12:38:57 +0000 Received: from localhost ([127.0.0.1]:54133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyO-0001ij-Q2 for submit@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:57 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:45415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyM-0001hx-49 for 66896@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:54 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-32f87b1c725so576325f8f.3 for <66896@debbugs.gnu.org>; Thu, 02 Nov 2023 05:38:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698928693; x=1699533493; 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=/ADBhZHwiN6Fu7CmTZsL0LvWNMcy/HnsBs0KAGwQits=; b=LtxYhKvrekXGEMEqJq1NKh3MPCJdD+pmgwYF+5nE2+0lf5vjvQtlxpRCh2sGOPbOJW 9MtAfV61qx8x7aYbZPwuxUyUQpYu1Ynap5TifzoWGJTGNuizuoaAuarC6jkU+gJsqv3G I+x4t+GIpYj1dKEVbiPy7aunWPipeyqy0tWccVy5flZNz3LFnLOhL+tai+TEDdrQx7ni vc4loEhbB5gxM4GKCT4CNVAOBTnAtqL88otHmVYJ2ue7XLnSfda9KnXX/HQ1auAahm18 DNBokQrFNZd8trsY7Vr5c6iQbV+38YBtTqTfKgwRrmAm18kRt5PxQUx/veNkPm60WMrC WiRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698928693; x=1699533493; 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=/ADBhZHwiN6Fu7CmTZsL0LvWNMcy/HnsBs0KAGwQits=; b=aF2ywnGra1wf2vheqUX2TlD8S3dX0k7R6EIe1AuX0+IK2MZKSNZ5AON8WKtHvuf/M7 df3JTfKkhFDwAQJpCVCriQz6ntB25wUfD8rDqCpRQUNLhW+ETSpGpbnYYN/m4fggQJcM 2tJIWzrOV+fJ7Vsuia7FYJBSqZsC/Eeo5fpsaGBB5EhRPe+lUsXHaR+8IMRE/n0drZ5w rIpwODo0GpWJSsyym5CqGCqLdzqpNE/A+LfA+KLdKsRgUj7gYU2mdiB0SROw5zAhm77f XxJYNbFDPrpyyQ0QwePHS4VYiyIn1kNrNB9gYJuhSQRrtNq9eH+TeSROUUDkW6sVgnJO bHlA== X-Gm-Message-State: AOJu0Yy1guMG02n9K+aLOODIYaCrFH6aQSCzzcRwKnr0eIGsCS3szjob QRGCgbAlJIrxkxCXiVGgsdyRsU5uoUtS6Q== X-Google-Smtp-Source: AGHT+IEnMnhHLyc+mLOQhVB+m2mF73/xsdUXm3JFadE1petEeUEsSSAXAKw9H9JNsqXQStvZ1vALew== X-Received: by 2002:a05:6000:1882:b0:32f:7f78:e29c with SMTP id a2-20020a056000188200b0032f7f78e29cmr11755216wri.38.1698928693371; Thu, 02 Nov 2023 05:38:13 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id e12-20020adfe7cc000000b003143c9beeaesm2369671wrn.44.2023.11.02.05.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:38:12 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 2 Nov 2023 15:37:48 +0000 Message-ID: <96c3ec9b8fa156645d956d8ce893e0501175d42a.1698938938.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.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 The build of elemental is failed on GCC 7+: https://github.com/elemental/Elemental/issues/254 Fixed but not released yet in merge request: https://github.com/elemental/Elemental/pull/259 * gnu/packages/maths.scm (elemental): Update to 0.87.7-0.6eb15a0. Change-Id: I333f1de160489035f1a8875173abdd57c03ef777 --- gnu/packages/maths.scm | 109 +++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ed1708c77b..6b9725bdcc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7593,60 +7593,65 @@ (define-public elpa-openmpi (synopsis "Eigenvalue solvers for symmetric matrices (with MPI support)"))) (define-public elemental - (package - (name "elemental") - (version "0.87.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/elemental/Elemental") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1687xpjjzig27y2pnqv7hv09smpijyfdpz7qjgmcxf4shfajlfkc")))) - (build-system cmake-build-system) - (home-page "https://github.com/elemental/Elemental") - (native-inputs - (list gfortran)) - (inputs - `(("blas" ,openblas) - ("gfortran:lib" ,gfortran "lib") - ("gmp" ,gmp) - ("lapack" ,lapack) - ("metis" ,metis) - ("mpc" ,mpc) - ("mpfr" ,mpfr) - ("mpi" ,openmpi) - ("qd" ,qd))) - (arguments - `(#:build-type "Release" ;default RelWithDebInfo not supported - #:configure-flags `("-DEL_DISABLE_PARMETIS:BOOL=YES" - "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" - "-DEL_CACHE_WARNINGS:BOOL=YES" - "-DEL_TESTS:BOOL=YES" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DGFORTRAN_LIB=gfortran") - #:phases (modify-phases %standard-phases - (add-before 'check 'mpi-setup - ,%openmpi-setup) - (add-before 'check 'setup-tests - (lambda _ - ;; Parallelism is done at the MPI layer. - (setenv "OMP_NUM_THREADS" "1") - #t)) - (add-after 'install 'remove-tests - (lambda* (#:key outputs #:allow-other-keys) - ;; Tests are installed, with no easy configuration - ;; switch to prevent this, so delete them. - (delete-file-recursively - (string-append (assoc-ref outputs "out") "/bin")) - #t))))) - (synopsis "Dense and sparse-direct linear algebra and optimization") - (description "Elemental is a modern C++ library for distributed-memory + ;; The build of 0.87.7 is failed for a long time due to new version of GCC. The + ;; latest commit has fixes. + ;; See https://github.com/elemental/Elemental/issues/254 + (let ((commit "6eb15a0da2a4998bf1cf971ae231b78e06d989d9") + (revision "0")) + (package + (name "elemental") + (version (git-version "0.87.7" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elemental/Elemental") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06xcs4ic60ndcf2hq19gr8yjwdsnphpcyhapab41rkw726z4lm7p")))) + (build-system cmake-build-system) + (home-page "https://github.com/elemental/Elemental") + (native-inputs + (list gfortran)) + (inputs + `(("blas" ,openblas) + ("gfortran:lib" ,gfortran "lib") + ("gmp" ,gmp) + ("lapack" ,lapack) + ("metis" ,metis) + ("mpc" ,mpc) + ("mpfr" ,mpfr) + ("mpi" ,openmpi) + ("qd" ,qd))) + (arguments + `(#:build-type "Release" ;default RelWithDebInfo not supported + #:configure-flags `("-DEL_DISABLE_PARMETIS:BOOL=YES" + "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" + "-DEL_CACHE_WARNINGS:BOOL=YES" + "-DEL_TESTS:BOOL=YES" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DGFORTRAN_LIB=gfortran") + #:phases (modify-phases %standard-phases + (add-before 'check 'mpi-setup + ,%openmpi-setup) + (add-before 'check 'setup-tests + (lambda _ + ;; Parallelism is done at the MPI layer. + (setenv "OMP_NUM_THREADS" "1") + #t)) + (add-after 'install 'remove-tests + (lambda* (#:key outputs #:allow-other-keys) + ;; Tests are installed, with no easy configuration + ;; switch to prevent this, so delete them. + (delete-file-recursively + (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (synopsis "Dense and sparse-direct linear algebra and optimization") + (description "Elemental is a modern C++ library for distributed-memory dense and sparse-direct linear algebra, conic optimization, and lattice reduction.") - (license license:bsd-2))) + (license license:bsd-2)))) (define-public mcrl2 (package From patchwork Thu Nov 2 15:37:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55821 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 2F1D727BBE9; Thu, 2 Nov 2023 12:38:50 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 26CEA27BBE2 for ; Thu, 2 Nov 2023 12:38:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyWy0-0003QS-RB; Thu, 02 Nov 2023 08:38:32 -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 1qyWxx-0003O4-TK for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:30 -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 1qyWxx-0004y3-Kc for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyWyV-0001jw-EB; Thu, 02 Nov 2023 08:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66896] [PATCH 4/5] gnu: elemental: Remove input labels. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 12:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66896@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 66896-submit@debbugs.gnu.org id=B66896.16989287396648 (code B ref 66896); Thu, 02 Nov 2023 12:39:03 +0000 Received: (at 66896) by debbugs.gnu.org; 2 Nov 2023 12:38:59 +0000 Received: from localhost ([127.0.0.1]:54139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyQ-0001j8-Vx for submit@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:59 -0400 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]:56514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyO-0001i0-QO for 66896@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:57 -0400 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2c5071165d5so12056541fa.0 for <66896@debbugs.gnu.org>; Thu, 02 Nov 2023 05:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698928696; x=1699533496; 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=a/riW/Ke07hV1zCkTD4iDNQEX4ajbe3Ch8SJoI0Ku/k=; b=Gm7IrGNeb5J4JCr6LxRU86oGzEbZDY5DC0EkuSQ1blDJjsvU13ToM+hPehZ0iGmECV Jtcqce+ubboghu7FrYt5PaGMgRa6cmaxOvAAAj7YxbF9xWjhjb3iyUklUVd1L1G2E5NK JXltXuPMpcGaYfIBIeiO7O0A9hxj5UJH9wdBhk0/Lax3KpDRCZPGbvgOD8awqeCm1SNk G5J449XZ3683nXIruoPTyc1pvSl6ToSeBAomfJh3A1FoDjB5xQCZVK6oofwJAO51Vk5k 06WYNWz3Rynija0pV6y/nTz6hgyxzLOQIA61Jy4teMUSXZ5gYwmkn8ckON4I8G2zAsVd 0KJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698928696; x=1699533496; 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=a/riW/Ke07hV1zCkTD4iDNQEX4ajbe3Ch8SJoI0Ku/k=; b=SucQ7EytT+yiXFdFrhUhvSaZGH60Yq+3C4f6Lfo31mPEjV2UpIeJ52xgCnXsL0tNv4 kGBfRVSEj50TXDYd0o7gdpWava85zkdx9qiB8nHCcO/AMQiTigHxqjpRo9qRKekIn0cT tfPBeICPFQIfgWlfIDsW6IoSAKgz/q5CJcsFioB9ZTOQkeEPiVbgp5T/1cYoTJHFWOY0 t2Ueiijo5EjuFoqxyj+PvCeN99gawFYQgNzR+wqdvkTHUm+YiW0iNrfwvIHBdZaD0N8X mLi9D8kLy37KnPcICYab/qpctFSraj+Z++RviD6F2xPD+cwjKZIN9xY1UWOfDJhu6iJQ cPZA== X-Gm-Message-State: AOJu0Yy+b6U9feL/HXMdp5pU2cpC34FphojshAsx64tmI/JhKhXsM8kA o13G2mcCk/xrcAkaqhnaDsj1CqdezfJCwA== X-Google-Smtp-Source: AGHT+IE7u27TOPuXeDuRRpDMLRH3XlaI38HXPjM+iLYp4U4ku5YqK2oBeCbiPQvHzCyelpnj8uRdzA== X-Received: by 2002:a2e:a489:0:b0:2c0:168c:e6bd with SMTP id h9-20020a2ea489000000b002c0168ce6bdmr12897964lji.28.1698928695708; Thu, 02 Nov 2023 05:38:15 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id e12-20020adfe7cc000000b003143c9beeaesm2369671wrn.44.2023.11.02.05.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:38:14 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 2 Nov 2023 15:37:49 +0000 Message-ID: <9dcef93fd2923b37e4634b6ead2ec473ba97fdb8.1698938938.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.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 (elemental)[inputs]: Remove labels. Change-Id: I239b56cb5871d5cb2dbd587502c647a37beb30b7 --- gnu/packages/maths.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6b9725bdcc..0ed25834f6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7615,15 +7615,15 @@ (define-public elemental (native-inputs (list gfortran)) (inputs - `(("blas" ,openblas) - ("gfortran:lib" ,gfortran "lib") - ("gmp" ,gmp) - ("lapack" ,lapack) - ("metis" ,metis) - ("mpc" ,mpc) - ("mpfr" ,mpfr) - ("mpi" ,openmpi) - ("qd" ,qd))) + (list `(,gfortran "lib") + gmp + lapack + metis + mpc + mpfr + openmpi + qd + openblas)) (arguments `(#:build-type "Release" ;default RelWithDebInfo not supported #:configure-flags `("-DEL_DISABLE_PARMETIS:BOOL=YES" From patchwork Thu Nov 2 15:37:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55824 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 65DAA27BBEA; Thu, 2 Nov 2023 12:39:18 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 60C1327BBE2 for ; Thu, 2 Nov 2023 12:39:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyWxz-0003Op-Dp; Thu, 02 Nov 2023 08:38:31 -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 1qyWxx-0003O3-Td for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:30 -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 1qyWxx-0004y2-K9 for guix-patches@gnu.org; Thu, 02 Nov 2023 08:38:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyWyV-0001k5-UH; Thu, 02 Nov 2023 08:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66896] [PATCH 5/5] gnu: elemental: Update package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 12:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66896@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 66896-submit@debbugs.gnu.org id=B66896.16989287396657 (code B ref 66896); Thu, 02 Nov 2023 12:39:03 +0000 Received: (at 66896) by debbugs.gnu.org; 2 Nov 2023 12:38:59 +0000 Received: from localhost ([127.0.0.1]:54142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyR-0001jG-AN for submit@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:59 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:44036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyWyP-0001i8-W5 for 66896@debbugs.gnu.org; Thu, 02 Nov 2023 08:38:58 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40837ebba42so5900655e9.0 for <66896@debbugs.gnu.org>; Thu, 02 Nov 2023 05:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698928697; x=1699533497; 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=+d3gicKbK2w8ei88sSOHOtq/wL/cVgvQsk+uSIHl790=; b=iOeh3mS4kbko1b76qLuLAoWLuLQdCdXE0nEJ9S22AOwTP0e4crlIdzjpL2AYVkQi9a k4Z1z9eBCQdUEzOTjKY95oEjgx38nivp/G9m48cDUgH4oHbqHYO0XFV8VDDfX9GjMLZk TqMuVdJEiZ4bg5HSpVn2r5tAIqOTLquRM24F2LdzLIBxIJujrkwE1iWHqvHye4a4cQAU 25ZBM7m9mHV0L92VFbQtEUVNIik+hmRWval+7prxsLMr8+c9kqrSKa/coaNpCwaky9Ea ZWxK16bbZd3JPipzhTGXVgVJBvvJCCHOmwOCNSOmagU/6CDUWFWdM8pcWJYTZj11+AzV mHxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698928697; x=1699533497; 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=+d3gicKbK2w8ei88sSOHOtq/wL/cVgvQsk+uSIHl790=; b=mi0FA5dvbl+Ok/oVDvgfjB4g8haUJMk9uxHSyQPFVyc8kuYKQzXJAPRlyJ/8BgcDK9 F0a80KFW81YBLQpP3zfxsxFo15wgoycFl60Erg6eLCWqd78ntA+Dx1NpbOB+qr0eCdwg waNMcadG4w11AbTVzef6KXO8zuxfzg/56Q6gFl06F3DAASr+3HQHYJPKnr7iQMwEw6Ei ms4Y0DTsVUctq+7JLMsJB/2ktAqKY5jA6A3+Pxy06/0bxHPqwW3W1DUKY8n0iXvTUhZv mUHCRQeSXfLTQ7dHIU5ocyCNSgu5StZdF5XC2x3AgUVeGD96u5axDqOM7Pnde0anJzqS s9sw== X-Gm-Message-State: AOJu0YzhP+n+8dDJQqPZJzXcJDPNX8D65b1kBh2HjZapQT3dfualjIBe XLEmcIedwoupS5BisxKdii2EnJ078qu5bQ== X-Google-Smtp-Source: AGHT+IHAFNpDgwKpLWYIVdpljIKImqOLOokPk0+uM+CPu4HbrC+XKA8V3McxJpOI+S97vp038UrXvg== X-Received: by 2002:adf:f4d1:0:b0:32d:a2c4:18bf with SMTP id h17-20020adff4d1000000b0032da2c418bfmr14128663wrp.59.1698928696991; Thu, 02 Nov 2023 05:38:16 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id e12-20020adfe7cc000000b003143c9beeaesm2369671wrn.44.2023.11.02.05.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:38:16 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 2 Nov 2023 15:37:50 +0000 Message-ID: <25abffb2d0991e8a087f4b4f818cf3915431d22f.1698938938.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.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 (elemental): Update package style, shift order of package fields. [arguments]: Use G-expressions. {phases}: Remove trailing #f from each lambda. Change-Id: Ib961eb99159e1206963041bd7014dca032a21441 --- gnu/packages/maths.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0ed25834f6..34710fc65c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7611,7 +7611,29 @@ (define-public elemental (base32 "06xcs4ic60ndcf2hq19gr8yjwdsnphpcyhapab41rkw726z4lm7p")))) (build-system cmake-build-system) - (home-page "https://github.com/elemental/Elemental") + (arguments + (list + #:build-type "Release" ;default RelWithDebInfo not supported + #:configure-flags + #~(list "-DEL_DISABLE_PARMETIS:BOOL=YES" + "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" + "-DEL_CACHE_WARNINGS:BOOL=YES" + "-DEL_TESTS:BOOL=YES" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DGFORTRAN_LIB=gfortran") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'mpi-setup + #$%openmpi-setup) + (add-before 'check 'setup-tests + (lambda _ ;; Parallelism is done at the MPI layer. + (setenv "OMP_NUM_THREADS" "1"))) + (add-after 'install 'remove-tests + (lambda _ + ;; Tests are installed, with no easy configuration + ;; switch to prevent this, so delete them. + (delete-file-recursively + (string-append #$output "/bin/test"))))))) (native-inputs (list gfortran)) (inputs @@ -7624,29 +7646,7 @@ (define-public elemental openmpi qd openblas)) - (arguments - `(#:build-type "Release" ;default RelWithDebInfo not supported - #:configure-flags `("-DEL_DISABLE_PARMETIS:BOOL=YES" - "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" - "-DEL_CACHE_WARNINGS:BOOL=YES" - "-DEL_TESTS:BOOL=YES" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DGFORTRAN_LIB=gfortran") - #:phases (modify-phases %standard-phases - (add-before 'check 'mpi-setup - ,%openmpi-setup) - (add-before 'check 'setup-tests - (lambda _ - ;; Parallelism is done at the MPI layer. - (setenv "OMP_NUM_THREADS" "1") - #t)) - (add-after 'install 'remove-tests - (lambda* (#:key outputs #:allow-other-keys) - ;; Tests are installed, with no easy configuration - ;; switch to prevent this, so delete them. - (delete-file-recursively - (string-append (assoc-ref outputs "out") "/bin")) - #t))))) + (home-page "https://github.com/elemental/Elemental") (synopsis "Dense and sparse-direct linear algebra and optimization") (description "Elemental is a modern C++ library for distributed-memory dense and sparse-direct linear algebra, conic optimization, and lattice