WIP: Update of math/py-numpy to 1.16.5

classic Classic list List threaded Threaded
37 messages Options
12
Reply | Threaded
Open this post in threaded view
|

WIP: Update of math/py-numpy to 1.16.5

Kurt Mosiejczuk-9
So the existing py-numpy is unhappy with the 2.7 update and it seems to
be clashes between clang and gcc.

This is the last version of py-numpy to work with Python 2.7. 1.17.x will
be Python 3.5+ only.

I got this as far as compiling with flang, running its tests mostly
sucessfully, and packaging. I'm about to start traveling tomorrow
so I won't get to testing all the consumers right away. I figured I'd
send this out in case someone wants to throw it through a bulk or pick
up where I left off.

(cc maintainer)

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile 7 Jul 2019 14:58:04 -0000 1.55
+++ Makefile 2 Nov 2019 06:50:17 -0000
@@ -2,11 +2,10 @@
 
 COMMENT= fast array and numeric programming library for Python
 
-MODPY_EGG_VERSION= 1.14.6
+MODPY_EGG_VERSION= 1.16.5
 DISTNAME= numpy-${MODPY_EGG_VERSION}
 PKGNAME= py-${DISTNAME}
 EXTRACT_SUFX= .zip
-REVISION= 1
 
 CATEGORIES= math devel
 
@@ -17,7 +16,10 @@ MAINTAINER= Daniel Dickman <daniel@open
 # BSD
 PERMIT_PACKAGE = Yes
 
-WANTLIB= blas lapack m pthread ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
+COMPILER= base-clang ports-gcc base-gcc
+
+WANTLIB= blas lapack m pthread ${MODFORTRAN_WANTLIB} \
+ ${MODPY_WANTLIB}
 
 MODULES= lang/python \
  fortran
@@ -27,12 +29,12 @@ FLAVOR?=
 
 MODPY_PI = Yes
 MODPY_SETUPTOOLS= Yes
-MODPY_DISTUTILS_BUILDARGS = --fcompiler=gnu95
 
-TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR} \
- devel/py-tz${MODPY_FLAVOR}
+TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH} \
+ devel/py-test${MODPY_FLAVOR} \
+ devel/py-tz${MODPY_FLAVOR}
 
-MODFORTRAN_COMPILER = gfortran
+MODFORTRAN_COMPILER = flang
 
 BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
 LIB_DEPENDS=            math/lapack \
@@ -55,8 +57,8 @@ CFLAGS += -D CYTHON_SMALL_CODE=
 pre-build:
  cp -f ${WRKSRC}/numpy/distutils/site.cfg ${WRKSRC}/site.cfg
 
-do-test: fake
- cd ${WRKDIR} && ${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} -c \
+do-test:
+ cd ${WRKDIR} && ${MAKE_ENV} ${MODPY_BIN} -c \
     'import numpy ; numpy.test()'
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/py-numpy/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 26 Oct 2018 21:09:31 -0000 1.13
+++ distinfo 2 Nov 2019 06:50:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (numpy-1.14.6.zip) = ElDt9vbEPh14I/CWdBa8GCWLsnHcU2KY6w6gCp5FuAo=
-SIZE (numpy-1.14.6.zip) = 4906096
+SHA256 (numpy-1.16.5.zip) = i7RS2U6WSzEiBbDeEjjdcgnaRSNDZTqyFLXWgXgOegw=
+SIZE (numpy-1.16.5.zip) = 5138208
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/py-numpy/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 30 Jun 2018 21:49:33 -0000 1.12
+++ pkg/PLIST 2 Nov 2019 06:50:17 -0000
@@ -5,6 +5,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/numpy/LICENSE.txt
 lib/python${MODPY_VERSION}/site-packages/numpy/__config__.py
@@ -14,8 +16,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_distributor_init.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_globals.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_import_tools.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_pytesttester.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}ctypeslib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc
@@ -24,8 +25,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/_distributor_init.py
 lib/python${MODPY_VERSION}/site-packages/numpy/_globals.py
-lib/python${MODPY_VERSION}/site-packages/numpy/_import_tools.py
-lib/python${MODPY_VERSION}/site-packages/numpy/add_newdocs.py
+lib/python${MODPY_VERSION}/site-packages/numpy/_pytesttester.py
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}/
@@ -36,13 +36,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/_inspect.py
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/py3k.py
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/setup.py
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/test_compat.py
 lib/python${MODPY_VERSION}/site-packages/numpy/conftest.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_aliased_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype_ctypes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_methods.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_string_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_type_aliases.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}arrayprint.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}cversions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}defchararray.${MODPY_PYC_MAGIC_TAG}pyc
@@ -54,15 +63,31 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}machar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}memmap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}multiarray.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numeric.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numerictypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}overrides.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}records.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup_common.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}shape_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_add_newdocs.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_aliased_types.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype_ctypes.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/_dummy.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/_internal.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/_methods.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_umath.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_operand_flag_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_rational_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_string_helpers.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_struct_ufunc_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_type_aliases.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_umath_tests.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/arrayprint.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/cversions.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/defchararray.py
@@ -107,19 +132,17 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini
 lib/python${MODPY_VERSION}/site-packages/numpy/core/machar.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/memmap.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.so
-lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/numeric.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/numerictypes.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/operand_flag_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/overrides.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/records.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/setup.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/setup_common.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/shape_base.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/struct_ufunc_test.so
-lib/python${MODPY_VERSION}/site-packages/numpy/core/test_rational.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/_locales.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/astype_copy.pkl
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/recarray_from_file.fits
@@ -147,10 +170,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_nditer.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numeric.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numerictypes.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_overrides.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_print.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_records.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalar_ctors.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarbuffer.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarinherit.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarmath.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarprint.py
@@ -159,8 +184,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath_complex.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_unicode.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.so
-lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.py
 lib/python${MODPY_VERSION}/site-packages/numpy/ctypeslib.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__config__.py
@@ -169,12 +194,12 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__config__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}_shell_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}ccompiler.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}conv_template.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}cpuinfo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}exec_command.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}from_template.${MODPY_PYC_MAGIC_TAG}pyc
@@ -194,6 +219,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}system_info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}unixccompiler.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__version__.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/_shell_utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/ccompiler.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/__init__.py
@@ -237,7 +263,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/conv_template.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/core.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/cpuinfo.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/environment.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/exec_command.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/extension.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/
@@ -246,6 +271,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}absoft.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}compaq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}g95.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}gnu.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}hpux.${MODPY_PYC_MAGIC_TAG}pyc
@@ -261,6 +287,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}vast.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/absoft.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/compaq.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/environment.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/g95.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/gnu.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/hpux.py
@@ -295,11 +322,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_exec_command.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_gnu.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_intel.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_nagfor.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_from_template.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_misc_util.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_npy_pkg_config.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_shell_utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_system_info.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/unixccompiler.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/
@@ -311,6 +341,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}byteswapping.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}creation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}glossary.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}indexing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}internals.${MODPY_PYC_MAGIC_TAG}pyc
@@ -323,6 +354,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/byteswapping.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/constants.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/creation.py
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/dispatch.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/glossary.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/indexing.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/internals.py
@@ -407,15 +439,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_block_docstring.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_callback.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_common.py
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_compile_function.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_kind.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_mixed.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_parameter.py
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_quoted_character.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_character.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_complex.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_integer.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_logical.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_real.py
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_semicolon_split.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_size.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_string.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/util.py
@@ -450,6 +485,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}financial.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}format.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}function_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}histograms.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}index_tricks.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
@@ -475,6 +511,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/financial.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/format.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/function_base.py
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/histograms.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/index_tricks.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/info.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/mixins.py
@@ -491,8 +528,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py2-objarr.npy
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py2-objarr.npz
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py3-objarr.npy
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py3-objarr.npz
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/python3.npy
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/win64python2.npy
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test__datasource.py
@@ -504,6 +539,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_financial.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_format.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_function_base.py
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_histograms.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_index_tricks.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_io.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_mixins.py
@@ -582,6 +618,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_defmatrix.py
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_interaction.py
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_masked_matrix.py
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_matrix_linalg.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_multiarray.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_numeric.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_regression.py
@@ -643,21 +682,21 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}print_coercion_tables.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/decorators.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/noseclasses.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/nosetester.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/parameterized.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/decorators.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/decorators.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/noseclasses.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/nosetester.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/parameterized.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/noseclasses.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/nosetester.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/print_coercion_tables.py
@@ -673,6 +712,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_ctypeslib.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_matlib.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_numpy_version.py
+lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_public_api.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_reloading.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_scripts.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_warnings.py

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Daniel Dickman


> On Nov 2, 2019, at 2:56 AM, Kurt Mosiejczuk <[hidden email]> wrote:
>
> So the existing py-numpy is unhappy with the 2.7 update and it seems to
> be clashes between clang and gcc.

Should the 2.7 python update be backed out? Or is there some smaller fix for the existing numpy version?

Anyway can you share more details of the problem? I am traveling and probably can’t get to a box for at least another week.

>
> This is the last version of py-numpy to work with Python 2.7. 1.17.x will
> be Python 3.5+ only.

Even if 1.17 supported python2, it can’t go in right now due to avx issues that I thought I’d solved but apparently haven’t and am I’m still trying to debug.

>
> I got this as far as compiling with flang, running its tests mostly
> sucessfully, and packaging. I'm about to start traveling tomorrow

I am also traveling at the moment and not back for a week which is why I think we should back out the python update.


> so I won't get to testing all the consumers right away. I figured I'd
> send this out in case someone wants to throw it through a bulk or pick
> up where I left off.

The challenge with numpy is we really need to test that the direct consumers package *and* we want to do runtime tests as well (ie test the consumers of those consumers). That’s a lot of stuff to build which is why I don’t update numpy very often and try to do it carefully.

