python-numpy: Bump to the most recent release 1.13.1
PATCH 1/1 python-numpy: Bump to the most recent release 1.13.1
Note previously used location for releases on SourceForge is no longer
supported (latest tarball v1.11.2 available there is dated 2016-10-04)
so as other distros
(see, Fedora http://pkgs.fedoraproject.org/cgit/rpms/numpy.git/tree/numpy.spec?id=7013948f8ba073c69a91a545f0a0898cb62652fa#n22)
we get release tarball directly from GitHub.
Also note 0001-no-fenv-on-uclibc.patch was rebased on v1.13.1 and 0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch was removed completely as corresponding code got nuked with
https://github.com/numpy/numpy/pull/4852. I'm not really sure
if something similar to Arnout's patch is still required so it would be good if somebody more knowledgeable checks that.
--- package/python-numpy/0001-no-fenv-on-uclibc.patch | 80 +++++++--------------- ...indly-enable-frexpl-and-ldexpl-for-uClibc.patch | 33 --------- package/python-numpy/python-numpy.hash | 4 +- package/python-numpy/python-numpy.mk | 6 +- 4 files changed, 30 insertions(+), 93 deletions(-) delete mode 100644 package/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch
package/python-numpy/0001-no-fenv-on-uclibc.patch +25 -55
@@ -1,4 +1,7 @@ -Don't use <fenv.h> on uClibc +From 1d309b81a6fdac33dfb5148f618bafe6ebdff958 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Fri, 15 Sep 2017 12:51:36 +0300 +Subject: [PATCH] Don't use <fenv.h> on uClibc The python-numpy code already has provisions to not use <fenv.h> when not available. However, it uses __GLIBC__ to know whether fenv.h is
@@ -9,30 +12,30 @@ This patch fixes that by changing all defined(__GLIBC__) occurences by (defined(__GLIBC__) && !defined(__UCLIBC__)). Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Alexey Brodkin <[email protected]> +--- + numpy/core/include/numpy/ufuncobject.h | 2 +- + numpy/core/src/npymath/ieee754.c.src | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -Index: b/numpy/core/include/numpy/ufuncobject.h -=================================================================== +diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h +index d0ac1fd7d732..65e49fcd5b7a 100644 --- a/numpy/core/include/numpy/ufuncobject.h +++ b/numpy/core/include/numpy/ufuncobject.h -@@ -413,11 +413,11 @@ - (void) fpsetsticky(0); \ - } - --#elif defined(__GLIBC__) || defined(__APPLE__) || \ -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ +@@ -319,7 +319,7 @@ typedef struct _loop1d_info { + #if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \ + defined(__NetBSD__) || \ +- defined(__GLIBC__) || defined(__APPLE__) || \ ++ (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - --#if defined(__GLIBC__) || defined(__APPLE__) || \ -+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__MINGW32__) || defined(__FreeBSD__) - #include <fenv.h> - #elif defined(__CYGWIN__) -Index: b/numpy/core/src/npymath/ieee754.c.src -=================================================================== + (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \ + defined(_AIX) || \ +diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src +index 0370ea6c77aa..e63e409b6604 100644 --- a/numpy/core/src/npymath/ieee754.c.src +++ b/numpy/core/src/npymath/ieee754.c.src -@@ -586,11 +586,11 @@ +@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void) }
@@ -40,40 +43,7 @@ Index: b/numpy/core/src/npymath/ieee754.c.src +#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ defined(__CYGWIN__) || defined(__MINGW32__) || \ (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - --# if defined(__GLIBC__) || defined(__APPLE__) || \ -+# if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__MINGW32__) || defined(__FreeBSD__) # include <fenv.h> - # elif defined(__CYGWIN__) -Index: b/numpy/numarray/_capi.c -=================================================================== ---- a/numpy/numarray/_capi.c -+++ b/numpy/numarray/_capi.c -@@ -10,7 +10,7 @@ - #include <sys/param.h> - #endif - --#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) -+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - #include <fenv.h> - #elif defined(__CYGWIN__) - #include "numpy/fenv/fenv.h" -@@ -258,7 +258,7 @@ - } - - /* Likewise for Integer overflows */ --#if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) -+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - static int int_overflow_error(Float64 value) { /* For x86_64 */ - feraiseexcept(FE_OVERFLOW); - return (int) value; -@@ -3007,7 +3007,7 @@ - return retstatus; - } - --#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - - static int - NA_checkFPErrors(void) +-- +2.7.5 +
package/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From b0a1b9628d17251bb417a063ec6c6e09f32393c2 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> -Date: Tue, 6 Oct 2015 01:20:48 +0100 -Subject: [PATCH] Don't blindly enable frexpl and ldexpl for uClibc - -When the size of double and long double are equal, numpy blindly -assumes that frexpl and ldexpl will be available as well. But for -uClibc, that's not true: it only defines the long double functions -when long double "exists" on the architecture. - -So make an exception for uClibc. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> ---- - numpy/core/src/private/npy_config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h -index 453dbd0..7ecf72c 100644 ---- a/numpy/core/src/private/npy_config.h -+++ b/numpy/core/src/private/npy_config.h -@@ -11,7 +11,7 @@ - #endif - - /* Safe to use ldexp and frexp for long double for MSVC builds */ --#if (NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE) || defined(_MSC_VER) -+#if ((NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE) && !defined(__UCLIBC__)) || defined(_MSC_VER) - #ifdef HAVE_LDEXP - #define HAVE_LDEXPL 1 - #endif --- -2.5.3 -
package/python-numpy/python-numpy.hash +2 -2
@@ -1,2 +1,2 @@ -# Locally computed: -sha256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 numpy-1.8.0.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.13.1 +sha256 de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93 numpy-1.13.1.tar.gz
package/python-numpy/python-numpy.mk +3 -3
@@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.8.0 +PYTHON_NUMPY_VERSION = 1.13.1 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz -PYTHON_NUMPY_SITE = http://downloads.sourceforge.net/numpy +PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt -PYTHON_NUMPY_SETUP_TYPE = distutils +PYTHON_NUMPY_SETUP_TYPE = setuptools ifeq ($(BR2_PACKAGE_CLAPACK),y) PYTHON_NUMPY_DEPENDENCIES += clapack
Signature · 1 line
2.11.0
PATCH 1/1 python-numpy: Bump to the most recent release 1.13.1
Quoted 6 lines · Alexey Brodkin
Note previously used location for releases on SourceForge is no longer
supported (latest tarball v1.11.2 available there is dated 2016-10-04)
so as other distros
(see, Fedora http://pkgs.fedoraproject.org/cgit/rpms/numpy.git/tree/numpy.spec?id=7013948f8ba073c69a91a545f0a0898cb62652fa#n22)
we get release tarball directly from GitHub.
Quoted 6 lines
Also note 0001-no-fenv-on-uclibc.patch was rebased on v1.13.1 and 0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch was removed completely as corresponding code got nuked with
https://github.com/numpy/numpy/pull/4852. I'm not really sure
if something similar to Arnout's patch is still required so it would be good if somebody more knowledgeable checks that.
It indeed looks like that pull request now always does the right thing for
frexpl and ldexpl.
Have you tested a build with uClibc on ARM and/or MIPS? According to my commit
message, it would fail there if the problem still exists.
Quoted 6 lines
Signed-off-by Alexey Brodkin <[email protected]>Cc Rahul Bedarkar <[email protected]>Cc Gwenhael Goavec-Merou <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Peter Korsgaard <[email protected]>
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 1/1 python-numpy: Bump to the most recent release 1.13.1
Hi Arnout,
Quoted 20 lines · Arnout Vandecappelle
Quoted 10 lines · Alexey Brodkin
Note previously used location for releases on SourceForge is no longer
supported (latest tarball v1.11.2 available there is dated 2016-10-04)
so as other distros
(see, Fedora https://urldefense.proofpoint.com/v2/url?u=http-3A__pkgs.fedoraproject.org_cgit_rpms_numpy.git_tree_numpy.spec-3Fid-3D7013948f8ba073c
69a91a545f0a0898cb62652fa- 23n22&d=DwICaQ&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=5agzHjEUI_DiafwDPRl75hnHUqo6NOJNFQ0H45brjh8&s=f4SWAhOq4UUR J1E3lO0BHkEIYXVne9hbwe4qN7zO3G0&e= )
we get release tarball directly from GitHub.Quoted 7 lines
Also note 0001-no-fenv-on-uclibc.patch was rebased on v1.13.1 and 0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch was
removed completely as corresponding code got nuked with
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_numpy_numpy_pull_4852&d=DwICaQ&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO
7breS55ytWkhpk5R81I&m=5agzHjEUI_DiafwDPRl75hnHUqo6NOJNFQ0H45brjh8&s=sTHA0phn8s5wX_g3lQFidSkNN_7W9BuK6gmDncE0_y0&e= . I'm not really sure if something similar to Arnout's patch is still required so it would be good
if somebody more knowledgeable checks that.
Quoted 5 lines
?It indeed looks like that pull request now always does the right thing for frexpl and ldexpl.
?Have you tested a build with uClibc on ARM and/or MIPS? According to my commit message, it would fail there if the problem still exists.
Indeed I build-tested it with uclibc toolchain for ARM! So then we should be OK.
-Alexey
Arnout Vandecappelle
AppliedPATCH 1/1 python-numpy: Bump to the most recent release 1.13.1
In reply to Alexey BrodkinQuoted 13 lines · Alexey Brodkin
Note previously used location for releases on SourceForge is no longer
supported (latest tarball v1.11.2 available there is dated 2016-10-04)
so as other distros
(see, Fedora http://pkgs.fedoraproject.org/cgit/rpms/numpy.git/tree/numpy.spec?id=7013948f8ba073c69a91a545f0a0898cb62652fa#n22)
we get release tarball directly from GitHub.Also note 0001-no-fenv-on-uclibc.patch was rebased on v1.13.1 and 0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch was removed completely as corresponding code got nuked with
https://github.com/numpy/numpy/pull/4852. I'm not really sure
if something similar to Arnout's patch is still required so it would be good if somebody more knowledgeable checks that.
Quoted 5 lines
Signed-off-by Alexey Brodkin <[email protected]>Cc Rahul Bedarkar <[email protected]>Cc Gwenhael Goavec-Merou <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Peter Korsgaard <[email protected]>
Applied to master, thanks.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF