From patchwork Mon May 29 20:38:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vicvbcun X-Patchwork-Id: 50484 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 C6B1A27BBE2; Tue, 30 May 2023 04:58:52 +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=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 CA8D227BBE9 for ; Tue, 30 May 2023 04:58:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3qUn-0005Jc-Me; Mon, 29 May 2023 23:58:05 -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 1q3qUm-0005Is-8Y for guix-patches@gnu.org; Mon, 29 May 2023 23:58:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3qUl-00055E-U3 for guix-patches@gnu.org; Mon, 29 May 2023 23:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3qUl-00038x-QD for guix-patches@gnu.org; Mon, 29 May 2023 23:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56729] [RFC PATCH v3 25/32] gnu: maxima: Apply matrix exponentiation patch. Resent-From: vicvbcun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 May 2023 03:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56729@debbugs.gnu.org Cc: Andreas Enge Received: via spool by 56729-submit@debbugs.gnu.org id=B56729.168541907412026 (code B ref 56729); Tue, 30 May 2023 03:58:03 +0000 Received: (at 56729) by debbugs.gnu.org; 30 May 2023 03:57:54 +0000 Received: from localhost ([127.0.0.1]:59642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3qUb-00037o-Ou for submit@debbugs.gnu.org; Mon, 29 May 2023 23:57:54 -0400 Received: from mo4-p05-ob.smtp.rzone.de ([85.215.255.130]:45797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3qUN-00036H-FA for 56729@debbugs.gnu.org; Mon, 29 May 2023 23:57:43 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1685419057; cv=none; d=strato.com; s=strato-dkim-0002; b=TNt0tj8SH9ztlV4TkmvlS4YfoaXKLrIJxJB8Z77aTd6oLEpPXosqKt0m/9puS1/MQN MhSO4Ti3Pq/urOUhhhepM+abbFQte264ae322RWT4ENqmSREN6k6iCZXr/rXdUfnOkTR IaowOwK1aBKoGUh98DNeEKekZ5uhF9JqunJrQBY3P0G/fj+j2a6tg3nd8Dtbdh3r68wE WE90swv1gUORhd+ELutGvP8fGvSH2EmcsUdPh9yx9yWBEYff3LwiVPFQuXGAYF89G8zm p6G4V/lVkFYygJSC9VL61l5LH3mzs3D//oe5fwc0tXjdovhUsnuIiQERXho6sIgHyDEW Gthw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1685419057; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=GXC9vSY/fOiSZKeg/YX+6K+OxglzmOMpEaL2WXvO8r8=; b=HwObb5bxkcxfpCfNUhefKtsSZlp5SdSu/rRCkyqJtuS8aVtPurW7o8KtBl8pBozRQd IRVwRv/GW7Tf2kmQJSREbF2FIf3EKvCip7kaCq5nb4/m5/lOlKt64W689wun28/AspvD cZ2u0y8A5kpvGL1i+cnbt8/mB5YbtOuEWV245Se+dNxC9zV571miE+p9tk+93M/xLyom WzBn1pFNScmbURPzUxW5xoJslz0T2FmP/Ebs5y2WZABystFsHWhxj7uSVls1+T87t0JX o/wvcqbwiZVo9h664cgKYDO5eKVPJlhp3Nc1/dbI/HryMoKRkMnsuLLrsCVFqb4Iit3P N1Cw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1685419057; s=strato-dkim-0002; d=ikherbers.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=GXC9vSY/fOiSZKeg/YX+6K+OxglzmOMpEaL2WXvO8r8=; b=bgiFW2x+a3TdECnMxJJd4j6b3hjn8efnmBafPbRN/XV1EwF2JDMGG4lRHB+yV+n/IS Rumb4WYqGxdWI34oEFIse1Qvf+eRdZdaHrcHV/2ZaxGnuoh7N1rGVVqRCuXySeIl/rmV amNzT9CJweopQK00fp+pQeDV1Ja/mcYF8h4oK+LHZF05xERV6VBZ1dKOjjWEpGIqEfA5 Gdu11dNLo1CwfB/qnrlfrPGZ0Q30n6UOmgLGaEB3iN9oEU5Nzx5e7ZYWWPbPxp5kB6sp /SCwUH4idrcItqKI0LTByfU3c8XkqvhnupqGqV8+TlDN7Erh4xCveGz1yQxxxbdWkv2A C+0w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1685419057; s=strato-dkim-0003; d=ikherbers.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=GXC9vSY/fOiSZKeg/YX+6K+OxglzmOMpEaL2WXvO8r8=; b=322Wc2eDURJFolQzwQ8cETobpoZ4Ma2ZLjW2PVgt8xWsn7oNzGFWAAiEOtRFaU2YjI vu1ZpdpTdHV7Fu8iSbAA== X-RZG-AUTH: ":IUwNfkitaf3qOWm2b/jA5tveVwUUcwH3PkiYp6DPxTDDEo4xO9elHkvI0r6JTEEwPZQIGpITRHJw3QBV19xfC5caujhgQnTJiaYr" X-RZG-CLASS-ID: mo05 Received: from lambda.localdomain by smtp.strato.de (RZmta 49.4.0 AUTH) with ESMTPSA id z055e6z4U3vbnYF (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 30 May 2023 05:57:37 +0200 (CEST) From: vicvbcun Date: Mon, 29 May 2023 22:38:34 +0200 Message-Id: <9d296c6fb9a698883b4bed351def073c51f4e33d.1685391448.git.guix@ikherbers.com> X-Mailer: git-send-email 2.40.1 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/patches/maxima-matrixexp.patch: New file. * gnu/local.mk (dist_patch_DATA): Register here. * gnu/packages/maths.scm (maxima)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 1 + gnu/packages/patches/maxima-matrixexp.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/maxima-matrixexp.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1a90c8d2e4..8f85825f56 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1551,6 +1551,7 @@ dist_patch_DATA = \ %D%/packages/patches/mathjax-no-a11y.patch \ %D%/packages/patches/mathjax-3.1.2-no-a11y.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ + %D%/packages/patches/maxima-matrixexp.patch \ %D%/packages/patches/maxima-test-precision.patch \ %D%/packages/patches/maven-generate-component-xml.patch \ %D%/packages/patches/maven-generate-javax-inject-named.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 91027e9885..99c76cd224 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4359,6 +4359,7 @@ (define-public maxima (base32 "01wbm8jj43p7gpdj4h55aij0b44bjydn4bwb7q1wjrfs91mz143k")) (patches (search-patches "maxima-defsystem-mkdir.patch" + "maxima-matrixexp.patch" "maxima-test-precision.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/patches/maxima-matrixexp.patch b/gnu/packages/patches/maxima-matrixexp.patch new file mode 100644 index 0000000000..5123c176bb --- /dev/null +++ b/gnu/packages/patches/maxima-matrixexp.patch @@ -0,0 +1,17 @@ +Taken from sagemath 9.8 + +diff --git a/share/linearalgebra/matrixexp.lisp b/share/linearalgebra/matrixexp.lisp +index 218bf35..f2fd468 100644 +--- a/share/linearalgebra/matrixexp.lisp ++++ b/share/linearalgebra/matrixexp.lisp +@@ -138,8 +138,8 @@ + (print `(ratvars = ,$ratvars gcd = '$gcd algebraic = ,$algebraic)) + (print `(ratfac = ,$ratfac)) + (merror "Unable to find the spectrum"))) +- +- (setq res ($fullratsimp (ncpower (sub (mult z ($ident n)) mat) -1) z)) ++ ++ (setq res ($fullratsimp ($invert_by_lu (sub (mult z ($ident n)) mat) '$crering) z)) + (setq m (length sp)) + (dotimes (i m) + (setq zi (nth i sp))