From patchwork Wed Mar 6 19:40:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 61411 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 2220C27BBE9; Wed, 6 Mar 2024 19:41:41 +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=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 4847827BBE2 for ; Wed, 6 Mar 2024 19:41:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhx8v-0001bm-Lv; Wed, 06 Mar 2024 14:41:33 -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 1rhx8u-0001bM-Qq for guix-patches@gnu.org; Wed, 06 Mar 2024 14:41:32 -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 1rhx8u-0006Ad-HL for guix-patches@gnu.org; Wed, 06 Mar 2024 14:41:32 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhx9P-0008EV-FU for guix-patches@gnu.org; Wed, 06 Mar 2024 14:42:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH 03/31] gnu: Add python-optree. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 19:42: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.170975409931436 (code B ref 69591); Wed, 06 Mar 2024 19:42:03 +0000 Received: (at 69591) by debbugs.gnu.org; 6 Mar 2024 19:41:39 +0000 Received: from localhost ([127.0.0.1]:51511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhx8w-0008AJ-Mv for submit@debbugs.gnu.org; Wed, 06 Mar 2024 14:41:38 -0500 Received: from mout02.posteo.de ([185.67.36.66]:42533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhx8o-00088z-RA for 69591@debbugs.gnu.org; Wed, 06 Mar 2024 14:41:31 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id DC9C0240101 for <69591@debbugs.gnu.org>; Wed, 6 Mar 2024 20:40:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1709754049; bh=2jnVKrITabLjSvwYNrhfichhEJmTInJKllpuoWFBvrE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=NlGRsCefssdfC6u7fGZKU1AQaJX1yd5kfhtbRpKnYVsIdo6uICjVPxekilnjiBhFm /xlfV8ufQ3u2aZiZiE9WU7wVf6xK36VLSJ5q0PYz1u5HHH9IVgtaU1DyjjFe384Dt+ atKnd2X6mbQQMN0jjCbAy6Akexn3vgXV9yEeJncdnKd63TtLioBqvExpMZCpwqQkwJ M1YvVXMeQdXWvnaNQLI0cWh9G0XBEJGlh1USjCDuxeZ5oLD0aQVwiV9MoRglueQ8J6 GGD8hVwTzEqL/ZI8qayHIfgYYQAZPf1Am1g0h191gnyrdfhxIhN8ixIJGeWrvtKwCB 2s+bAFCZdLgqg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TqjTY2Qq8z6txL; Wed, 6 Mar 2024 20:40:49 +0100 (CET) From: David Elsing Date: Wed, 6 Mar 2024 19:40:09 +0000 Message-ID: <20240306194037.17992-3-david.elsing@posteo.net> In-Reply-To: <20240306193725.17463-1-david.elsing@posteo.net> References: <20240306193725.17463-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 | 29 +++++ 2 files changed, 151 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 fc6e997b6c..e1e68ca343 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11635,6 +11635,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")