From patchwork Wed Mar 20 22:38:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 62095 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 A593327BBEB; Wed, 20 Mar 2024 22:41:44 +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_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 5F6DE27BBE2 for ; Wed, 20 Mar 2024 22:41:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rn4bh-0005tf-He; Wed, 20 Mar 2024 18:40:25 -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 1rn4bg-0005t9-3e for guix-patches@gnu.org; Wed, 20 Mar 2024 18:40:24 -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 1rn4bf-0007b6-Oe for guix-patches@gnu.org; Wed, 20 Mar 2024 18:40:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rn4cJ-0006CG-9n for guix-patches@gnu.org; Wed, 20 Mar 2024 18:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v3 03/32] gnu: Add python-optree. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Mar 2024 22:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.171097442323506 (code B ref 69591); Wed, 20 Mar 2024 22:41:03 +0000 Received: (at 69591) by debbugs.gnu.org; 20 Mar 2024 22:40:23 +0000 Received: from localhost ([127.0.0.1]:36791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4be-00066y-Le for submit@debbugs.gnu.org; Wed, 20 Mar 2024 18:40:23 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4bG-00062Z-KY for 69591@debbugs.gnu.org; Wed, 20 Mar 2024 18:39:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6E47E240101 for <69591@debbugs.gnu.org>; Wed, 20 Mar 2024 23:39:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710974353; bh=JmN0vzDIbEKvNGzBL9EH0qHS0Qc2yiXMS0Twf+gbDaM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=b8appGVhO+dfet34dnQCbNBpKgKnvxP/FlUfkhvluC5+vxJUHZDlBqBdve8q1OJxl 1Zk6gSoDR1Vo2QhKZMFOWvyru2gXiojadpIFttSKXSpsG83l8a0gnD4g+A8VfvHIAB DVnfImM5k9M6TirKvlf4+amu2gahKCJ9A8xUBNT7MBeGKdzhCuEpIIuIo1dTTYGHvA D5xZfpCeTKTgCWCeDWY/ZZzonExag/k8VowaRt63aCJgkDFDMyRW/1wUKoz/1oXDFP DyTZ0ev4L1ajiHQqjMEtYi2x6TC3O2koP95mkdgdcjwwrAEG6hRD3BoQQE2CRB/tHq J7ozHO6yUYzuQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V0Nmw61z6z6tvq; Wed, 20 Mar 2024 23:39:12 +0100 (CET) From: David Elsing Date: Wed, 20 Mar 2024 22:38:28 +0000 Message-ID: <20240320223906.13214-3-david.elsing@posteo.net> In-Reply-To: <20240320223737.12883-1-david.elsing@posteo.net> References: <20240320223737.12883-1-david.elsing@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/python-xyz.scm (python-optree): New variable. --- .../patches/python-optree-fix-32-bit.patch | 122 ++++++++++++++++++ gnu/packages/python-xyz.scm | 30 +++++ 2 files changed, 152 insertions(+) create mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch diff --git a/gnu/packages/patches/python-optree-fix-32-bit.patch b/gnu/packages/patches/python-optree-fix-32-bit.patch new file mode 100644 index 0000000000..6a32c39bd8 --- /dev/null +++ b/gnu/packages/patches/python-optree-fix-32-bit.patch @@ -0,0 +1,122 @@ +In include/utils.h, ssize_t is an alias for py::ssize_t, which is an alias for +Py_ssize_t in Python, which is an alias for the system ssize_t. +The latter is defined in glibc as int if __WORDSIZE == 32 and as long int if +__WORDSIZE == 64. Therefore, we need to remove the explicit template +specialization for int in the first case. + +diff --git a/include/utils.h b/include/utils.h +index 950a02b..82a9591 100644 +--- a/include/utils.h ++++ b/include/utils.h +@@ -141,10 +141,12 @@ template <> + inline py::handle GET_ITEM_HANDLE(const py::handle& container, const size_t& item) { + return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); + } ++#if __WORDSIZE != 32 + template <> + inline py::handle GET_ITEM_HANDLE(const py::handle& container, const int& item) { + return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); + } ++#endif + template <> + inline py::handle GET_ITEM_HANDLE(const py::handle& container, const ssize_t& item) { + return PyList_GET_ITEM(container.ptr(), item); +@@ -153,10 +155,12 @@ template <> + inline py::handle GET_ITEM_HANDLE(const py::handle& container, const size_t& item) { + return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); + } ++#if __WORDSIZE != 32 + template <> + inline py::handle GET_ITEM_HANDLE(const py::handle& container, const int& item) { + return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); + } ++#endif + + template + inline py::object GET_ITEM_BORROW(const py::handle& container, const Item& item) { +@@ -171,11 +175,13 @@ inline py::object GET_ITEM_BORROW(const py::handle& container, const + return py::reinterpret_borrow( + PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#if __WORDSIZE != 32 + template <> + inline py::object GET_ITEM_BORROW(const py::handle& container, const int& item) { + return py::reinterpret_borrow( + PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#endif + template <> + inline py::object GET_ITEM_BORROW(const py::handle& container, const ssize_t& item) { + return py::reinterpret_borrow(PyList_GET_ITEM(container.ptr(), item)); +@@ -185,11 +191,13 @@ inline py::object GET_ITEM_BORROW(const py::handle& container, const s + return py::reinterpret_borrow( + PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#if __WORDSIZE != 32 + template <> + inline py::object GET_ITEM_BORROW(const py::handle& container, const int& item) { + return py::reinterpret_borrow( + PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#endif + + template + inline py::object GET_ITEM_STEAL(const py::handle& container, const Item& item) { +@@ -204,11 +212,13 @@ inline py::object GET_ITEM_STEAL(const py::handle& container, const s + return py::reinterpret_steal( + PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#if __WORDSIZE != 32 + template <> + inline py::object GET_ITEM_STEAL(const py::handle& container, const int& item) { + return py::reinterpret_steal( + PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#endif + template <> + inline py::object GET_ITEM_STEAL(const py::handle& container, const ssize_t& item) { + return py::reinterpret_steal(PyList_GET_ITEM(container.ptr(), item)); +@@ -218,11 +228,13 @@ inline py::object GET_ITEM_STEAL(const py::handle& container, const si + return py::reinterpret_steal( + PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#if __WORDSIZE != 32 + template <> + inline py::object GET_ITEM_STEAL(const py::handle& container, const int& item) { + return py::reinterpret_steal( + PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); + } ++#endif + + template + inline void SET_ITEM(const py::handle& container, const Item& item, const py::handle& value) { +@@ -240,12 +252,14 @@ inline void SET_ITEM(const py::handle& container, + const py::handle& value) { + PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); + } ++#if __WORDSIZE != 32 + template <> + inline void SET_ITEM(const py::handle& container, + const int& item, + const py::handle& value) { + PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); + } ++#endif + template <> + inline void SET_ITEM(const py::handle& container, + const ssize_t& item, +@@ -258,12 +272,14 @@ inline void SET_ITEM(const py::handle& container, + const py::handle& value) { + PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); + } ++#if __WORDSIZE != 32 + template <> + inline void SET_ITEM(const py::handle& container, + const int& item, + const py::handle& value) { + PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); + } ++#endif + + template + inline void AssertExact(const py::handle& object) { diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ac9d669d3..bac7d79af9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -150,6 +150,7 @@ ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Ian Eure ;;; Copyright © 2024 Adriel Dumas--Jondeau +;;; Copyright © 2024 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -11741,6 +11742,35 @@ (define-public python-treelib "This package provides a Python implementation of a tree structure.") (license license:asl2.0))) +(define-public python-optree + (package + (name "python-optree") + (version "0.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/metaopt/optree") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q3wljk7cyl5rsam02sfsj8zjrqx4c3x9vic8j6xx13p8czpsisg")) + (patches (search-patches "python-optree-fix-32-bit.patch")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-typing-extensions)) + (native-inputs + (list python-pytest + python-pytest-cov + python-pytest-xdist + cmake + pybind11)) + (home-page "https://github.com/metaopt/optree") + (synopsis "Optimized PyTree Utilities") + (description "This package contains operations on PyTrees (a tree made of +container data structures in Python).") + (license license:asl2.0))) + (define-public python-jupyter-core (package (name "python-jupyter-core")