From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id qEejK6NW/2Up1QAA62LTzQ:P1 (envelope-from ) for ; Sat, 23 Mar 2024 23:24:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id qEejK6NW/2Up1QAA62LTzQ (envelope-from ) for ; Sat, 23 Mar 2024 23:24:35 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=IUxh3J2l; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711232675; a=rsa-sha256; cv=none; b=I5uuUe18ZIyhihGo9hI1fWK1pTlyLMOB11Ly02RfQfVwMzl3Qj9Nzka/ubwY7RN4Wwtu98 d0UbWG5jCWMMs+4K2JyFou6ustD3TPE5f7aiG3BJN6f15mzzWGL+bOXBNZyeKAhfxImFk/ Gb28ELk+0+CGid8klZVSDpri4ombX9L0A0x8GDgYWoQOVf9Fe60r9VahZXagOBRoxF1VU/ WWfQSgopb7BsgcvleHxdHY7OZdI6iXiJM4jKZA5TGm3pM++lSGtfmoYdqSCYIQPbfC/Rli VX3aRtQdzYZbyRmp9AIm4rkLb9zscqYbssSqHYe+y40qkibQh0NOU3xCEHGyZw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=IUxh3J2l; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711232675; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Y7AnEK5rJEQP2og9xDtWjCfGmMiJOJVkBIVwF9IWX4c=; b=r4RvsZoQJ/guEIsV5S4O0TEBmMFQftHa0/OAcgb44qzwwoZRJvVKprBjuQBjucKG/rov6Z wToIoTNeRWbOMXbYeUtXD1R8pG0zIiFMRFr10Hn1ZoUBkYqwkMV4oCdMgSvbzb2GhVXzqa eFVCcEp8k+CEJ2tP8YLgYrOATTh5eLf11UCDnPocfekK/jEGIuO4w8EGfoKmm5iatV5++G WgHRfdEr0MkmM6Nj0sjEWfZlodUQdTXz2KVTG5eCpfe5cvEO5MzaQgyBYFl79q25yokwV2 licxoSX0qo4R6kKDzx1OPiUJbqfmKsqzewqf0nuG0O3dhC64pkyoA82Ae5+Dow== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 61AD636541 for ; Sat, 23 Mar 2024 23:24:35 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ro9mv-0000gD-6z; Sat, 23 Mar 2024 18:24:29 -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 1ro9mq-0000fE-KU for guix-patches@gnu.org; Sat, 23 Mar 2024 18:24: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 1ro9mn-0003LI-F3 for guix-patches@gnu.org; Sat, 23 Mar 2024 18:24:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ro9nS-0007D1-QC for guix-patches@gnu.org; Sat, 23 Mar 2024 18:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v4 03/32] gnu: Add python-optree. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Mar 2024 22:25:02 +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.171123268027632 (code B ref 69591); Sat, 23 Mar 2024 22:25:02 +0000 Received: (at 69591) by debbugs.gnu.org; 23 Mar 2024 22:24:40 +0000 Received: from localhost ([127.0.0.1]:57446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ro9n5-0007Ba-8L for submit@debbugs.gnu.org; Sat, 23 Mar 2024 18:24:40 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ro9n2-0007BB-7Q for 69591@debbugs.gnu.org; Sat, 23 Mar 2024 18:24:37 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8745A240028 for <69591@debbugs.gnu.org>; Sat, 23 Mar 2024 23:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711231522; bh=ZiC8+Bdr2GOKIJUEuMkrkyWc8vKaDUV0z/pklwALHuk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=IUxh3J2lKhnVOS4cGvX6jBiUjmqFxyUokAnkj4fu8JYtwEEasPHSQ9UiJ3KK3JGyt vp93zMmC4BKIIVmrPJHV1rG+jxNbmwdpxPVnGvNvWL5jB0+1G2+wCVMkSnVj8CgbpH N07KMbBOd+KdiPJwDig3YGFiXQ7Nk4DqyOqY543ko9qFAYeB6rHMec2nQODMrLFhjg +/RF1SMHsFnGGGR0QW8nnmrXYXWFr3KFVrgD6sZVw1RXk8BIaljF5aII20YhEbelDl In5d6ASQ16MZOrE9fmEZzlXDu7iAfgsdq5UCzVO1AF4EQqBwXmKvF8TQ1HC5aHqJJd 6x5b3SHRuwK0g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V2CtV0ZDLz6trs; Sat, 23 Mar 2024 23:05:22 +0100 (CET) From: David Elsing Date: Sat, 23 Mar 2024 22:04:42 +0000 Message-ID: <20240323220518.25063-3-david.elsing@posteo.net> In-Reply-To: <20240323214040.20221-1-david.elsing@posteo.net> References: <20240323214040.20221-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: 3.47 X-Migadu-Queue-Id: 61AD636541 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 3.47 X-TUID: nE3b+JteaVip * 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 aad89d251e..5357c94b8c 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") -- 2.41.0