Going to 1.16.5 as a fix for python, without testing numpy in a bulk, preferably on multiple archs is asking for trouble.... it may just work but it also might cause more problems.

I wouldn’t go that route in a rush.


>
> (cc maintainer)
>
> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- Makefile    7 Jul 2019 14:58:04 -0000    1.55
> +++ Makefile    2 Nov 2019 06:50:17 -0000
> @@ -2,11 +2,10 @@
>
> COMMENT=        fast array and numeric programming library for Python
>
> -MODPY_EGG_VERSION=    1.14.6
> +MODPY_EGG_VERSION=    1.16.5
> DISTNAME=        numpy-${MODPY_EGG_VERSION}
> PKGNAME=        py-${DISTNAME}
> EXTRACT_SUFX=        .zip
> -REVISION=        1
>
> CATEGORIES=        math devel
>
> @@ -17,7 +16,10 @@ MAINTAINER=        Daniel Dickman <daniel@open
> # BSD
> PERMIT_PACKAGE =    Yes
>
> -WANTLIB=        blas lapack m pthread ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
> +COMPILER=        base-clang ports-gcc base-gcc
> +
> +WANTLIB=        blas lapack m pthread ${MODFORTRAN_WANTLIB} \
> +            ${MODPY_WANTLIB}
>
> MODULES=        lang/python \
>           fortran
> @@ -27,12 +29,12 @@ FLAVOR?=
>
> MODPY_PI =        Yes
> MODPY_SETUPTOOLS=    Yes
> -MODPY_DISTUTILS_BUILDARGS = --fcompiler=gnu95
>
> -TEST_DEPENDS=    devel/py-nose${MODPY_FLAVOR} \
> -        devel/py-tz${MODPY_FLAVOR}
> +TEST_DEPENDS=        ${FULLPKGNAME}:${FULLPKGPATH} \
> +            devel/py-test${MODPY_FLAVOR} \
> +            devel/py-tz${MODPY_FLAVOR}
>
> -MODFORTRAN_COMPILER =    gfortran
> +MODFORTRAN_COMPILER =    flang
>
> BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
> LIB_DEPENDS=            math/lapack \
> @@ -55,8 +57,8 @@ CFLAGS +=    -D CYTHON_SMALL_CODE=
> pre-build:
>   cp -f ${WRKSRC}/numpy/distutils/site.cfg ${WRKSRC}/site.cfg
>
> -do-test: fake
> -    cd ${WRKDIR} && ${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} -c \
> +do-test:
> +    cd ${WRKDIR} && ${MAKE_ENV} ${MODPY_BIN} -c \
>       'import numpy ; numpy.test()'
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo    26 Oct 2018 21:09:31 -0000    1.13
> +++ distinfo    2 Nov 2019 06:50:17 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (numpy-1.14.6.zip) = ElDt9vbEPh14I/CWdBa8GCWLsnHcU2KY6w6gCp5FuAo=
> -SIZE (numpy-1.14.6.zip) = 4906096
> +SHA256 (numpy-1.16.5.zip) = i7RS2U6WSzEiBbDeEjjdcgnaRSNDZTqyFLXWgXgOegw=
> +SIZE (numpy-1.16.5.zip) = 5138208
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- pkg/PLIST    30 Jun 2018 21:49:33 -0000    1.12
> +++ pkg/PLIST    2 Nov 2019 06:50:17 -0000
> @@ -5,6 +5,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> +lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/numpy/LICENSE.txt
> lib/python${MODPY_VERSION}/site-packages/numpy/__config__.py
> @@ -14,8 +16,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_distributor_init.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_globals.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_import_tools.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_pytesttester.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}ctypeslib.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -24,8 +25,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/_distributor_init.py
> lib/python${MODPY_VERSION}/site-packages/numpy/_globals.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/_import_tools.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/add_newdocs.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/_pytesttester.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}/
> @@ -36,13 +36,22 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/_inspect.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/py3k.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/setup.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/test_compat.py
> lib/python${MODPY_VERSION}/site-packages/numpy/conftest.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_aliased_types.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype_ctypes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_methods.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_string_helpers.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_type_aliases.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}arrayprint.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}cversions.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}defchararray.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -54,15 +63,31 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}machar.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}memmap.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}multiarray.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numeric.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numerictypes.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}overrides.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}records.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup_common.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}shape_base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath_tests.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_add_newdocs.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_aliased_types.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype_ctypes.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_dummy.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_internal.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_methods.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_umath.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_operand_flag_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_rational_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_string_helpers.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_struct_ufunc_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_type_aliases.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_umath_tests.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/arrayprint.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/cversions.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/defchararray.py
> @@ -107,19 +132,17 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini
> lib/python${MODPY_VERSION}/site-packages/numpy/core/machar.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/memmap.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/numerictypes.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/operand_flag_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/overrides.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/records.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/setup.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/setup_common.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/shape_base.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/struct_ufunc_test.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/test_rational.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/_locales.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/astype_copy.pkl
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/recarray_from_file.fits
> @@ -147,10 +170,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_nditer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numerictypes.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_overrides.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_print.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_records.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_regression.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalar_ctors.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarbuffer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarinherit.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarmath.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarprint.py
> @@ -159,8 +184,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath_complex.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_unicode.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.py
> lib/python${MODPY_VERSION}/site-packages/numpy/ctypeslib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__config__.py
> @@ -169,12 +194,12 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__config__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}_shell_utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}ccompiler.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}conv_template.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}cpuinfo.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}exec_command.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}from_template.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -194,6 +219,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}system_info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}unixccompiler.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__version__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/_shell_utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/ccompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/__init__.py
> @@ -237,7 +263,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/conv_template.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/core.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/cpuinfo.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/distutils/environment.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/exec_command.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/extension.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/
> @@ -246,6 +271,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}absoft.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}compaq.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}g95.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}gnu.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}hpux.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -261,6 +287,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}vast.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/absoft.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/compaq.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/environment.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/g95.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/gnu.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/hpux.py
> @@ -295,11 +322,14 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/__init__.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_exec_command.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_gnu.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_intel.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_nagfor.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_from_template.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_misc_util.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_npy_pkg_config.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_shell_utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_system_info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/unixccompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/
> @@ -311,6 +341,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}byteswapping.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}creation.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}glossary.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}indexing.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}internals.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -323,6 +354,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/byteswapping.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/constants.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/creation.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/doc/dispatch.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/glossary.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/indexing.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/internals.py
> @@ -407,15 +439,18 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_block_docstring.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_callback.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_common.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_compile_function.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_kind.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_mixed.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_parameter.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_quoted_character.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_regression.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_character.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_complex.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_integer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_logical.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_real.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_semicolon_split.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_size.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_string.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/util.py
> @@ -450,6 +485,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}financial.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}format.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}function_base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}histograms.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}index_tricks.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -475,6 +511,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/financial.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/format.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/function_base.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/histograms.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/index_tricks.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/mixins.py
> @@ -491,8 +528,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py2-objarr.npy
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py2-objarr.npz
> -lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py3-objarr.npy
> -lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py3-objarr.npz
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/python3.npy
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/win64python2.npy
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test__datasource.py
> @@ -504,6 +539,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_financial.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_format.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_function_base.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_histograms.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_index_tricks.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_io.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_mixins.py
> @@ -582,6 +618,9 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/__init__.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_defmatrix.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_interaction.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_masked_matrix.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_matrix_linalg.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_multiarray.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_regression.py
> @@ -643,21 +682,21 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}print_coercion_tables.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/decorators.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/noseclasses.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/nosetester.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/parameterized.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/decorators.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/decorators.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/noseclasses.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/nosetester.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/parameterized.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/noseclasses.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/nosetester.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/print_coercion_tables.py
> @@ -673,6 +712,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_ctypeslib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_matlib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_numpy_version.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_public_api.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_reloading.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_scripts.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_warnings.py

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Kurt Mosiejczuk-9
On Sat, Nov 02, 2019 at 07:03:57AM -0400, Daniel Dickman wrote:

> > On Nov 2, 2019, at 2:56 AM, Kurt Mosiejczuk <[hidden email]> wrote:

> > 'So the existing py-numpy is unhappy with the 2.7 update and it
> > seems to be clashes between clang and gcc.

> Should the 2.7 python update be backed out? Or is there some smaller
> fix for the existing numpy version?

Perhaps it should be backed out. That will also be rather complicated
though.

> Anyway can you share more details of the problem? I am traveling and
> probably can't get to a box for at least another week.

> > This is the last version of py-numpy to work with Python 2.7. 1.17.x
> > will be Python 3.5+ only.

> Even if 1.17 supported python2, it can't go in right now due to avx
> issues that I thought I'd solved but apparently haven't and am
> I'm still trying to debug.

> > I got this as far as compiling with flang, running its tests mostly
> > sucessfully, and packaging. I'm about to start traveling tomorrow

> I am also traveling at the moment and not back for a week which is why
> I think we should back out the python update.

I'll be online intermittently for a couple days and then should be good.

> > so I won't get to testing all the consumers right away. I figured
> > I'd send this out in case someone wants to throw it through a bulk
> > or pick up where I left off.

> The challenge with numpy is we really need to test that the direct
> consumers package *and* we want to do runtime tests as well (ie test
> the consumers of those consumers). That's a lot of stuff to build
> which is why I don't update numpy very often and try to do it
> carefully.

I understand.

> Going to 1.16.5 as a fix for python, without testing numpy in a bulk,
> preferably on multiple archs is asking for trouble.... it may just
> work but it also might cause more problems.

> I wouldn't go that route in a rush.

There's a reason I didn't even ask for an OK :)

