From 3296f9a13d16575ecd5b2dd0f95d94445b092c41 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 7 Feb 2024 13:53:13 -0500 Subject: python3-numpy: upgrade 1.26.3 -> 1.26.4 Changelog: https://github.com/numpy/numpy/releases/tag/v1.26.4 Upgrade to pull in a variety of bug fixes. The same number of ptests (6) fail as in 1.26.3, so no regression there. (From OE-Core rev: 0314d2b43701984b5648bce9ca9aaeba5f768b78) Signed-off-by: Trevor Gamblin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...ge-file-fallocate-on-32-bit-linux-platfor.patch | 51 ----------------- .../python/python3-numpy_1.26.3.bb | 65 ---------------------- .../python/python3-numpy_1.26.4.bb | 64 +++++++++++++++++++++ 3 files changed, 64 insertions(+), 116 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch delete mode 100644 meta/recipes-devtools/python/python3-numpy_1.26.3.bb create mode 100644 meta/recipes-devtools/python/python3-numpy_1.26.4.bb diff --git a/meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch b/meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch deleted file mode 100644 index 0702b8499a..0000000000 --- a/meta/recipes-devtools/python/python3-numpy/0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 43b9b2626a59e8764f3bfb1d6b0d73b2d665584e Mon Sep 17 00:00:00 2001 -From: Ola x Nilsson -Date: Fri, 19 Jan 2024 10:26:41 +0100 -Subject: [PATCH] BUG: Use large file fallocate on 32 bit linux platforms - -Using a local prototype for fallocate instead of the fcntl.h header -meant that the redirect triggered by -D_FILE_OFFSET_BITS=64 was not -triggered. - -The prototypes in feature_detection_stdio.h should only be used by -functions in setup_common.py. If they are used by the feature -discovery code they might trigger false positives. - -Upstream-Status: Backport [https://github.com/numpy/numpy/commit/f49c6f9ea735cd7f718e74f8d637ffbbd3a7a03b] -Signed-off-by: Ola x Nilsson - ---- - numpy/core/feature_detection_stdio.h | 3 +++ - numpy/core/src/multiarray/convert.c | 5 +++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/numpy/core/feature_detection_stdio.h b/numpy/core/feature_detection_stdio.h -index bc14d16..d8bbfbd 100644 ---- a/numpy/core/feature_detection_stdio.h -+++ b/numpy/core/feature_detection_stdio.h -@@ -1,6 +1,9 @@ -+#define _GNU_SOURCE - #include - #include - -+#if 0 /* Only for setup_common.py, not the C compiler */ - off_t ftello(FILE *stream); - int fseeko(FILE *stream, off_t offset, int whence); - int fallocate(int, int, off_t, off_t); -+#endif -diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c -index 60c1a1b..8ec0aee 100644 ---- a/numpy/core/src/multiarray/convert.c -+++ b/numpy/core/src/multiarray/convert.c -@@ -23,8 +23,9 @@ - #include "array_coercion.h" - #include "refcount.h" - --int --fallocate(int fd, int mode, off_t offset, off_t len); -+#if defined(HAVE_FALLOCATE) && defined(__linux__) -+#include -+#endif - - /* - * allocate nbytes of diskspace for file fp diff --git a/meta/recipes-devtools/python/python3-numpy_1.26.3.bb b/meta/recipes-devtools/python/python3-numpy_1.26.3.bb deleted file mode 100644 index 326e2c3591..0000000000 --- a/meta/recipes-devtools/python/python3-numpy_1.26.3.bb +++ /dev/null @@ -1,65 +0,0 @@ -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" - -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 \ - file://0001-BUG-Use-large-file-fallocate-on-32-bit-linux-platfor.patch \ - " -SRC_URI[sha256sum] = "697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4" - -GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" -UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$" - -DEPENDS += "python3-cython-native" - -inherit ptest setuptools3 github-releases - -S = "${WORKDIR}/numpy-${PV}" - -CLEANBROKEN = "1" - -do_compile:prepend() { - export NPY_DISABLE_SVML=1 -} - -FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a" - -# install what is needed for numpy.test() -RDEPENDS:${PN} = "${PYTHON_PN}-unittest \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-mmap \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pydoc \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-json \ -" -RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest \ - ${PYTHON_PN}-hypothesis \ - ${PYTHON_PN}-sortedcontainers \ - ${PYTHON_PN}-resource \ - ${PYTHON_PN}-typing-extensions \ - ldd \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-numpy_1.26.4.bb b/meta/recipes-devtools/python/python3-numpy_1.26.4.bb new file mode 100644 index 0000000000..d11b03efc3 --- /dev/null +++ b/meta/recipes-devtools/python/python3-numpy_1.26.4.bb @@ -0,0 +1,64 @@ +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" + +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] = "2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010" + +GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$" + +DEPENDS += "python3-cython-native" + +inherit ptest setuptools3 github-releases + +S = "${WORKDIR}/numpy-${PV}" + +CLEANBROKEN = "1" + +do_compile:prepend() { + export NPY_DISABLE_SVML=1 +} + +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a" + +# install what is needed for numpy.test() +RDEPENDS:${PN} = "${PYTHON_PN}-unittest \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-mmap \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pydoc \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-json \ +" +RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest \ + ${PYTHON_PN}-hypothesis \ + ${PYTHON_PN}-sortedcontainers \ + ${PYTHON_PN}-resource \ + ${PYTHON_PN}-typing-extensions \ + ldd \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf