<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c35e266c3f0a430273deeb70965011492e1db7c7">https://github.com/macports/macports-ports/commit/c35e266c3f0a430273deeb70965011492e1db7c7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c35e266c3f0 py-numpy: Update to version 1.25.2; Default Accelerate framework on arm64
</span>c35e266c3f0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c35e266c3f0a430273deeb70965011492e1db7c7
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Fri Aug 4 15:07:18 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: Update to version 1.25.2; Default Accelerate framework on arm64
</span>---
python/py-numpy/Portfile | 22 +++++++++----
python/py-numpy/files/patch-arm64_min.38.diff | 38 ++++++++++++++++++++++
python/py-numpy/files/patch-fcompiler_g95.38.diff | 11 +++++++
.../files/patch-numpy_core_setup.py.38.diff | 34 +++++++++++++++++++
.../files/patch-numpy_linalg_setup.py.38.diff | 18 ++++++++++
.../patch-numpy_tests_test_scripts.py.38.diff | 11 +++++++
6 files changed, 128 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1db817b26d7..c3b5a57ec16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,14 +11,15 @@ categories-append math
</span> license BSD
maintainers {michaelld @michaelld} openmaintainer
description The core utilities for the scientific library scipy for Python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup numpy numpy 1.24.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dd2df59cb48926eb460143f617a552b8009af11d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2386da9a471cc00a1f47845e27d916d5ec5346ae9696e01a8a34760858fe9dd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10903184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup numpy numpy 1.25.2 v
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1fbbbb4eb4c1e0f6f0c499d30b7809bdba866d95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10805282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} ne ${subport}} {
# the python PortGroup puts compiler names in build.env and destroot.env
# for this to be done correctly, the following must be located before python.versions
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +89,15 @@ if {${name} ne ${subport}} {
</span> github.tarball_from releases
set PATCH_PY_EXT ".37"
livecheck.regex {(1\.21(?:\.\d+)+)}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${python.version} == 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup numpy numpy 1.24.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 dd2df59cb48926eb460143f617a552b8009af11d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2386da9a471cc00a1f47845e27d916d5ec5346ae9696e01a8a34760858fe9dd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10903184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PATCH_PY_EXT ".38"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {(1\.24(?:\.\d+)+)}
</span> } else {
github.tarball_from releases
if {${python.pep517}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +163,7 @@ if {${name} ne ${subport}} {
</span> if {![variant_isset atlas] &&
![variant_isset openblas] &&
![variant_isset mkl] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.build_arch} ne "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.build_arch} ni {i386 arm64}} {
</span> default_variants-append +openblas
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-arm64_min.38.diff b/python/py-numpy/files/patch-arm64_min.38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..af59915ae46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-arm64_min.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/system_info.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/system_info.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2524,25 +2524,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the system BLAS from Accelerate or vecLib under OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'x86_64' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'i386' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ intel = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if get_platform()[-5:] == 'arm64' or 'arm' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'arm' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/Accelerate.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'accelerate' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-I/System/Library/Frameworks/vecLib.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-I/System/Library/Frameworks/Accelerate.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/vecLib.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'veclib' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-I/System/Library/Frameworks/vecLib.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args.extend(['-Wl,-framework', '-Wl,vecLib'])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-fcompiler_g95.38.diff b/python/py-numpy/files/patch-fcompiler_g95.38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d7329ba656b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-fcompiler_g95.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/fcompiler/__init__.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/fcompiler/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -753,7 +753,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'vast', 'compaq', 'intele', 'intelem', 'gnu', 'g95',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pathf95', 'nagfor', 'fujitsu')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('darwin.*', ('gnu95', 'nag', 'nagfor', 'absoft', 'ibm', 'intel', 'gnu',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'g95', 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('irix.*', ('mips', 'gnu', 'gnu95',)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('aix.*', ('ibm', 'gnu', 'gnu95',)),
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_core_setup.py.38.diff b/python/py-numpy/files/patch-numpy_core_setup.py.38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ed0cf894737
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_core_setup.py.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/core/setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/core/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -552,7 +552,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define inline to our keyword, or nothing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write('#ifndef __cplusplus\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -647,7 +654,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write(textwrap.dedent("""
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_linalg_setup.py.38.diff b/python/py-numpy/files/patch-numpy_linalg_setup.py.38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..584e9df7ab7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_linalg_setup.py.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/linalg/setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/linalg/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources=['lapack_litemodule.c', get_lapack_lite_sources],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends=['lapack_lite/f2c.h'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_info=lapack_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extra_link_args=['-Wl,-undefined,dynamic_lookup', '-bundle']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # umath_linalg module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,6 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_info=lapack_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_cxx_compile_args=NPY_CXX_FLAGS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libraries=['npymath'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extra_link_args=['-Wl,-undefined,dynamic_lookup', '-bundle']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.add_data_files('*.pyi')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return config
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.38.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6cf3e4e02f8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/tests/test_scripts.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/tests/test_scripts.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = sys.version_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ major = str(version.major)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minor = str(version.minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ['f2py', 'f2py' + major, 'f2py' + major + '.' + minor]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ['f2py', 'f2py' + major, 'f2py' + major + '.' + minor, 'f2py-' + major + '.' + minor]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @pytest.mark.skipif(is_inplace, reason="Cannot test f2py command inplace")
</span></pre><pre style='margin:0'>
</pre>