My usual procedure is to test the BUILD and TEST consumers. Since I
don't have time at the moment, I labelled this WIP. I suppose this
could concievably ready, but I have *no* idea if that's the case. There
definitely should be a *lot* more testing before someone considers
committing this.

--Kurt

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Daniel Dickman
In reply to this post by Kurt Mosiejczuk-9


> On Nov 2, 2019, at 10:33 AM, Kurt Mosiejczuk <[hidden email]> wrote:
>
> On Sat, Nov 02, 2019 at 07:03:57AM -0400, Daniel Dickman wrote:
>
>>>> On Nov 2, 2019, at 2:56 AM, Kurt Mosiejczuk <[hidden email]> wrote:
>>
>>>> 'So the existing py-numpy is unhappy with the 2.7 update and it
>>> seems to be clashes between clang and gcc.
>
>> Should the 2.7 python update be backed out? Or is there some smaller
>> fix for the existing numpy version?
>
> Perhaps it should be backed out. That will also be rather complicated
> though.

Rolling back to previous and cranking EPOCH doesn’t do the trick?


Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Jeremie Courreges-Anglas-2
In reply to this post by Kurt Mosiejczuk-9
On Sat, Nov 02 2019, Kurt Mosiejczuk <[hidden email]> wrote:
> So the existing py-numpy is unhappy with the 2.7 update and it seems to
> be clashes between clang and gcc.
>
> This is the last version of py-numpy to work with Python 2.7. 1.17.x will
> be Python 3.5+ only.



To stay on the safe side, here's a simple diff for lang/python/2.7 which
unbreaks numpy and maybe others.  clang doesn't error out, gcc does.
Why does numpy use gcc?


Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile 1 Nov 2019 17:40:08 -0000 1.63
+++ Makefile 2 Nov 2019 21:13:16 -0000
@@ -11,6 +11,7 @@ SHARED_LIBS = python2.7 0.0
 VERSION_SPEC = >=2.7,<2.8
 
 CONFIGURE_ARGS += --with-ensurepip=no
+CONFIGURE_ENV += ac_cv_opt_olimit_ok=no
 
 PORTROACH =             limit:^2\.7
 


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Kurt Mosiejczuk-9
On Sat, Nov 02, 2019 at 10:16:03PM +0100, Jeremie Courreges-Anglas wrote:

> To stay on the safe side, here's a simple diff for lang/python/2.7 which
> unbreaks numpy and maybe others.  clang doesn't error out, gcc does.
> Why does numpy use gcc?

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/python/2.7/Makefile,v
> retrieving revision 1.63
> diff -u -p -r1.63 Makefile
> --- Makefile 1 Nov 2019 17:40:08 -0000 1.63
> +++ Makefile 2 Nov 2019 21:13:16 -0000
> @@ -11,6 +11,7 @@ SHARED_LIBS = python2.7 0.0
>  VERSION_SPEC = >=2.7,<2.8
>  
>  CONFIGURE_ARGS += --with-ensurepip=no
> +CONFIGURE_ENV += ac_cv_opt_olimit_ok=no
>  
>  PORTROACH =             limit:^2\.7

This works for me. Shouldn't we bump REVISION though?

--Kurt

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Kurt Mosiejczuk-9
In reply to this post by Daniel Dickman
On Sat, Nov 02, 2019 at 10:40:01AM -0400, Daniel Dickman wrote:

> >> Should the 2.7 python update be backed out? Or is there some smaller
> >> fix for the existing numpy version?

> > Perhaps it should be backed out. That will also be rather complicated
> > though.

> Rolling back to previous and cranking EPOCH doesn't do the trick?

Sthen was saying everything that uses py3 would need bumping for the
EPOCH change.

Looks like jca found an easier solution though that fixes 2.7.17.

--Kurt

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Stuart Henderson
In reply to this post by Kurt Mosiejczuk-9
Ok with the REVISION bump.

--
Sent from a phone, apologies for poor formatting.

On 2 November 2019 22:49:21 Kurt Mosiejczuk <[hidden email]> wrote:

> On Sat, Nov 02, 2019 at 10:16:03PM +0100, Jeremie Courreges-Anglas wrote:
>
>> To stay on the safe side, here's a simple diff for lang/python/2.7 which
>> unbreaks numpy and maybe others.  clang doesn't error out, gcc does.
>> Why does numpy use gcc?
>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/lang/python/2.7/Makefile,v
>> retrieving revision 1.63
>> diff -u -p -r1.63 Makefile
>> --- Makefile 1 Nov 2019 17:40:08 -0000 1.63
>> +++ Makefile 2 Nov 2019 21:13:16 -0000
>> @@ -11,6 +11,7 @@ SHARED_LIBS = python2.7 0.0
>>  VERSION_SPEC = >=2.7,<2.8
>>
>>  CONFIGURE_ARGS += --with-ensurepip=no
>> +CONFIGURE_ENV += ac_cv_opt_olimit_ok=no
>>
>>  PORTROACH =             limit:^2\.7
>
> This works for me. Shouldn't we bump REVISION though?
>
> --Kurt



Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Stuart Henderson
In reply to this post by Daniel Dickman
On 2019/11/02 10:40, Daniel Dickman wrote:

>
>
> > On Nov 2, 2019, at 10:33 AM, Kurt Mosiejczuk <[hidden email]> wrote:
> >
> > On Sat, Nov 02, 2019 at 07:03:57AM -0400, Daniel Dickman wrote:
> >
> >>>> On Nov 2, 2019, at 2:56 AM, Kurt Mosiejczuk <[hidden email]> wrote:
> >>
> >>>> 'So the existing py-numpy is unhappy with the 2.7 update and it
> >>> seems to be clashes between clang and gcc.
> >
> >> Should the 2.7 python update be backed out? Or is there some smaller
> >> fix for the existing numpy version?
> >
> > Perhaps it should be backed out. That will also be rather complicated
> > though.
>
> Rolling back to previous and cranking EPOCH doesn’t do the trick?

With EPOCH bumped, the version string used in dependencies no longer
matches. It's not as much work to fix as I first feared (thanks to
PKGSPEC), but it still would mean that pkg_add will have to merge a
huge update set, which is usually best avoided if possible.

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Daniel Dickman
In reply to this post by Jeremie Courreges-Anglas-2
> clang doesn't error out, gcc does.
> Why does numpy use gcc?

Because that’s what upstream recommends in their docs.

“Note that NumPy is developed mainly using GNU compilers. Compilers from other vendors such as Intel, Absoft, Sun, NAG, Compaq, Vast, Portland, Lahey, HP, IBM, Microsoft are only supported in the form of community feedback, and may not work out of the box. GCC 4.x (and later) compilers are recommended.”

See: https://numpy.org/devdocs/user/building.html
Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Daniel Dickman
In reply to this post by Kurt Mosiejczuk-9
Now that the python issues seem to be solved, just one comment on the proposed diff:

> -MODFORTRAN_COMPILER =    gfortran
> +MODFORTRAN_COMPILER =    flang

numpy developers basically say to use gnu compilers, otherwise you’re on your own.

And numpy’s fortran compiler can’t be switched in isolation. We’d have to do a switch across all the forward and reverse dependencies in the tree at the same time.

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Marc Espie-2
In reply to this post by Daniel Dickman
On Mon, Nov 04, 2019 at 02:32:03AM +0900, Daniel Dickman wrote:
> > clang doesn't error out, gcc does.
> > Why does numpy use gcc?
>
> Because that’s what upstream recommends in their docs.
>
> “Note that NumPy is developed mainly using GNU compilers. Compilers from other vendors such as Intel, Absoft, Sun, NAG, Compaq, Vast, Portland, Lahey, HP, IBM, Microsoft are only supported in the form of community feedback, and may not work out of the box. GCC 4.x (and later) compilers are recommended.”
>
> See: https://numpy.org/devdocs/user/building.html

That's probably not a good enough reason, especially considering how many
security improvements are in base clang as opposed to base gcc...

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Kurt Mosiejczuk-9
On Sun, Nov 03, 2019 at 10:06:52PM +0100, Marc Espie wrote:
> On Mon, Nov 04, 2019 at 02:32:03AM +0900, Daniel Dickman wrote:
> > > clang doesn't error out, gcc does.
> > > Why does numpy use gcc?

> > Because that's what upstream recommends in their docs.

> > 'Note that NumPy is developed mainly using GNU compilers. Compilers
> > from other vendors such as Intel, Absoft, Sun, NAG, Compaq, Vast,
> > Portland, Lahey, HP, IBM, Microsoft are only supported in the form
> > of community feedback, and may not work out of the box. GCC 4.x (and
> > later) compilers are recommended.'

> > See: https://numpy.org/devdocs/user/building.html

> That's probably not a good enough reason, especially considering how
> many security improvements are in base clang as opposed to base gcc...

That page may be out of date, too. It says Python 2.7 is supported,
whereas the 1.17.x release no longer support Python 2.7.

--Kurt

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Jeremie Courreges-Anglas-2
In reply to this post by Marc Espie-2
On Sun, Nov 03 2019, Marc Espie <[hidden email]> wrote:

> On Mon, Nov 04, 2019 at 02:32:03AM +0900, Daniel Dickman wrote:
>> > clang doesn't error out, gcc does.
>> > Why does numpy use gcc?
>>
>> Because that’s what upstream recommends in their docs.
>>
>> “Note that NumPy is developed mainly using GNU compilers. Compilers
>> from other vendors such as Intel, Absoft, Sun, NAG, Compaq, Vast,
>> Portland, Lahey, HP, IBM, Microsoft are only supported in the form of
>> community feedback, and may not work out of the box. GCC 4.x (and
>> later) compilers are recommended.”
>>
>> See: https://numpy.org/devdocs/user/building.html
>
> That's probably not a good enough reason, especially considering how many
> security improvements are in base clang as opposed to base gcc...

