Can anyone help with "make test" runs for a py-numpy update on
various archs please? I've done i386/amd64 and can handle arm64
so any others would be great.
If it crashes all over the place please retry after adjusting
the .if ${MACHINE_ARCH} to disable cpu optimizations. (if you do
need to do that, clean/repackage/reinstall before running the
tests again).
(If anyone's able to test powerpc and has time to do so, it would
also be nice to know if patch-numpy_core_include_numpy_npy_common_h
is still needed).
Thanks!
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 30 Aug 2022 14:45:15 -0000 1.67
+++ Makefile 30 Aug 2022 20:34:53 -0000
@@ -1,10 +1,8 @@
COMMENT= fast array and numeric programming library for Python
-MODPY_EGG_VERSION= 1.19.5
-REVISION= 2
+MODPY_EGG_VERSION= 1.23.2
DISTNAME= numpy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-EXTRACT_SUFX= .zip
CATEGORIES= math devel
@@ -40,7 +38,17 @@ LIB_DEPENDS+= ${MODFORTRAN_LIB_DEPENDS}
math/cblas \
math/lapack
WANTLIB+= ${MODFORTRAN_WANTLIB} blas cblas lapack
-MODPY_DISTUTILS_BUILDARGS= --fcompiler=gnu95
+MODPY_DISTUTILS_BUILDARGS+= --fcompiler=gnu95
+.endif
+
+# cpu optimizations are runtime detected and seem OK on amd64.
+#
+# on i386 they trigger runtime segfaults (e.g. in tests and when using
+# programs which use numpy).
+#
+# other archs as yet unknown.
+.if ${MACHINE_ARCH} == i386
+MODPY_DISTUTILS_BUILDARGS+= --disable-optimization
.endif
# Cython 0.28.* uses __attribute__((optimize("Os"))) which
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/py-numpy/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 25 Oct 2021 06:33:04 -0000 1.15
+++ distinfo 30 Aug 2022 20:15:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (numpy-1.19.5.zip) = p29QJDDdmNdUbh6iJQpzYMBlpf3qUrLf/ornGAkJtvQ=
-SIZE (numpy-1.19.5.zip) = 7318340
+SHA256 (numpy-1.23.2.tar.gz) = t40A5IJh+70Eqg10J8940YQB7gq9icdVm79CLlscfQE=
+SIZE (numpy-1.23.2.tar.gz) = 10719306
Index: patches/patch-numpy_core_include_numpy_npy_common_h
===================================================================
RCS file: /cvs/ports/math/py-numpy/patches/patch-numpy_core_include_numpy_npy_common_h,v
retrieving revision 1.9
diff -u -p -r1.9 patch-numpy_core_include_numpy_npy_common_h
--- patches/patch-numpy_core_include_numpy_npy_common_h 11 Mar 2022 19:36:29 -0000 1.9
+++ patches/patch-numpy_core_include_numpy_npy_common_h 30 Aug 2022 20:15:20 -0000
@@ -8,20 +8,12 @@ types that conflict with C99 (double for
Index: numpy/core/include/numpy/npy_common.h
--- numpy/core/include/numpy/npy_common.h.orig
+++ numpy/core/include/numpy/npy_common.h
-@@ -341,14 +341,8 @@ typedef unsigned char npy_bool;
- #define NPY_FALSE 0
- #define NPY_TRUE 1
-
--
+@@ -370,7 +370,7 @@ typedef unsigned char npy_bool;
+ *
+ * See https://github.com/numpy/numpy/issues/20348
+ */
-#if NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE
-- typedef double npy_longdouble;
-- #define NPY_LONGDOUBLE_FMT "g"
--#else
-- typedef long double npy_longdouble;
-- #define NPY_LONGDOUBLE_FMT "Lg"
--
No comments:
Post a Comment