From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id wH61FRLd8GVO0AAAqHPOHw:P1 (envelope-from ) for ; Tue, 12 Mar 2024 23:54:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id wH61FRLd8GVO0AAAqHPOHw (envelope-from ) for ; Tue, 12 Mar 2024 23:54:10 +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=dE+TT8nE; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710284050; 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=FIf0dhcoovQRcmmwuFjtF83E4ZG1+Xb9p2yUdtqtd1c=; b=Dn+didZpzLki2tFOLIxbHuI7ngiwFFI8ft4U9ErycczqyLxXVLtINHdaYR9Jo1xmqDoiId XWXgGTB3J+xiMFsygMPpxNnKkXDk9ddp9nMQb9RjoEHtXYZQB9ryZuFkNYcL/RuVIZty7B qcxbPdK5mvZJGX5BKdHPT15jEZLV50pvkW4w0CyG76iodTfaZuEsP7wGelHTLeduaGzltn vs5vS7k5g4bRuxKCmSGNdF2ufS5kFCkPSg8itMvk2gl+SGsW6QbRYBTbJ1oghuNcJNsnon fnpWMymDH8VdwlnHlx8n6cQ6B9UBRQkzYXTcZnXQHozmx7VIkcxlga/2EawB7w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710284050; a=rsa-sha256; cv=none; b=c/lMtGyc9DVTsjJnvWtayIdlc8aKprFqL/wAIa+0DMDbPV03WZNVy7Zel86ED2HwBv1sec H1eX9rvsNQbPHHKuohoochFjRBfJfdR2o7HdCq1BA3iIGCSp1iuawCtlJ8B4cmO5OSiTdV 85hAG5cpf6tNy2zyjmEonYTJupe8m6P5zNnnKk0A0MJBm6zdjfMM7Hw8EXGLAqOiMEZnm7 eFArBRuTrE7nRskn8ogVpXgdGwy2xPKWnMOPfEkqcxNQ2x8DeCQeZ+e/smNQhA2NUbFGkZ C7hdLePBrcEh7jgrtu6bpqWPz3l8z/irfjevDkG2qB4XMKfgSQ0nMHNDwuJEPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=dE+TT8nE; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) 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 260816DC33 for ; Tue, 12 Mar 2024 23:54:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkAzx-0008NO-4n; Tue, 12 Mar 2024 18:53: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 1rkAzw-0008MT-78 for guix-patches@gnu.org; Tue, 12 Mar 2024 18:53:28 -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 1rkAzv-0000I9-Vc for guix-patches@gnu.org; Tue, 12 Mar 2024 18:53:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkB0U-0001lZ-Lb for guix-patches@gnu.org; Tue, 12 Mar 2024 18:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v2 03/31] gnu: Add python-optree. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 22:54: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.17102839936418 (code B ref 69591); Tue, 12 Mar 2024 22:54:02 +0000 Received: (at 69591) by debbugs.gnu.org; 12 Mar 2024 22:53:13 +0000 Received: from localhost ([127.0.0.1]:44022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkAze-0001eo-FW for submit@debbugs.gnu.org; Tue, 12 Mar 2024 18:53:12 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkAza-0001dT-5N for 69591@debbugs.gnu.org; Tue, 12 Mar 2024 18:53:07 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id CEF89240101 for <69591@debbugs.gnu.org>; Tue, 12 Mar 2024 23:52:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710283945; bh=wM1QcQy2/eKibkbOoKk4V6fDhdV53ynODlcPdfNRs4o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=dE+TT8nEkIYwxEEqLPiTbR0sfmgl3YVgQqun5XZCYORbhVUgqSsV+Hd5MFkR3sohq yq/YmCP8x9ie5ODJXBmTzrjmAb3Fc/5965vBvLu+Cp2u9rDtyxUb3XhVB9PlgRog25 rQhq+w+3utEEZMHNXIQDMSxuj+086aHZ01c1J/W9fwYmUz8CjYiclVcHEI8C7OfG1y qENuoR4udJrOAiecvaA2GgvMCAb07RPrbrK4qCGdgQTpTrrYIuWZAIJbldEYhaeMPN 5vuWB3XLyL5TZ/9JJ6Wlo64nDyWS8DgfxiMDnM2n0QlBXLeDNqVrAXMBul+9CfFstr Hx7Z42kdbgN3w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TvTRs3Ms4z6ty1; Tue, 12 Mar 2024 23:52:25 +0100 (CET) From: David Elsing Date: Tue, 12 Mar 2024 22:51:31 +0000 Message-ID: <20240312225211.16427-3-david.elsing@posteo.net> In-Reply-To: <20240312224712.15578-1-david.elsing@posteo.net> References: <20240312224712.15578-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-Migadu-Spam-Score: -4.39 X-Spam-Score: -4.39 X-Migadu-Queue-Id: 260816DC33 X-Migadu-Scanner: mx11.migadu.com X-TUID: E/BI8Ag7c9fk * 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 0c72caeca0..b664aac3b7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -148,6 +148,7 @@ ;;; Copyright © 2023, 2024 Troy Figiel ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Ian Eure +;;; Copyright © 2024 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -11636,6 +11637,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