hmmpf.

I initially thought that maybe the failure was due to /usr/bin/gcc being
used instead of /usr/bin/cc.  I was wrong.

numpy uses gfortran from ports/lang/gcc, so it makes perfect sense for
some gcc-ish option parser to bail out when passed a bogus -Oprout
option.  And indeed math/py-numpy fails the same way with the previous
python2 package on an amd64 system without /usr/bin/gcc.

I'm not willing to spend more time on this but I'm not keen on seeing
others waste time on this either.  Sorry for bringing this up without
actually checking in the first place.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Daniel Dickman
In reply to this post by Marc Espie-2


> On Nov 4, 2019, at 6:06 AM, Marc Espie <[hidden email]> wrote:
>
> On Mon, Nov 04, 2019 at 02:32:03AM +0900, Daniel Dickman wrote:
>>> clang doesn't error out, gcc does.
>>> Why does numpy use gcc?
>>
>> Because that’s what upstream recommends in their docs.
>>
>> “Note that NumPy is developed mainly using GNU compilers. Compilers from other vendors such as Intel, Absoft, Sun, NAG, Compaq, Vast, Portland, Lahey, HP, IBM, Microsoft are only supported in the form of community feedback, and may not work out of the box. GCC 4.x (and later) compilers are recommended.”
>>
>> See: https://numpy.org/devdocs/user/building.html
>
> That's probably not a good enough reason, especially considering how many
> security improvements are in base clang as opposed to base gcc...

Marc please take it up with upstream not me.


Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Daniel Dickman
In reply to this post by Kurt Mosiejczuk-9


> On Nov 4, 2019, at 6:18 AM, Kurt Mosiejczuk <[hidden email]> wrote:
>
> On Sun, Nov 03, 2019 at 10:06:52PM +0100, Marc Espie wrote:
>> On Mon, Nov 04, 2019 at 02:32:03AM +0900, Daniel Dickman wrote:
>>>> clang doesn't error out, gcc does.
>>>> Why does numpy use gcc?
>
>>> Because that's what upstream recommends in their docs.
>
>>> 'Note that NumPy is developed mainly using GNU compilers. Compilers
>>> from other vendors such as Intel, Absoft, Sun, NAG, Compaq, Vast,
>>> Portland, Lahey, HP, IBM, Microsoft are only supported in the form
>>> of community feedback, and may not work out of the box. GCC 4.x (and
>>> later) compilers are recommended.'
>
>>> See: https://numpy.org/devdocs/user/building.html
>
>> That's probably not a good enough reason, especially considering how
>> many security improvements are in base clang as opposed to base gcc...
>
> That page may be out of date, too. It says Python 2.7 is supported,
> whereas the 1.17.x release no longer support Python 2.7.

Kurt, please feel to take it up with upstream not me.

>
> --Kurt
>

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Stuart Henderson
In reply to this post by Kurt Mosiejczuk-9
On 2019/11/02 02:55, Kurt Mosiejczuk wrote:
> I got this as far as compiling with flang, running its tests mostly
> sucessfully, and packaging. I'm about to start traveling tomorrow
> so I won't get to testing all the consumers right away. I figured I'd
> send this out in case someone wants to throw it through a bulk or pick
> up where I left off.

Here's a diff based on Kurt's but reinstating gfortran as compiler.
I'm not sure what the compiler change was originally done for, perhaps
it was just to avoid the problem with gcc flags that jca already fixed
in python/2.7?

I also removed part of patch-numpy_core_include_numpy_npy_common_h
that was dealing with gcc-<4.4 which we don't have to worry about
(the gfortran module uses gcc for C as well as Fortran, so it will
always be built with 4.4+ for us). I left the second part in but
we could do with testing powerpc with that file removed completely
(I added an XXX).

Builds ok (py2+3) on amd64, tests are in good shape:

py2: 10 failed, 7173 passed, 159 skipped, 166 deselected, 12 xfailed, 1 xpassed, 3 warnings in 265.80 seconds
py3: 10 failed, 7266 passed, 83 skipped, 167 deselected, 12 xfailed, 1 xpassed, 4 warnings in 234.12 seconds

I think it would be fair to ask for at least a bulk build on one fast
arch, plus builds of NumPy itself and at least some kind of runtime
testing on a couple others, but we are still at a time in the release
cycle where we can check build logs on other arches and get things
fixed, and expect to get some feedback from users if there are runtime
problems before things get baked into a release, so we don't need to
go overboard on this.

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile 18 Nov 2019 04:10:31 -0000 1.56
+++ Makefile 10 Jan 2020 15:46:06 -0000
@@ -2,11 +2,10 @@
 
 COMMENT= fast array and numeric programming library for Python
 
-MODPY_EGG_VERSION= 1.14.6
+MODPY_EGG_VERSION= 1.16.5
 DISTNAME= numpy-${MODPY_EGG_VERSION}
 PKGNAME= py-${DISTNAME}
 EXTRACT_SUFX= .zip
-REVISION= 1
 
 CATEGORIES= math devel
 
@@ -17,7 +16,8 @@ MAINTAINER= Daniel Dickman <daniel@open
 # BSD
 PERMIT_PACKAGE = Yes
 
-WANTLIB= blas lapack m pthread ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
+WANTLIB += ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
+WANTLIB += blas cblas lapack m pthread
 
 MODULES= lang/python \
  fortran
@@ -29,13 +29,14 @@ MODPY_PI = Yes
 MODPY_SETUPTOOLS= Yes
 MODPY_DISTUTILS_BUILDARGS = --fcompiler=gnu95
 
-TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR} \
- devel/py-tz${MODPY_FLAVOR}
-
+TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH} \
+ devel/py-test${MODPY_FLAVOR} \
+ devel/py-tz${MODPY_FLAVOR}
 MODFORTRAN_COMPILER = gfortran
 
 BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
-LIB_DEPENDS=            math/lapack \
+LIB_DEPENDS=            math/cblas \
+ math/lapack \
  ${MODFORTRAN_LIB_DEPENDS}
 
 # Cython 0.28.* uses __attribute__((optimize("Os"))) which
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/py-numpy/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 26 Oct 2018 21:09:31 -0000 1.13
+++ distinfo 10 Jan 2020 15:46:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (numpy-1.14.6.zip) = ElDt9vbEPh14I/CWdBa8GCWLsnHcU2KY6w6gCp5FuAo=
-SIZE (numpy-1.14.6.zip) = 4906096
+SHA256 (numpy-1.16.5.zip) = i7RS2U6WSzEiBbDeEjjdcgnaRSNDZTqyFLXWgXgOegw=
+SIZE (numpy-1.16.5.zip) = 5138208
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.6
diff -u -p -r1.6 patch-numpy_core_include_numpy_npy_common_h
--- patches/patch-numpy_core_include_numpy_npy_common_h 30 Jun 2018 21:49:33 -0000 1.6
+++ patches/patch-numpy_core_include_numpy_npy_common_h 10 Jan 2020 15:46:06 -0000
@@ -1,13 +1,8 @@
 $OpenBSD: patch-numpy_core_include_numpy_npy_common_h,v 1.6 2018/06/30 21:49:33 daniel Exp $
 
-(1) optimize function attributes were added in gcc 4.4. Apply a fix for the warnings. But
-the next release of numpy should fix this in a better way. See:
-https://github.com/numpy/numpy/issues/5451
+XXX recheck powerpc, is this still needed?
 
-Gets rid of these warnings from the build:
-numpy/core/src/multiarray/lowlevel_strided_loops.c.src:120: warning: 'optimize' attribute directive ignored
-
-(2) py-numpy only checks for expl to determine whether extended-precision
+py-numpy only checks for expl to determine whether extended-precision
 support is present.  since we don't have it yet;  it implements
 it's own.  however, on alpha, powerpc, it declared functions with
 types that conflict with C99 (double for *l), therefore failed.
@@ -15,36 +10,7 @@ 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
-@@ -20,6 +20,7 @@
- #endif
- #endif
-
-+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 4)))
- /*
-  * gcc does not unroll even with -O3
-  * use with care, unrolling on modern cpus rarely speeds things up
-@@ -30,13 +31,20 @@
- #else
- #define NPY_GCC_UNROLL_LOOPS
- #endif
-+#else
-+#define NPY_GCC_UNROLL_LOOPS
-+#endif
-
-+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 4)))
- /* highest gcc optimization level, enabled autovectorizer */
- #ifdef HAVE_ATTRIBUTE_OPTIMIZE_OPT_3
- #define NPY_GCC_OPT_3 __attribute__((optimize("O3")))
- #else
- #define NPY_GCC_OPT_3
- #endif
-+#else
-+#define NPY_GCC_OPT_3
-+#endif
-
- /* compile target attributes */
- #if defined HAVE_ATTRIBUTE_TARGET_AVX && defined HAVE_LINK_AVX
-@@ -336,14 +344,8 @@ typedef unsigned char npy_bool;
+@@ -320,14 +320,8 @@ typedef unsigned char npy_bool;
  #define NPY_FALSE 0
  #define NPY_TRUE 1
 
Index: patches/patch-numpy_distutils_command_build_src_py
===================================================================
RCS file: /cvs/ports/math/py-numpy/patches/patch-numpy_distutils_command_build_src_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-numpy_distutils_command_build_src_py
--- patches/patch-numpy_distutils_command_build_src_py 30 Jun 2018 21:49:33 -0000 1.3
+++ patches/patch-numpy_distutils_command_build_src_py 10 Jan 2020 15:46:06 -0000
@@ -6,7 +6,7 @@ WRKOBJDIR has a trailing slash)
 Index: numpy/distutils/command/build_src.py
 --- numpy/distutils/command/build_src.py.orig
 +++ numpy/distutils/command/build_src.py
