From patchwork Sun Dec 15 09:29:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 54109 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17518E7719B for ; Sun, 15 Dec 2024 09:29:51 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.33383.1734254982758079082 for ; Sun, 15 Dec 2024 01:29:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=SpgqUHpQ; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=TTG0QziN; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 01010193c9a6f379-ea4e0363-a73a-4de4-9d24-ed21b5086266-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1734254982; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=+he7+Mhxnx2/yGDJB5Ng/5NSx+NhTiPcdjw+LPgx4MI=; b=SpgqUHpQvzMUhhdlS+mwzCTNs0o4td1168AwMNYYlEW1xvabeCI04GN0EsI7t+yM XK++XzI1+7MHIzH448j+ZYjD4gknJK79GJF+4KscjNwkuDE5V5RMM2Byj2cAlTv5SNZ t8ZMcYGCjiQkQXo6HQy7MCVLdh0K2iy9chn1EucM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1734254982; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=+he7+Mhxnx2/yGDJB5Ng/5NSx+NhTiPcdjw+LPgx4MI=; b=TTG0QziNRvMeb+telkGr98D9ehP9vmY1GXML9O76M/3JPDT0no361Ty7Uc7G/VQF pwgxjNaIFte32gPlahpEjq/UK9y5plDM7Me1IQ+Jvft96tDs/S8yNTU6VyHdWZjJqEH pcewDVZv87ZVD/dPSylyHauQgGISwJzWo6a8LkwM= MIME-Version: 1.0 From: auh@yoctoproject.org To: Trevor Gamblin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] python3-numpy: upgrading to 2.2.0 SUCCEEDED Message-ID: <01010193c9a6f379-ea4e0363-a73a-4de4-9d24-ed21b5086266-000000@us-west-2.amazonses.com> Date: Sun, 15 Dec 2024 09:29:42 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.12.15-54.240.27.193 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Dec 2024 09:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208717 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *python3-numpy* to *2.2.0* has Succeeded. Next steps: - apply the patch: git am 0001-python3-numpy-upgrade-2.1.3-2.2.0.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 03f31640b58b687a050608d9aa5b468a9e79a95a Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 15 Dec 2024 07:23:18 +0000 Subject: [PATCH] python3-numpy: upgrade 2.1.3 -> 2.2.0 --- ...-and-so-on-for-libraries-by-default-.patch | 7 +-- ...1-numpy-core-Define-RISCV-32-support.patch | 58 ------------------- .../python3-numpy/fix_reproducibility.patch | 23 +++++--- ...-numpy_2.1.3.bb => python3-numpy_2.2.0.bb} | 3 +- 4 files changed, 19 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch rename meta/recipes-devtools/python/{python3-numpy_2.1.3.bb => python3-numpy_2.2.0.bb} (94%) diff --git a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index bbe309c556..b8f2e42a25 100644 --- a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -1,4 +1,4 @@ -From 46eea664cf89d0602e7ff16d587c37c045b125b7 Mon Sep 17 00:00:00 2001 +From 0f34943f5c2952fc830eb4f5a1e7aa1f1fa298e3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 10 Dec 2015 13:20:30 +0200 Subject: [PATCH] Don't search /usr and so on for libraries by default to @@ -8,16 +8,15 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to Upstream-Status: Inappropriate (As the code stands, this is a hack) Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin - --- numpy/distutils/system_info.py | 42 +++++----------------------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index feb28f6..a48d6d1 100644 +index 6478548..c0620e7 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -327,44 +327,14 @@ def add_system_root(library_root): +@@ -326,44 +326,14 @@ def add_system_root(library_root): add_system_root(os.path.join(conda_dir, 'Library')) else: diff --git a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch deleted file mode 100644 index 6da9047ec5..0000000000 --- a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0e2b652a0eff85798584116c905a2d6ad8f25d5f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 15:32:39 -0800 -Subject: [PATCH] numpy/core: Define RISCV-32 support - -Helps compile on riscv32 - -Upstream-Status: Backport -(https://github.com/numpy/numpy/pull/17780/commits/0e2b652a0eff85798584116c905a2d6ad8f25d5f) - -Signed-off-by: Khem Raj ---- - numpy/_core/include/numpy/npy_cpu.h | 9 +++++++-- - numpy/_core/include/numpy/npy_endian.h | 1 + - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h -index a19f8e6bbd..15f9f12931 100644 ---- a/numpy/_core/include/numpy/npy_cpu.h -+++ b/numpy/_core/include/numpy/npy_cpu.h -@@ -18,6 +18,7 @@ - * NPY_CPU_ARCEL - * NPY_CPU_ARCEB - * NPY_CPU_RISCV64 -+ * NPY_CPU_RISCV32 - * NPY_CPU_LOONGARCH - * NPY_CPU_WASM - */ -@@ -102,8 +103,12 @@ - #define NPY_CPU_ARCEL - #elif defined(__arc__) && defined(__BIG_ENDIAN__) - #define NPY_CPU_ARCEB --#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 -- #define NPY_CPU_RISCV64 -+#elif defined(__riscv) -+ #if __riscv_xlen == 64 -+ #define NPY_CPU_RISCV64 -+ #elif __riscv_xlen == 32 -+ #define NPY_CPU_RISCV32 -+ #endif - #elif defined(__loongarch__) - #define NPY_CPU_LOONGARCH - #elif defined(__EMSCRIPTEN__) -diff --git a/numpy/_core/include/numpy/npy_endian.h b/numpy/_core/include/numpy/npy_endian.h -index 5e58a7f52c..09262120bf 100644 ---- a/numpy/_core/include/numpy/npy_endian.h -+++ b/numpy/_core/include/numpy/npy_endian.h -@@ -49,6 +49,7 @@ - || defined(NPY_CPU_PPC64LE) \ - || defined(NPY_CPU_ARCEL) \ - || defined(NPY_CPU_RISCV64) \ -+ || defined(NPY_CPU_RISCV32) \ - || defined(NPY_CPU_LOONGARCH) \ - || defined(NPY_CPU_WASM) - #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN --- -2.39.5 - diff --git a/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch b/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch index d952aed00c..6412f5f58c 100644 --- a/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch +++ b/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch @@ -1,7 +1,11 @@ -This regex decides whether to use O3 opimisation on numpy or not. +From 9e382d90d97846477748dbfc8db0c2144091c2a5 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Fri, 29 Sep 2023 22:53:24 +0100 +Subject: [PATCH] This regex decides whether to use O3 opimisation on numpy or + not. It includes "od", which happens to be a substring of "reproducible" -but not "qemux86-world". +but not "qemux86-world". The regex will run against all compiler options including things like: @@ -17,12 +21,15 @@ reproducible target ran first and won the race to populate sstate. Upstream-Status: Inappropriate [upstream have dropped distutils and switched to meson] Signed-off-by: Richard Purdie - -Index: numpy-1.26.0/numpy/distutils/ccompiler_opt.py -=================================================================== ---- numpy-1.26.0.orig/numpy/distutils/ccompiler_opt.py -+++ numpy-1.26.0/numpy/distutils/ccompiler_opt.py -@@ -990,7 +990,7 @@ class _CCompiler: +--- + numpy/distutils/ccompiler_opt.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/distutils/ccompiler_opt.py b/numpy/distutils/ccompiler_opt.py +index b1a6fa3..7b0302b 100644 +--- a/numpy/distutils/ccompiler_opt.py ++++ b/numpy/distutils/ccompiler_opt.py +@@ -991,7 +991,7 @@ def __init__(self): ("cc_is_nocc", "", ""), ) detect_args = ( diff --git a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb b/meta/recipes-devtools/python/python3-numpy_2.2.0.bb similarity index 94% rename from meta/recipes-devtools/python/python3-numpy_2.1.3.bb rename to meta/recipes-devtools/python/python3-numpy_2.2.0.bb index 0120bee439..522f9682a5 100644 --- a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb +++ b/meta/recipes-devtools/python/python3-numpy_2.2.0.bb @@ -9,11 +9,10 @@ SRCNAME = "numpy" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ - file://0001-numpy-core-Define-RISCV-32-support.patch \ file://fix_reproducibility.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "aa08e04e08aaf974d4458def539dece0d28146d866a39da5639596f4921fd761" +SRC_URI[sha256sum] = "140dd80ff8981a583a60980be1a655068f8adebf7a45a06a6858c873fcdcd4a0" GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$"