From patchwork Mon Jul 15 19:19:06 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: 46447 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 EDBBEC5474D for ; Mon, 15 Jul 2024 19:19:19 +0000 (UTC) Received: from a27-33.smtp-out.us-west-2.amazonses.com (a27-33.smtp-out.us-west-2.amazonses.com [54.240.27.33]) by mx.groups.io with SMTP id smtpd.web11.1308.1721071147010283716 for ; Mon, 15 Jul 2024 12:19:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=IZMG/giK; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=RLT3ajl2; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 01010190b7d59578-d3598739-a575-490b-bab3-363d781710e8-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=1721071146; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=/nsK3sfcX7EVHlPEH5hZH7F+o4Xxuv6c5D5BentiaPA=; b=IZMG/giKh9ABsRfm/Z83yzPfDRj2YSD1bzQYj9Uku2XkIZaNeBSzMg2CJekK6lN6 1NeIUqAHitR/i0amEqbRwCknoC8/HC6UxYkVTqbq5l1Jfs4+eBrk8+YBDEab0kkai2w Kp0lvxxtmn6nNYNm7ysUqzsjjPys33Vn1m+6VGM8= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1721071146; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=/nsK3sfcX7EVHlPEH5hZH7F+o4Xxuv6c5D5BentiaPA=; b=RLT3ajl2MZZDAKDYVu+F7BrzXgJUj8TvwvxgCnVinnh34ENP3DBPURPm85LvTxeY Nme1RAoKSN8GpElmD2JG5i5gNnMyxbEwdZ3YDQ1gly+rc/IINpNg7p8Qxv2pU+2is5B yCg2S5+ylJqehlUSITdgVAjA1U5iG7mF/zl7HLdU= MIME-Version: 1.0 From: auh@yoctoproject.org To: Trevor Gamblin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] python3-numpy: upgrading to 2.0.0 FAILED Message-ID: <01010190b7d59578-d3598739-a575-490b-bab3-363d781710e8-000000@us-west-2.amazonses.com> Date: Mon, 15 Jul 2024 19:19:06 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.07.15-54.240.27.33 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 ; Mon, 15 Jul 2024 19:19:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201982 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *python3-numpy* to *2.0.0* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-python3-numpy-upgrade-1.26.4-2.0.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 228d856842174277501074a861f4b7290c67da8c Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 15 Jul 2024 11:14:52 +0000 Subject: [PATCH] python3-numpy: upgrade 1.26.4 -> 2.0.0 --- ...-and-so-on-for-libraries-by-default-.patch | 5 ++-- ...1-numpy-core-Define-RISCV-32-support.patch | 23 ++++++++----------- .../python3-numpy/fix_reproducibility.patch | 23 ++++++++++++------- ...numpy_1.26.4.bb => python3-numpy_2.0.0.bb} | 23 +++++++++++++++++-- 4 files changed, 48 insertions(+), 26 deletions(-) rename meta/recipes-devtools/python/{python3-numpy_1.26.4.bb => python3-numpy_2.0.0.bb} (73%) 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..12fe41b97c 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 f10921bf081c5b94b43d2bb1011388920a589c58 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,13 +8,12 @@ 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 edf5690..3b55df1 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -327,44 +327,14 @@ def add_system_root(library_root): 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 index 676bdbb3af..2a85be48e6 100644 --- 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 @@ -1,4 +1,4 @@ -From eb6d6579150bf4684603ce377c51e90ad3bb8109 Mon Sep 17 00:00:00 2001 +From 5f431a167ed6992b65f9b89cdf5155621939b098 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 @@ -8,14 +8,14 @@ Helps compile on riscv32 Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780] Signed-off-by: Khem Raj --- - numpy/core/include/numpy/npy_cpu.h | 3 +++ - numpy/core/include/numpy/npy_endian.h | 1 + + numpy/_core/include/numpy/npy_cpu.h | 3 +++ + numpy/_core/include/numpy/npy_endian.h | 1 + 2 files changed, 4 insertions(+) -diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h -index 78d229e..04be511 100644 ---- a/numpy/core/include/numpy/npy_cpu.h -+++ b/numpy/core/include/numpy/npy_cpu.h +diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h +index a19f8e6..d824d4e 100644 +--- a/numpy/_core/include/numpy/npy_cpu.h ++++ b/numpy/_core/include/numpy/npy_cpu.h @@ -19,6 +19,7 @@ * NPY_CPU_ARCEB * NPY_CPU_RISCV64 @@ -33,10 +33,10 @@ index 78d229e..04be511 100644 #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 +diff --git a/numpy/_core/include/numpy/npy_endian.h b/numpy/_core/include/numpy/npy_endian.h index 5e58a7f..0926212 100644 ---- a/numpy/core/include/numpy/npy_endian.h -+++ b/numpy/core/include/numpy/npy_endian.h +--- 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) \ @@ -45,6 +45,3 @@ index 5e58a7f..0926212 100644 || defined(NPY_CPU_LOONGARCH) \ || defined(NPY_CPU_WASM) #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN --- -2.20.1 - diff --git a/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch b/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch index d952aed00c..6a6d32b6bb 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 3ab110303fe19785326e89b42cdba8833ca0652b 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_1.26.4.bb b/meta/recipes-devtools/python/python3-numpy_2.0.0.bb similarity index 73% rename from meta/recipes-devtools/python/python3-numpy_1.26.4.bb rename to meta/recipes-devtools/python/python3-numpy_2.0.0.bb index ccd08147af..d076a8d4dc 100644 --- a/meta/recipes-devtools/python/python3-numpy_1.26.4.bb +++ b/meta/recipes-devtools/python/python3-numpy_2.0.0.bb @@ -1,9 +1,28 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- LICENSE.txt +# +++ LICENSE.txt +# @@ -1,4 +1,4 @@ +# -Copyright (c) 2005-2023, NumPy Developers. +# +Copyright (c) 2005-2024, NumPy Developers. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# +# + SUMMARY = "A sophisticated Numeric Processing Package for Python" HOMEPAGE = "https://numpy.org/" DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python." SECTION = "devel/python" LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF-2.0 & Apache-2.0 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a752eb20459cf74a9d84ee4825e8317c" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1de863c37a83e71b1e97b64d036ea78b" SRCNAME = "numpy" @@ -13,7 +32,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://fix_reproducibility.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010" +SRC_URI[sha256sum] = "cf5d1c9e6837f8af9f92b6bd3e86d513cdc11f60fd62185cc49ec7d1aba34864" GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$"