-@@ -372,6 +372,7 @@ class build_src(build_ext.build_ext):
+@@ -370,6 +370,7 @@ class build_src(build_ext.build_ext):
              #    incl_dirs.append(self.build_src)
              build_dir = os.path.join(*([self.build_src]\
                                         +name.split('.')[:-1]))
Index: patches/patch-numpy_distutils_fcompiler_gnu_py
===================================================================
RCS file: /cvs/ports/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-numpy_distutils_fcompiler_gnu_py
--- patches/patch-numpy_distutils_fcompiler_gnu_py 30 Jun 2018 21:49:33 -0000 1.2
+++ patches/patch-numpy_distutils_fcompiler_gnu_py 10 Jan 2020 15:46:06 -0000
@@ -8,7 +8,7 @@ https://github.com/numpy/numpy/issues/54
 Index: numpy/distutils/fcompiler/gnu.py
 --- numpy/distutils/fcompiler/gnu.py.orig
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -237,7 +237,6 @@ class GnuFCompiler(FCompiler):
+@@ -245,7 +245,6 @@ class GnuFCompiler(FCompiler):
              opt = ['-O2']
          else:
              opt = ['-O3']
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/py-numpy/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 30 Jun 2018 21:49:33 -0000 1.12
+++ pkg/PLIST 10 Jan 2020 15:46:06 -0000
@@ -1,10 +1,14 @@
 @comment $OpenBSD: PLIST,v 1.12 2018/06/30 21:49:33 daniel Exp $
+@comment bin/f2py
+@comment bin/f2py3
 bin/f2py${MODPY_VERSION}
 lib/python${MODPY_VERSION}/site-packages/numpy/
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
 lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/numpy/LICENSE.txt
 lib/python${MODPY_VERSION}/site-packages/numpy/__config__.py
@@ -14,8 +18,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_distributor_init.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_globals.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_import_tools.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_pytesttester.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}ctypeslib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc
@@ -24,8 +27,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/_distributor_init.py
 lib/python${MODPY_VERSION}/site-packages/numpy/_globals.py
-lib/python${MODPY_VERSION}/site-packages/numpy/_import_tools.py
-lib/python${MODPY_VERSION}/site-packages/numpy/add_newdocs.py
+lib/python${MODPY_VERSION}/site-packages/numpy/_pytesttester.py
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}/
@@ -36,13 +38,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/_inspect.py
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/py3k.py
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/setup.py
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/test_compat.py
 lib/python${MODPY_VERSION}/site-packages/numpy/conftest.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_aliased_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype_ctypes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_methods.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_string_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_type_aliases.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}arrayprint.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}cversions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}defchararray.${MODPY_PYC_MAGIC_TAG}pyc
@@ -54,15 +65,31 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}machar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}memmap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}multiarray.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numeric.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numerictypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}overrides.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}records.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup_common.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}shape_base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/core/_dummy.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_add_newdocs.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_aliased_types.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype_ctypes.py
+@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_dummy.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/_internal.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/_methods.py
+@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_tests.so
+@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_umath.so
+@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_operand_flag_tests.so
+@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_rational_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_string_helpers.py
+@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_struct_ufunc_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_type_aliases.py
+@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_umath_tests.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/arrayprint.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/cversions.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/defchararray.py
@@ -101,25 +128,23 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/utils.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/info.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/
-lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/libnpymath.a
+@static-lib lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/libnpymath.a
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/mlib.ini
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini
 lib/python${MODPY_VERSION}/site-packages/numpy/core/machar.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/memmap.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.so
-lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/numeric.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/numerictypes.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/operand_flag_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/overrides.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/records.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/setup.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/setup_common.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/shape_base.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/struct_ufunc_test.so
-lib/python${MODPY_VERSION}/site-packages/numpy/core/test_rational.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/_locales.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/astype_copy.pkl
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/recarray_from_file.fits
@@ -147,10 +172,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_nditer.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numeric.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numerictypes.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_overrides.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_print.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_records.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalar_ctors.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarbuffer.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarinherit.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarmath.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarprint.py
@@ -159,8 +186,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath_complex.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_unicode.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.so
-lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.py
 lib/python${MODPY_VERSION}/site-packages/numpy/ctypeslib.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__config__.py
@@ -169,12 +196,12 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__config__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}_shell_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}ccompiler.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}conv_template.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}cpuinfo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}exec_command.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}from_template.${MODPY_PYC_MAGIC_TAG}pyc
@@ -194,6 +221,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}system_info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}unixccompiler.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__version__.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/_shell_utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/ccompiler.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/__init__.py
@@ -237,7 +265,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/conv_template.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/core.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/cpuinfo.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/environment.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/exec_command.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/extension.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/
@@ -246,6 +273,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}absoft.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}compaq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}g95.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}gnu.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}hpux.${MODPY_PYC_MAGIC_TAG}pyc
@@ -261,6 +289,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}vast.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/absoft.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/compaq.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/environment.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/g95.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/gnu.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/hpux.py
@@ -295,11 +324,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_exec_command.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_gnu.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_intel.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_nagfor.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_from_template.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_misc_util.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_npy_pkg_config.py
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_shell_utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_system_info.py
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/unixccompiler.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/
@@ -311,6 +343,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}byteswapping.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}creation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}glossary.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}indexing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}internals.${MODPY_PYC_MAGIC_TAG}pyc
@@ -323,6 +356,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/byteswapping.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/constants.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/creation.py
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/dispatch.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/glossary.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/indexing.py
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/internals.py
@@ -407,15 +441,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_block_docstring.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_callback.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_common.py
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_compile_function.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_kind.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_mixed.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_parameter.py
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_quoted_character.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_character.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_complex.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_integer.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_logical.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_real.py
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_semicolon_split.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_size.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_string.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/util.py
@@ -429,7 +466,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack.py
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack_lite.so
+@so lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack_lite.so
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/helper.py
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/info.py
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/setup.py
@@ -450,6 +487,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}financial.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}format.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}function_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}histograms.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}index_tricks.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
@@ -475,6 +513,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/financial.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/format.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/function_base.py
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/histograms.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/index_tricks.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/info.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/mixins.py
@@ -504,6 +543,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_financial.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_format.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_function_base.py
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_histograms.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_index_tricks.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_io.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_mixins.py
@@ -530,9 +570,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}linalg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/_umath_linalg.so
+@so lib/python${MODPY_VERSION}/site-packages/numpy/linalg/_umath_linalg.so
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/lapack_lite.so
+@so lib/python${MODPY_VERSION}/site-packages/numpy/linalg/lapack_lite.so
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/linalg.py
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/setup.py
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/tests/
@@ -582,6 +622,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_defmatrix.py
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_interaction.py
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_masked_matrix.py
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_matrix_linalg.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_multiarray.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_numeric.py
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_regression.py
@@ -625,7 +668,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/random/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/random/mtrand.so
+@so lib/python${MODPY_VERSION}/site-packages/numpy/random/mtrand.so
 lib/python${MODPY_VERSION}/site-packages/numpy/random/randomkit.h
 lib/python${MODPY_VERSION}/site-packages/numpy/random/setup.py
 lib/python${MODPY_VERSION}/site-packages/numpy/random/tests/
@@ -643,21 +686,21 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}print_coercion_tables.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/decorators.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/noseclasses.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/nosetester.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/parameterized.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/decorators.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/decorators.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/noseclasses.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/nosetester.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/parameterized.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/noseclasses.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/nosetester.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/print_coercion_tables.py
@@ -673,6 +716,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_ctypeslib.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_matlib.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_numpy_version.py
+lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_public_api.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_reloading.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_scripts.py
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_warnings.py

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Stuart Henderson
2/3 through a bulk build and I see that this breaks scipy (missing symbols,
blas/cblas-related) so needs a bit more work, but I think it's generally
along the right lines.
--
Sent from a phone, apologies for poor formatting.

On 10 January 2020 16:00:43 Stuart Henderson <[hidden email]> wrote:

