| Message ID | 20241216154438.2864156-1-tgamblin@baylibre.com |
|---|---|
| State | Accepted, archived |
| Commit | ff93068be3dd1993675dd016fd6b5e98ccb262bf |
| Headers | show |
| Series | python3-numpy: upgrade 2.1.3 -> 2.2.0 | expand |
On Mon Dec 16, 2024 at 4:44 PM CET, Trevor Gamblin wrote: > Patch '0001-numpy-core-Define-RISCV-32-support.patch' is included in > v2.2.0, so remove it from the SRC_URI list: > Hi Trevor, It looks like this patch is breaking the reproducible builder on the autobuilder: AssertionError: The following deb packages are different and not in exclusion list: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./core2-64/python3-numpy-dbg_2.2.0-r0_amd64.deb /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./core2-64/python3-numpy_2.2.0-r0_amd64.deb The following ipk packages are different and not in exclusion list: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./core2-64/python3-numpy-dbg_2.2.0-r0_core2-64.ipk /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./core2-64/python3-numpy_2.2.0-r0_core2-64.ipk The following rpm packages are different and not in exclusion list: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./core2_64/python3-numpy-2.2.0-r0.core2_64.rpm /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./core2_64/python3-numpy-dbg-2.2.0-r0.core2_64.rpm https://valkyrie.yoctoproject.org/#/builders/37/builds/687/steps/12/logs/stdio Can you have a look at this please ?
On 2024-12-17 05:11, Mathieu Dubois-Briand wrote: > On Mon Dec 16, 2024 at 4:44 PM CET, Trevor Gamblin wrote: >> Patch '0001-numpy-core-Define-RISCV-32-support.patch' is included in >> v2.2.0, so remove it from the SRC_URI list: >> > Hi Trevor, > > It looks like this patch is breaking the reproducible builder on the > autobuilder: > > AssertionError: The following deb packages are different and not in exclusion list: > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./core2-64/python3-numpy-dbg_2.2.0-r0_amd64.deb > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./core2-64/python3-numpy_2.2.0-r0_amd64.deb > The following ipk packages are different and not in exclusion list: > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./core2-64/python3-numpy-dbg_2.2.0-r0_core2-64.ipk > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./core2-64/python3-numpy_2.2.0-r0_core2-64.ipk > The following rpm packages are different and not in exclusion list: > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./core2_64/python3-numpy-2.2.0-r0.core2_64.rpm > /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./core2_64/python3-numpy-dbg-2.2.0-r0.core2_64.rpm > > https://valkyrie.yoctoproject.org/#/builders/37/builds/687/steps/12/logs/stdio > > Can you have a look at this please ? Sure. I guess we shouldn't be surprised at these breakages by now :) >
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 6da9047ec57..00000000000 --- 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 <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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_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 0120bee4390..522f9682a5b 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<pver>\d+(\.\d+)+)$"
Patch '0001-numpy-core-Define-RISCV-32-support.patch' is included in v2.2.0, so remove it from the SRC_URI list: |tgamblin@megalith ~/workspace/git/pythonsrc/numpy (main)$ git tag --contains 0e2b652a0eff85798584116c905a2d6ad8f25d5f |v2.2.0 Changelog: https://github.com/numpy/numpy/releases/tag/v2.2.0 Build log: |BUILDALL-QEMU LOG FOR python3-numpy |START TIME: 2024-12-13_16:55:19 |HOSTNAME: megalith |HOST OS: Debian GNU/Linux 12 (bookworm) |HOST KERNEL: 6.1.0-28-amd64 |=============== |BUILD RESULTS: |[glibc] |FAIL: qemuloongarch64 |PASS: qemuriscv32 |PASS: qemuarmv5 |PASS: qemuppc |PASS: qemumips64 |PASS: qemuriscv64 |PASS: qemuarm64 |PASS: qemuarm |PASS: qemux86-64 |PASS: qemuppc64 |PASS: qemux86 |PASS: qemumips |[musl] |FAIL: qemuloongarch64 |FAIL: qemuriscv32 |PASS: qemuarmv5 |PASS: qemuppc |PASS: qemumips64 |PASS: qemuriscv64 |PASS: qemuarm64 |PASS: qemuarm |PASS: qemux86-64 |PASS: qemuppc64 |PASS: qemux86 |PASS: qemumips |=============== |PASSED: 21 |FAILED: 3 Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> --- ...1-numpy-core-Define-RISCV-32-support.patch | 58 ------------------- ...-numpy_2.1.3.bb => python3-numpy_2.2.0.bb} | 3 +- 2 files changed, 1 insertion(+), 60 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%)