From patchwork Sun Jan 21 22:40:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59306 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 C531F27BBE9; Sun, 21 Jan 2024 22:41:23 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 03DE927BBE2 for ; Sun, 21 Jan 2024 22:41:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRgUz-00079V-7C; Sun, 21 Jan 2024 17:41:05 -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 1rRgUw-000795-Hg for guix-patches@gnu.org; Sun, 21 Jan 2024 17:41:02 -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 1rRgUw-0005KE-9C; Sun, 21 Jan 2024 17:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRgUw-0008Rx-Ka; Sun, 21 Jan 2024 17:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68650] [PATCH 1/2] gnu: Add python-cppheaderparser. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 22:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68650 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68650@debbugs.gnu.org Cc: Sharlatan Hellseher , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 68650-submit@debbugs.gnu.org id=B68650.170587683132425 (code B ref 68650); Sun, 21 Jan 2024 22:41:02 +0000 Received: (at 68650) by debbugs.gnu.org; 21 Jan 2024 22:40:31 +0000 Received: from localhost ([127.0.0.1]:39214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRgUR-0008Qu-C4 for submit@debbugs.gnu.org; Sun, 21 Jan 2024 17:40:31 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:50383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRgUK-0008QE-Gs for 68650@debbugs.gnu.org; Sun, 21 Jan 2024 17:40:27 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33924df7245so1510275f8f.0 for <68650@debbugs.gnu.org>; Sun, 21 Jan 2024 14:40:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705876815; x=1706481615; 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=6EEggbPnPxgrcyDi6pAyxYJlqp63oYU0fJFJhUAGknY=; b=GBv5RtUt5owK31OZA9Rew8vNuKzqoNxw7qH4uTEA8RGsLcAiDUz07KvdKkcXMs41L5 jYpCo7ILVNzSmZqh0mqQb2PjsfMht5ksB0aqRiPPfF7M5+f5/l+9Q3ouG5Q9nDmQD5RP tp2G5JdQxAcqUz3MUlHr/YxA45bGgsAyd/2sZtMhUosGMKdL4AISjb9tA83Q4U+8yfDm R6evfYQNEVSEmNTbB6bQyeRgbQ1EdvOj7W5R54bCR9b8vgcB7GP1Cs57o0DBBZiNkLa7 YFGQ9gWIn/h2h56jXh42SMWyYcBYnN87cw/40rPQCM+N1KymTsGm1pcl7uXt0ivJSntv eTQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705876815; x=1706481615; 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=6EEggbPnPxgrcyDi6pAyxYJlqp63oYU0fJFJhUAGknY=; b=Mu2hRQpRHVo7Q3NIdpuV2TSTT+qnTWivgz9prU5q2Y3dD1UvepUMWOppUQh1uh6l2X bqeBNWjePBsg+Nhn0jDLAOjP6bgM++PKTOEnbH7eS2oWgV+UWNtYRxzkTYTQJfyiKB4s BUU9RCCFqtpFnE2G8K1FgCO0sginZyQ1wcAM53qx0VC3brPAgyxfSXIF/N+wkRwgAGNc EV6mkeeeLNKkeK8saxDdcLZLSFKXXlGfAcF++YCPM/6Fsv3xrJqx9G6amQGRZg/NLCic YekWZijQQ3yq9Jow5v1DGNCb9AXQ2LAIZdOVm3mGHCgKxgMUNkV0j65WCXtayRUvd7Em QMSw== X-Gm-Message-State: AOJu0YyemtupVUi54uDSQbSbgJMAXJqv4lCHGQXx8mf9EiAVsXKnZgf4 M901E+HXB+fIeED9MAM32LT5PCLqFFkJHMFA+RV0orugwc0vOM5/a5XURqiUxgc= X-Google-Smtp-Source: AGHT+IHm+IjZSL5MFaeIYXJO7eqRAnUcc+uRFGNFrFe8bCSLuvFk+NWPQbc3KpjjyPmrs8hQDq6N6w== X-Received: by 2002:adf:e641:0:b0:339:3968:65b0 with SMTP id b1-20020adfe641000000b00339396865b0mr117305wrn.19.1705876814526; Sun, 21 Jan 2024 14:40:14 -0800 (PST) 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 i7-20020a5d6307000000b00337d71bb3c0sm8434951wru.46.2024.01.21.14.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 14:40:14 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 21 Jan 2024 22:40:09 +0000 Message-ID: <60563736b8f8580da7beaf156128c13057e4e3f8.1705876473.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/python-xyz.scm (python-cppheaderparser): New variable. Change-Id: I3c57c31a0b63212e43e1ab387b5d329c04ed0e31 --- gnu/packages/python-xyz.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b23108fbf4..93e7571f78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -94,7 +94,7 @@ ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2021, 2022 Morgan Smith -;;; Copyright © 2021-2023 Sharlatan Hellseher +;;; Copyright © 2021-2024 Sharlatan Hellseher ;;; Copyright © 2021 Ellis Kenyő ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Xinglu Chen @@ -8810,6 +8810,29 @@ (define-public python-cplot complex-valued functions.") (license license:gpl3+))) +(define-public python-cppheaderparser + (package + (name "python-cppheaderparser") + (version "2.7.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "CppHeaderParser" version)) + (sha256 + (base32 "0hncwd9y5ayk8wa6bqhp551mcamcvh84h89ba3labc4mdm0k0arq")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f)) ;test suite not included in the release + (propagated-inputs (list python-ply)) + (home-page "http://senexcanis.com/open-source/cppheaderparser/") + (synopsis + "Parse C++ header files and generate a data structure representing the class") + (description + "CppHeaderParser is a pure python module that will parse C++ header files +and generate a data structure representing the class.") + (license license:bsd-3))) + (define-public python-cppy (package (name "python-cppy") From patchwork Sun Jan 21 22:40:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59305 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 3623027BBEA; Sun, 21 Jan 2024 22:41:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 230DB27BBE2 for ; Sun, 21 Jan 2024 22:41:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRgUy-00079I-Tx; Sun, 21 Jan 2024 17:41:05 -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 1rRgUu-00078o-Ib for guix-patches@gnu.org; Sun, 21 Jan 2024 17:41:01 -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 1rRgUu-0005K1-AM; Sun, 21 Jan 2024 17:41:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRgUw-0008Rp-5t; Sun, 21 Jan 2024 17:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68650] [PATCH 2/2] gnu: python-pyamg: Regenerate bundled files. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 22:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68650 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68650@debbugs.gnu.org Cc: Sharlatan Hellseher , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 68650-submit@debbugs.gnu.org id=B68650.170587682832415 (code B ref 68650); Sun, 21 Jan 2024 22:41:02 +0000 Received: (at 68650) by debbugs.gnu.org; 21 Jan 2024 22:40:28 +0000 Received: from localhost ([127.0.0.1]:39212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRgUN-0008Qk-OU for submit@debbugs.gnu.org; Sun, 21 Jan 2024 17:40:28 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:53652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRgUL-0008QG-3Z for 68650@debbugs.gnu.org; Sun, 21 Jan 2024 17:40:26 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-337d05b8942so2951391f8f.3 for <68650@debbugs.gnu.org>; Sun, 21 Jan 2024 14:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705876815; x=1706481615; 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=5k6pyWIbbCCegWNyRqck0QeVBVawIrCrZOnEEQzJUjI=; b=bF7HZ+Lgb6CgEtoA6gSTSRaDWXkTVZukHvunlQQewqMuMnGP2ixOBIJoDS8h1P1Y4K rICfrXCGCdHyVUAiFISxKyTpzFGZTUFb3yPc0Sii7Jmo3VF91UyTdAKcXhjHkwHceYt/ xdXAhW3WxR39T1YSjMFBFBeuLm5X26JAaUS9BWmCI91mWqAsuzV6Xp5HK8Dlg6RFn8QA 8DVo5uLoC/Xl4d8u7MwsI2aotTwaGmhGtVNQyo3w9gbUBCeeevi1eRWXK+Ku3rXttWJz 3hOW2R30xJd0O2yF3MunUCdNOamGQd8uLZRpTMWNnrybDnDR4iCcJkfC67Tn/uJ6e4D7 WTyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705876815; x=1706481615; 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=5k6pyWIbbCCegWNyRqck0QeVBVawIrCrZOnEEQzJUjI=; b=COgIaKz22EidaWroVSrJV45QX/21MmtW0aoyk3IvKOnVN7tHp+432G9Zri5ndFst6N RPeM1i1c0x+Ul99iuVwkpLUC9JIK8c3iLqjsLrnVMti7kqeORIjFAyx9Mb8tK0NFMdPe 8kQRotRHVLcpla96fNuMEyGLqKcJ7cBqcBMwKGi+ljHnmwgH6uxx+FJX6CwtNlYTWQ4w 1fmsg3fJBiOGlcOWfPHu8RMy/mQDU+U1Qc8AMtXy1uIzAWfdArdCgClVsLk64Hfr40od gyYjo0wqW3QFQeec4TKTnZGDBnA406bkHWpQRUBkdW8WiDzVy6hvCkcKswtZ4LJQhkX2 ZTlA== X-Gm-Message-State: AOJu0Yx1mBI81MxxkyIzBYW9tzhLWJwDfYHGJBt15+nJ8gp9GovT0kzs 28y5DeD+MIchLFSPX664fmQSkBnRvJxQOCyHdOe6W/0Op90kymO6ihFu18PQyK8= X-Google-Smtp-Source: AGHT+IEVKc4gEptU5BF92MSVMmssCUNQgt72g1bFq4OhXbsB1y0UqjyOlmzQaARLHDqIn8TUHmmjBQ== X-Received: by 2002:adf:e84c:0:b0:337:c735:8e46 with SMTP id d12-20020adfe84c000000b00337c7358e46mr1799654wrn.92.1705876815224; Sun, 21 Jan 2024 14:40:15 -0800 (PST) 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 i7-20020a5d6307000000b00337d71bb3c0sm8434951wru.46.2024.01.21.14.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 14:40:14 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 21 Jan 2024 22:40:10 +0000 Message-ID: <7767b2be009f37b60aa711e089bb5f80828aff25.1705876473.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/python-science.scm (python-pyamg)[source]: Delete auto-generated files. [arguments]<#:phases>: Add 'amg-core-bind-them phase to re-generate *_bind.cpp files deleted in snippet. [desciption]: Improve style, commit implementation details. Change-Id: I6f68914cd912e6f4592e51c21b129847e73be847 --- gnu/packages/python-science.scm | 50 +++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index c1be6cde23..4183bd2ea2 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -465,32 +465,64 @@ (define-public python-pyamg (source (origin (method url-fetch) (uri (pypi-uri "pyamg" version)) + (modules '((guix build utils))) + (snippet + ;; Delete autogenerated files, regenerate in a phase. + #~(begin + (for-each + (lambda (file) + (delete-file (string-append "pyamg/amg_core/" file))) + '("air_bind.cpp" + "evolution_strength_bind.cpp" + "graph_bind.cpp" + "krylov_bind.cpp" + "linalg_bind.cpp" + "relaxation_bind.cpp" + "ruge_stuben_bind.cpp" + "smoothed_aggregation_bind.cpp" + "tests/bind_examples_bind.cpp")))) (sha256 (base32 "0l3dliwynxyjvbgpmi2k8jqvkkw6fc00c8w69h6swhrkfh0ql12z")))) - (build-system pyproject-build-system) (arguments (list #:test-flags ;; Test installed package in order to find C++ modules. - #~(list "--pyargs" "pyamg.tests"))) - (native-inputs (list pybind11 python-pytest python-setuptools-scm)) + #~(list "--pyargs" "pyamg.tests") + #:phases + #~(modify-phases %standard-phases + ;; Regenerate the autogenerated files. + (add-after 'unpack 'amg-core-bind-them + (lambda _ + ;; bindthem.py heavily depends on location to produce *_bind.cpp + ;; file, make it available in tests as well. + (copy-file "pyamg/amg_core/bindthem.py" + "pyamg/amg_core/tests/bindthem.py") + (with-directory-excursion "pyamg/amg_core" + (substitute* "bindthem.py" + (("/usr/bin/env python3") (which "python3"))) + (invoke "sh" "generate.sh")) + (with-directory-excursion "pyamg/amg_core/tests" + (invoke "python" "bindthem.py" "bind_examples.h"))))))) + (build-system pyproject-build-system) + (native-inputs + (list pybind11 + python-cppheaderparser + python-pytest + python-pyyaml + python-setuptools-scm)) (propagated-inputs (list python-numpy python-scipy)) (home-page "https://github.com/pyamg/pyamg") (synopsis "Algebraic Multigrid Solvers in Python") (description "PyAMG is a Python library of Algebraic Multigrid -(AMG) solvers. - -PyAMG features implementations of: +(AMG) solvers. It features implementations of: @itemize @item Ruge-Stuben (RS) or Classical AMG @item AMG based on Smoothed Aggregation (SA) @item Adaptive Smoothed Aggregation (αSA) @item Compatible Relaxation (CR) @item Krylov methods such as CG, GMRES, FGMRES, BiCGStab, MINRES, etc. -@end itemize -PyAMG is primarily written in Python with supporting C++ code for -performance critical operations.") +@end itemize") (license license:expat))) (define-public python-tspex