> On 2019/11/02 02:55, Kurt Mosiejczuk wrote:
>> I got this as far as compiling with flang, running its tests mostly
>> sucessfully, and packaging. I'm about to start traveling tomorrow
>> so I won't get to testing all the consumers right away. I figured I'd
>> send this out in case someone wants to throw it through a bulk or pick
>> up where I left off.
>
> Here's a diff based on Kurt's but reinstating gfortran as compiler.
> I'm not sure what the compiler change was originally done for, perhaps
> it was just to avoid the problem with gcc flags that jca already fixed
> in python/2.7?
>
> I also removed part of patch-numpy_core_include_numpy_npy_common_h
> that was dealing with gcc-<4.4 which we don't have to worry about
> (the gfortran module uses gcc for C as well as Fortran, so it will
> always be built with 4.4+ for us). I left the second part in but
> we could do with testing powerpc with that file removed completely
> (I added an XXX).
>
> Builds ok (py2+3) on amd64, tests are in good shape:
>
> py2: 10 failed, 7173 passed, 159 skipped, 166 deselected, 12 xfailed, 1
> xpassed, 3 warnings in 265.80 seconds
> py3: 10 failed, 7266 passed, 83 skipped, 167 deselected, 12 xfailed, 1
> xpassed, 4 warnings in 234.12 seconds
>
> I think it would be fair to ask for at least a bulk build on one fast
> arch, plus builds of NumPy itself and at least some kind of runtime
> testing on a couple others, but we are still at a time in the release
> cycle where we can check build logs on other arches and get things
> fixed, and expect to get some feedback from users if there are runtime
> problems before things get baked into a release, so we don't need to
> go overboard on this.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/Makefile,v
> retrieving revision 1.56
> diff -u -p -r1.56 Makefile
> --- Makefile 18 Nov 2019 04:10:31 -0000 1.56
> +++ Makefile 10 Jan 2020 15:46:06 -0000
> @@ -2,11 +2,10 @@
>
> COMMENT= fast array and numeric programming library for Python
>
> -MODPY_EGG_VERSION= 1.14.6
> +MODPY_EGG_VERSION= 1.16.5
> DISTNAME= numpy-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> EXTRACT_SUFX= .zip
> -REVISION= 1
>
> CATEGORIES= math devel
>
> @@ -17,7 +16,8 @@ MAINTAINER= Daniel Dickman <daniel@open
> # BSD
> PERMIT_PACKAGE = Yes
>
> -WANTLIB= blas lapack m pthread ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
> +WANTLIB += ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
> +WANTLIB += blas cblas lapack m pthread
>
> MODULES= lang/python \
> fortran
> @@ -29,13 +29,14 @@ MODPY_PI = Yes
> MODPY_SETUPTOOLS= Yes
> MODPY_DISTUTILS_BUILDARGS = --fcompiler=gnu95
>
> -TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR} \
> - devel/py-tz${MODPY_FLAVOR}
> -
> +TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH} \
> + devel/py-test${MODPY_FLAVOR} \
> + devel/py-tz${MODPY_FLAVOR}
> MODFORTRAN_COMPILER = gfortran
>
> BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
> -LIB_DEPENDS=            math/lapack \
> +LIB_DEPENDS=            math/cblas \
> + math/lapack \
> ${MODFORTRAN_LIB_DEPENDS}
>
> # Cython 0.28.* uses __attribute__((optimize("Os"))) which
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 26 Oct 2018 21:09:31 -0000 1.13
> +++ distinfo 10 Jan 2020 15:46:06 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (numpy-1.14.6.zip) = ElDt9vbEPh14I/CWdBa8GCWLsnHcU2KY6w6gCp5FuAo=
> -SIZE (numpy-1.14.6.zip) = 4906096
> +SHA256 (numpy-1.16.5.zip) = i7RS2U6WSzEiBbDeEjjdcgnaRSNDZTqyFLXWgXgOegw=
> +SIZE (numpy-1.16.5.zip) = 5138208
> 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.6
> diff -u -p -r1.6 patch-numpy_core_include_numpy_npy_common_h
> --- patches/patch-numpy_core_include_numpy_npy_common_h 30 Jun 2018
> 21:49:33 -0000 1.6
> +++ patches/patch-numpy_core_include_numpy_npy_common_h 10 Jan 2020
> 15:46:06 -0000
> @@ -1,13 +1,8 @@
> $OpenBSD: patch-numpy_core_include_numpy_npy_common_h,v 1.6 2018/06/30
> 21:49:33 daniel Exp $
>
> -(1) optimize function attributes were added in gcc 4.4. Apply a fix for
> the warnings. But
> -the next release of numpy should fix this in a better way. See:
> -https://github.com/numpy/numpy/issues/5451
> +XXX recheck powerpc, is this still needed?
>
> -Gets rid of these warnings from the build:
> -numpy/core/src/multiarray/lowlevel_strided_loops.c.src:120: warning:
> 'optimize' attribute directive ignored
> -
> -(2) py-numpy only checks for expl to determine whether extended-precision
> +py-numpy only checks for expl to determine whether extended-precision
> support is present.  since we don't have it yet;  it implements
> it's own.  however, on alpha, powerpc, it declared functions with
> types that conflict with C99 (double for *l), therefore failed.
> @@ -15,36 +10,7 @@ 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
> -@@ -20,6 +20,7 @@
> - #endif
> - #endif
> -
> -+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 &&
> (__GNUC_MINOR__ > 4)))
> - /*
> -  * gcc does not unroll even with -O3
> -  * use with care, unrolling on modern cpus rarely speeds things up
> -@@ -30,13 +31,20 @@
> - #else
> - #define NPY_GCC_UNROLL_LOOPS
> - #endif
> -+#else
> -+#define NPY_GCC_UNROLL_LOOPS
> -+#endif
> -
> -+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 &&
> (__GNUC_MINOR__ > 4)))
> - /* highest gcc optimization level, enabled autovectorizer */
> - #ifdef HAVE_ATTRIBUTE_OPTIMIZE_OPT_3
> - #define NPY_GCC_OPT_3 __attribute__((optimize("O3")))
> - #else
> - #define NPY_GCC_OPT_3
> - #endif
> -+#else
> -+#define NPY_GCC_OPT_3
> -+#endif
> -
> - /* compile target attributes */
> - #if defined HAVE_ATTRIBUTE_TARGET_AVX && defined HAVE_LINK_AVX
> -@@ -336,14 +344,8 @@ typedef unsigned char npy_bool;
> +@@ -320,14 +320,8 @@ typedef unsigned char npy_bool;
>  #define NPY_FALSE 0
>  #define NPY_TRUE 1
>
> Index: patches/patch-numpy_distutils_command_build_src_py
> ===================================================================
> RCS file:
> /cvs/ports/math/py-numpy/patches/patch-numpy_distutils_command_build_src_py,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-numpy_distutils_command_build_src_py
> --- patches/patch-numpy_distutils_command_build_src_py 30 Jun 2018 21:49:33
> -0000 1.3
> +++ patches/patch-numpy_distutils_command_build_src_py 10 Jan 2020 15:46:06
> -0000
> @@ -6,7 +6,7 @@ WRKOBJDIR has a trailing slash)
> Index: numpy/distutils/command/build_src.py
> --- numpy/distutils/command/build_src.py.orig
> +++ numpy/distutils/command/build_src.py
> -@@ -372,6 +372,7 @@ class build_src(build_ext.build_ext):
> +@@ -370,6 +370,7 @@ class build_src(build_ext.build_ext):
>              #    incl_dirs.append(self.build_src)
>              build_dir = os.path.join(*([self.build_src]\
>                                         +name.split('.')[:-1]))
> Index: patches/patch-numpy_distutils_fcompiler_gnu_py
> ===================================================================
> RCS file:
> /cvs/ports/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu_py,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-numpy_distutils_fcompiler_gnu_py
> --- patches/patch-numpy_distutils_fcompiler_gnu_py 30 Jun 2018 21:49:33
> -0000 1.2
> +++ patches/patch-numpy_distutils_fcompiler_gnu_py 10 Jan 2020 15:46:06 -0000
> @@ -8,7 +8,7 @@ https://github.com/numpy/numpy/issues/54
> Index: numpy/distutils/fcompiler/gnu.py
> --- numpy/distutils/fcompiler/gnu.py.orig
> +++ numpy/distutils/fcompiler/gnu.py
> -@@ -237,7 +237,6 @@ class GnuFCompiler(FCompiler):
> +@@ -245,7 +245,6 @@ class GnuFCompiler(FCompiler):
>              opt = ['-O2']
>          else:
>              opt = ['-O3']
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- pkg/PLIST 30 Jun 2018 21:49:33 -0000 1.12
> +++ pkg/PLIST 10 Jan 2020 15:46:06 -0000
> @@ -1,10 +1,14 @@
> @comment $OpenBSD: PLIST,v 1.12 2018/06/30 21:49:33 daniel Exp $
> +@comment bin/f2py
> +@comment bin/f2py3
> bin/f2py${MODPY_VERSION}
> lib/python${MODPY_VERSION}/site-packages/numpy/
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> +lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/numpy/LICENSE.txt
> lib/python${MODPY_VERSION}/site-packages/numpy/__config__.py
> @@ -14,8 +18,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_distributor_init.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_globals.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_import_tools.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_pytesttester.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}ctypeslib.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -24,8 +27,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/_distributor_init.py
> lib/python${MODPY_VERSION}/site-packages/numpy/_globals.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/_import_tools.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/add_newdocs.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/_pytesttester.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}/
> @@ -36,13 +38,22 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/_inspect.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/py3k.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/setup.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/test_compat.py
> lib/python${MODPY_VERSION}/site-packages/numpy/conftest.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_aliased_types.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype_ctypes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_methods.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_string_helpers.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_type_aliases.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}arrayprint.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}cversions.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}defchararray.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -54,15 +65,31 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}machar.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}memmap.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}multiarray.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numeric.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numerictypes.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}overrides.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}records.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup_common.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}shape_base.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/_dummy.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath_tests.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_add_newdocs.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_aliased_types.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype_ctypes.py
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_dummy.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_internal.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_methods.py
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_tests.so
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_umath.so
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_operand_flag_tests.so
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_rational_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_string_helpers.py
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_struct_ufunc_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_type_aliases.py
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/core/_umath_tests.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/arrayprint.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/cversions.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/defchararray.py
> @@ -101,25 +128,23 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/utils.h
> lib/python${MODPY_VERSION}/site-packages/numpy/core/info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/libnpymath.a
> +@static-lib
> lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/libnpymath.a
> lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/mlib.ini
> lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini
> lib/python${MODPY_VERSION}/site-packages/numpy/core/machar.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/memmap.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/numerictypes.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/operand_flag_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/overrides.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/records.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/setup.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/setup_common.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/shape_base.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/struct_ufunc_test.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/test_rational.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/_locales.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/astype_copy.pkl
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/recarray_from_file.fits
> @@ -147,10 +172,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_nditer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numerictypes.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_overrides.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_print.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_records.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_regression.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalar_ctors.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarbuffer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarinherit.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarmath.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarprint.py
> @@ -159,8 +186,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath_complex.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_unicode.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.py
> lib/python${MODPY_VERSION}/site-packages/numpy/ctypeslib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__config__.py
> @@ -169,12 +196,12 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__config__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}_shell_utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}ccompiler.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}conv_template.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}cpuinfo.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}exec_command.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}from_template.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -194,6 +221,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}system_info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}unixccompiler.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__version__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/_shell_utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/ccompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/__init__.py
> @@ -237,7 +265,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/conv_template.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/core.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/cpuinfo.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/distutils/environment.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/exec_command.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/extension.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/
> @@ -246,6 +273,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}absoft.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}compaq.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}g95.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}gnu.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}hpux.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -261,6 +289,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}vast.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/absoft.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/compaq.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/environment.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/g95.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/gnu.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/hpux.py
> @@ -295,11 +324,14 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/__init__.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_exec_command.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_gnu.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_intel.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_nagfor.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_from_template.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_misc_util.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_npy_pkg_config.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_shell_utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_system_info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/unixccompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/
> @@ -311,6 +343,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}byteswapping.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}creation.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}glossary.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}indexing.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}internals.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -323,6 +356,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/byteswapping.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/constants.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/creation.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/doc/dispatch.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/glossary.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/indexing.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/internals.py
> @@ -407,15 +441,18 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_block_docstring.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_callback.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_common.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_compile_function.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_kind.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_mixed.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_parameter.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_quoted_character.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_regression.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_character.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_complex.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_integer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_logical.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_real.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_semicolon_split.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_size.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_string.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/util.py
> @@ -429,7 +466,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack_lite.so
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack_lite.so
> lib/python${MODPY_VERSION}/site-packages/numpy/fft/helper.py
> lib/python${MODPY_VERSION}/site-packages/numpy/fft/info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/fft/setup.py
> @@ -450,6 +487,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}financial.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}format.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}function_base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}histograms.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}index_tricks.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -475,6 +513,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/financial.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/format.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/function_base.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/histograms.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/index_tricks.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/mixins.py
> @@ -504,6 +543,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_financial.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_format.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_function_base.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_histograms.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_index_tricks.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_io.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_mixins.py
> @@ -530,9 +570,9 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}linalg.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/linalg/_umath_linalg.so
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/linalg/_umath_linalg.so
> lib/python${MODPY_VERSION}/site-packages/numpy/linalg/info.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/linalg/lapack_lite.so
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/linalg/lapack_lite.so
> lib/python${MODPY_VERSION}/site-packages/numpy/linalg/linalg.py
> lib/python${MODPY_VERSION}/site-packages/numpy/linalg/setup.py
> lib/python${MODPY_VERSION}/site-packages/numpy/linalg/tests/
> @@ -582,6 +622,9 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/__init__.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_defmatrix.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_interaction.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_masked_matrix.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_matrix_linalg.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_multiarray.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_regression.py
> @@ -625,7 +668,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/random/info.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/random/mtrand.so
> +@so lib/python${MODPY_VERSION}/site-packages/numpy/random/mtrand.so
> lib/python${MODPY_VERSION}/site-packages/numpy/random/randomkit.h
> lib/python${MODPY_VERSION}/site-packages/numpy/random/setup.py
> lib/python${MODPY_VERSION}/site-packages/numpy/random/tests/
> @@ -643,21 +686,21 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}print_coercion_tables.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/decorators.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/noseclasses.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/nosetester.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/parameterized.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/decorators.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/decorators.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/noseclasses.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/nosetester.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/parameterized.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/noseclasses.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/nosetester.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/print_coercion_tables.py
> @@ -673,6 +716,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_ctypeslib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_matlib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_numpy_version.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_public_api.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_reloading.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_scripts.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_warnings.py



Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Theo Buehler-3
On Mon, Jan 13, 2020 at 12:50:32PM +0000, Stuart Henderson wrote:
> 2/3 through a bulk build and I see that this breaks scipy (missing symbols,
> blas/cblas-related) so needs a bit more work, but I think it's generally
> along the right lines.

Not sure if this provides any useful clue, but py-numpy doesn't build at
all on sparc64 with this diff, also due to missing blas/cblas symbols:

===> py-numpy-1.16.5 depends on: g95->=8,<9 -> g95-8.3.0p4
===> py-numpy-1.16.5 depends on: python->=2.7,<2.8 -> python-2.7.17p1
===> py-numpy-1.16.5 depends on: py-setuptools->=39.0.1v0 -> py-setuptools-41.6.0v0
===> py-numpy-1.16.5 depends on: gcc->=8,<9 -> gcc-8.3.0p4
===> py-numpy-1.16.5 depends on: unzip-* -> unzip-6.0p12
===> py-numpy-1.16.5 depends on: cblas-* -> cblas-1.0p6
===> py-numpy-1.16.5 depends on: lapack-* -> lapack-3.8.0p1
===> py-numpy-1.16.5 depends on: gcc-libs->=8,<9 -> gcc-libs-8.3.0p4
===>  Verifying specs:  gfortran>=8 python2.7 blas cblas lapack m pthread gfortran>=8
===>  found gfortran.8.0 python2.7.0.0 blas.2.1 cblas.1.0 lapack.7.1 m.10.1 pthread.26.1
===>  Checking files for py-numpy-1.16.5
`/usr/ports/distfiles/numpy-1.16.5.zip' is up to date.
>> (SHA256) numpy-1.16.5.zip: OK
===>  Extracting for py-numpy-1.16.5
===>  Patching for py-numpy-1.16.5
===>   Applying OpenBSD patch patch-numpy_core_include_numpy_npy_common_h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-numpy_core_include_numpy_npy_common_h,v 1.6 2018/06/30 21:49:33 daniel Exp $
|
|XXX recheck powerpc, is this still needed?
|
|py-numpy only checks for expl to determine whether extended-precision
|support is present.  since we don't have it yet;  it implements
|it's own.  however, on alpha, powerpc, it declared functions with
|types that conflict with C99 (double for *l), therefore failed.
|
|Index: numpy/core/include/numpy/npy_common.h
|--- numpy/core/include/numpy/npy_common.h.orig
|+++ numpy/core/include/numpy/npy_common.h
--------------------------
Patching file numpy/core/include/numpy/npy_common.h using Plan A...
Hunk #1 succeeded at 320.
done
===>   Ignoring patchfile patch-numpy_core_include_numpy_npy_common_h.orig
===>   Applying OpenBSD patch patch-numpy_distutils_command_build_src_py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-numpy_distutils_command_build_src_py,v 1.3 2018/06/30 21:49:33 daniel Exp $
|
|fix build of other packages (e.g. py-scipy) in some cases (e.g. when
|WRKOBJDIR has a trailing slash)
|
|Index: numpy/distutils/command/build_src.py
|--- numpy/distutils/command/build_src.py.orig
|+++ numpy/distutils/command/build_src.py
--------------------------
Patching file numpy/distutils/command/build_src.py using Plan A...
Hunk #1 succeeded at 370.
done
===>   Ignoring patchfile patch-numpy_distutils_command_build_src_py.orig
===>   Applying OpenBSD patch patch-numpy_distutils_fcompiler_gnu_py
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-numpy_distutils_fcompiler_gnu_py,v 1.2 2018/06/30 21:49:33 daniel Exp $
|
|Causes segmentation fault on powerpc when building py-scipy.
|
|See discussion at:
|https://github.com/numpy/numpy/issues/5451
|
|Index: numpy/distutils/fcompiler/gnu.py
|--- numpy/distutils/fcompiler/gnu.py.orig
|+++ numpy/distutils/fcompiler/gnu.py
--------------------------
Patching file numpy/distutils/fcompiler/gnu.py using Plan A...
Hunk #1 succeeded at 245.
done
===>   Ignoring patchfile patch-numpy_distutils_fcompiler_gnu_py.orig
===>   Applying OpenBSD patch patch-numpy_distutils_site_cfg
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-numpy_distutils_site_cfg,v 1.2 2009/02/16 10:10:09 eric Exp $
|--- numpy/distutils/site.cfg.orig Fri Feb 13 15:41:03 2009
|+++ numpy/distutils/site.cfg Fri Feb 13 15:41:47 2009
--------------------------
(Creating file numpy/distutils/site.cfg...)
Patching file numpy/distutils/site.cfg using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done
===>  Compiler link: gcc -> /usr/local/bin/egcc
===>  Compiler link: cc -> /usr/local/bin/egcc
===>  Compiler link: gfortran -> /usr/local/bin/egfortran
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for py-numpy-1.16.5
===>  Configuring for py-numpy-1.16.5
===>  Building for py-numpy-1.16.5
cp -f /usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/site.cfg /usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/site.cfg
Running from numpy source directory.
running egg_info
creating numpy.egg-info
writing numpy.egg-info/PKG-INFO
writing top-level names to numpy.egg-info/top_level.txt
writing dependency_links to numpy.egg-info/dependency_links.txt
writing entry points to numpy.egg-info/entry_points.txt
writing manifest file 'numpy.egg-info/SOURCES.txt'
reading manifest file 'numpy.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'doc/build'
no previously-included directories found matching 'doc/source/generated'
no previously-included directories found matching 'benchmarks/env'
no previously-included directories found matching 'benchmarks/results'
no previously-included directories found matching 'benchmarks/html'
no previously-included directories found matching 'benchmarks/numpy'
no previously-included directories found matching '*/__pycache__'
warning: no previously-included files matching '*.pyo' found anywhere in distribution
warning: no previously-included files matching '*.pyd' found anywhere in distribution
warning: no previously-included files matching '*.swp' found anywhere in distribution
warning: no previously-included files matching '*.bak' found anywhere in distribution
warning: no previously-included files matching '*~' found anywhere in distribution
writing manifest file 'numpy.egg-info/SOURCES.txt'
Running from numpy source directory.
blas_opt_info:
blas_mkl_info:
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpsPEZBm/tmp
creating /tmp/tmpsPEZBm/tmp/tmpsPEZBm
compile options: '-MMD -MF /tmp/tmpsPEZBm/file.c.d -c'
cc: /tmp/tmpsPEZBm/file.c
  libraries XXXnonexistXXX not found in ['/usr/local/lib', '/usr/lib', '/usr/lib/']
  NOT AVAILABLE

blis_info:
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpjAwhWP/tmp
creating /tmp/tmpjAwhWP/tmp/tmpjAwhWP
compile options: '-MMD -MF /tmp/tmpjAwhWP/file.c.d -c'
cc: /tmp/tmpjAwhWP/file.c
  libraries blis not found in ['/usr/local/lib', '/usr/lib', '/usr/lib/']
  NOT AVAILABLE

openblas_info:
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpau7Mp8/tmp
creating /tmp/tmpau7Mp8/tmp/tmpau7Mp8
compile options: '-MMD -MF /tmp/tmpau7Mp8/file.c.d -c'
cc: /tmp/tmpau7Mp8/file.c
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpvKhRzx/tmp
creating /tmp/tmpvKhRzx/tmp/tmpvKhRzx
compile options: '-MMD -MF /tmp/tmpvKhRzx/file.c.d -c'
cc: /tmp/tmpvKhRzx/file.c
  libraries openblas not found in ['/usr/local/lib', '/usr/lib', '/usr/lib/']
  NOT AVAILABLE

atlas_3_10_blas_threads_info:
Setting PTATLAS=ATLAS
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpVAZDoQ/tmp
creating /tmp/tmpVAZDoQ/tmp/tmpVAZDoQ
compile options: '-MMD -MF /tmp/tmpVAZDoQ/file.c.d -c'
cc: /tmp/tmpVAZDoQ/file.c
  libraries XXXnonexistXXX not found in ['/usr/local/lib', '/usr/lib', '/usr/lib/']
  NOT AVAILABLE

atlas_3_10_blas_info:
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpb56SjT/tmp
creating /tmp/tmpb56SjT/tmp/tmpb56SjT
compile options: '-MMD -MF /tmp/tmpb56SjT/file.c.d -c'
cc: /tmp/tmpb56SjT/file.c
  libraries XXXnonexistXXX not found in ['/usr/local/lib', '/usr/lib', '/usr/lib/']
  NOT AVAILABLE

atlas_blas_threads_info:
Setting PTATLAS=ATLAS
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpZg0fww/tmp
creating /tmp/tmpZg0fww/tmp/tmpZg0fww
compile options: '-MMD -MF /tmp/tmpZg0fww/file.c.d -c'
cc: /tmp/tmpZg0fww/file.c
  libraries XXXnonexistXXX not found in ['/usr/local/lib', '/usr/lib', '/usr/lib/']
  NOT AVAILABLE

atlas_blas_info:
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpyXsn17/tmp
creating /tmp/tmpyXsn17/tmp/tmpyXsn17
compile options: '-MMD -MF /tmp/tmpyXsn17/file.c.d -c'
cc: /tmp/tmpyXsn17/file.c
  libraries XXXnonexistXXX not found in ['/usr/local/lib', '/usr/lib', '/usr/lib/']
  NOT AVAILABLE

accelerate_info:
  NOT AVAILABLE

/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py:639: UserWarning:
    Atlas (http://math-atlas.sourceforge.net/) libraries not found.
    Directories to search for the libraries can be specified in the
    numpy/distutils/site.cfg file (section [atlas]) or by setting
    the ATLAS environment variable.
  self.calc_info()
blas_info:
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpbCGKGJ/tmp
creating /tmp/tmpbCGKGJ/tmp/tmpbCGKGJ
compile options: '-MMD -MF /tmp/tmpbCGKGJ/file.c.d -c'
cc: /tmp/tmpbCGKGJ/file.c
customize UnixCCompiler
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmp6nRDPD/tmp
creating /tmp/tmp6nRDPD/tmp/tmp6nRDPD
compile options: '-MMD -MF /tmp/tmp6nRDPD/file.c.d -c'
cc: /tmp/tmp6nRDPD/file.c
C compiler: cc -fno-strict-aliasing -O2 -pipe -DNDEBUG -O2 -pipe -fPIC -O2 -pipe -D CYTHON_SMALL_CODE= -fPIC

creating /tmp/tmpKcZ0cd/tmp
creating /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd
compile options: '-I/usr/local/include -I/usr/include -c'
cc: /tmp/tmpKcZ0cd/source.c
cc /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o -L/usr/local/lib -lcblas -o /tmp/tmpKcZ0cd/a.out
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztbsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dasum_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `chbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `stbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `strsm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctbsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `srotmg_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zdotu_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtrmm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ssyr2k_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ssbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cgbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dscal_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dgbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `csscal_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sger_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dgemv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cgeru_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zher2k_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zherk_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zdotc_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cgemv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `drot_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dswap_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `srot_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtpsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dspr_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zhbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `saxpy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctrsm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zhpr_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cgemm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zgbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sgemv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `scopy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `strmm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sasum_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `chpr2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztrmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtpmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zhpmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsyr2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dspmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `stpmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `chpmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cher_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `stpsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztrmm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ssyr_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zswap_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsymv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dcopy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctpsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztrsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sgbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `isamax_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sdsdot_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `drotmg_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsymm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sspmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zhpr2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `izamax_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zsyr2k_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtbsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zhemv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `csyr2k_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dzasum_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `caxpy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cher2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sgemm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `drotm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ddot_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ssyr2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctpmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dgemm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ssymv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `strsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctrmm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `scasum_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `csymm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztbmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sspr_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zgemv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zher2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zscal_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cher2k_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtrsm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ccopy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zgerc_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctrsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsyr2k_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sdot_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `strmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ssyrk_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztpsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `csyrk_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zhemm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ctrmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `snrm2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cdotc_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsyrk_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `stbsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsyr_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cgerc_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sscal_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `srotg_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `drotg_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `chpr_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `scnrm2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztpmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `chemv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sspr2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `idamax_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ssymm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dznrm2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dsdot_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cscal_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zaxpy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dger_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zgeru_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zcopy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zdscal_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `daxpy_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `chemm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dnrm2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zher_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `srotm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtrsv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zgemm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zsyrk_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cherk_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dspr2_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cdotu_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `icamax_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `cswap_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `dtrmv_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `zsymm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `ztrsm_'
/usr/local/lib/libcblas.so.1.0: undefined reference to `sswap_'
collect2: error: ld returned 1 exit status
cc /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o -L/usr/local/lib -lblas -o /tmp/tmpKcZ0cd/a.out
/tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o: In function `main':
source.c:(.text.startup+0xdc): undefined reference to `cblas_ddot'
collect2: error: ld returned 1 exit status
Traceback (most recent call last):
  File "./setup.py", line 419, in <module>
    setup_package()
  File "./setup.py", line 411, in setup_package
    setup(**metadata)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/core.py", line 137, in setup
    config = configuration()
  File "./setup.py", line 164, in configuration
    config.add_subpackage('numpy')
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/misc_util.py", line 1036, in add_subpackage
    caller_level = 2)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/misc_util.py", line 1005, in get_subpackage
    caller_level = caller_level + 1)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/misc_util.py", line 942, in _get_configuration_from_setup_py
    config = setup_module.configuration(*args)
  File "numpy/setup.py", line 10, in configuration
    config.add_subpackage('core')
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/misc_util.py", line 1036, in add_subpackage
    caller_level = 2)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/misc_util.py", line 1005, in get_subpackage
    caller_level = caller_level + 1)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/misc_util.py", line 942, in _get_configuration_from_setup_py
    config = setup_module.configuration(*args)
  File "numpy/core/setup.py", line 760, in configuration
    blas_info = get_info('blas_opt', 0)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py", line 446, in get_info
    return cl().get_info(notfound_action)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py", line 639, in get_info
    self.calc_info()
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py", line 1664, in calc_info
    blas_info = get_info('blas')
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py", line 446, in get_info
    return cl().get_info(notfound_action)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py", line 639, in get_info
    self.calc_info()
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py", line 1700, in calc_info
    lib = self.has_cblas(info)
  File "/usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5/numpy/distutils/system_info.py", line 1743, in has_cblas
    extra_postargs=info.get('extra_link_args', []))
  File "/usr/local/lib/python2.7/distutils/ccompiler.py", line 700, in link_executable
    debug, extra_preargs, extra_postargs, None, target_lang)
  File "/usr/local/lib/python2.7/distutils/unixccompiler.py", line 202, in link
    raise LinkError, msg
distutils.errors.LinkError: Command "cc /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o -L/usr/local/lib -lblas -o /tmp/tmpKcZ0cd/a.out" failed with exit status 1
*** Error 1 in . (/usr/ports/lang/python/python.port.mk:250 'do-build': @: ;cd /usr/ports/pobj/py-numpy-1.16.5/numpy-1.16.5 && /usr/bin/env ...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2878 '/usr/ports/pobj/py-numpy-1.16.5/.build_done': @cd /usr/ports/math/py-numpy ...)
*** Error 2 in /usr/ports/math/py-numpy (/usr/ports/infrastructure/mk/bsd.port.mk:2548 'all': @lock=py-numpy-1.16.5;  export _LOCKS_HELD=" p...)

Reply | Threaded
Open this post in threaded view
|

Re: WIP: Update of math/py-numpy to 1.16.5

Stuart Henderson
On 2020/03/09 10:42, Theo Buehler wrote:
> On Mon, Jan 13, 2020 at 12:50:32PM +0000, Stuart Henderson wrote:
> > 2/3 through a bulk build and I see that this breaks scipy (missing symbols,
> > blas/cblas-related) so needs a bit more work, but I think it's generally
> > along the right lines.
>
> Not sure if this provides any useful clue, but py-numpy doesn't build at
> all on sparc64 with this diff, also due to missing blas/cblas symbols:

You'll probably see the same on amd64 with USE_LLD=no.

12