<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a89938878c468dcc5849cdfc183fe00ff5426caa">https://github.com/macports/macports-ports/commit/a89938878c468dcc5849cdfc183fe00ff5426caa</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 a89938878c4 py-numpy: better handling of MKL
</span>a89938878c4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a89938878c468dcc5849cdfc183fe00ff5426caa
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Dec 23 09:42:16 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: better handling of MKL
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ref: https://github.com/macports/macports-ports/pull/13429
</span>---
python/py-numpy/Portfile | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 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 44b0ad8d8f6..d05696662ba 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;'>@@ -18,7 +18,7 @@ github.setup numpy numpy 1.21.5 v
</span> checksums rmd160 5f8dc27842bb11ae7652963f080dbb24f0e37d3e \
sha256 1a7ee0ffb35dc7489aebe5185a483f4c43b0d2cf784c3c9940f975a7dde56506 \
size 9770548
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
if {${name} ne ${subport}} {
# the python PortGroup puts compiler names in build.env and destroot.env
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 cbb34cf0981ea142ff45722d05a9daad20a134ea \
sha256 2dce87065d5de1a83485cfb3de5e4e793787890f5c1dcc3536a9cabf2e1620af \
size 4691852
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> set PATCH_PY_EXT ".27"
patchfiles-append patch-cpu-detection.py.27.patch
livecheck.url https://numpy.org/doc/stable/release.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 c14f2725afe0f7420d69a6f9ed5744639a2d2b31 \
sha256 4a421fdf82dbb3dce7e62400f69c43722b530db109c3321c6c95452f166560d9 \
size 5167349
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> patchfiles-append patch-cpu-detection.py.35.patch
set PATCH_PY_EXT ".35"
livecheck.url https://numpy.org/doc/stable/release.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 66861032bbd7c1f7e7741d913c9edf6c0b8be68a \
sha256 40e0a919cb8741556f8402cb7ec862b3b27903725ba59af44fd5b88620c5a7e1 \
size 7037758
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> # because I pushed 1.20 and it requires Py37+ and so reverting back to 1.19
epoch 1
set PATCH_PY_EXT ".36"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,8 +122,9 @@ if {${name} ne ${subport}} {
</span>
# set absolute path to remove references to @rpath/libmkl_rt.2.dylib
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change @rpath/libmkl_rt.2.dylib ${python.prefix}/lib/libmkl_rt.2.dylib ${destroot}${python.pkgd}/numpy/core/_multiarray_umath.cpython-${python.version}-darwin.so"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change @rpath/libmkl_rt.2.dylib ${python.prefix}/lib/libmkl_rt.2.dylib ${destroot}${python.pkgd}/numpy/linalg/lapack_lite.cpython-${python.version}-darwin.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach soname [exec find ${destroot}${python.pkgd}/numpy -name "*.so"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libmkl_rt.2.dylib ${python.prefix}/lib/libmkl_rt.2.dylib ${soname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,12 +167,12 @@ variant."
</span>
# use MacPorts atlas
build.env-append OPENBLAS=None \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MKL=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None \
</span> ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
destroot.env-append OPENBLAS=None \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MKL=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None \
</span> ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,8 +181,10 @@ variant."
</span>
# use MacPorts OpenBLAS
build.env-append OPENBLAS=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None \
</span> ATLAS=None
destroot.env-append OPENBLAS=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None \
</span> ATLAS=None
} elseif {[variant_isset mkl]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,20 +195,22 @@ variant."
</span> }
build.env-append OPENBLAS=None \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=${python.prefix} \
</span> ATLAS=None
destroot.env-append OPENBLAS=None \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=${python.prefix} \
</span> ATLAS=None
} else {
# use Accelerate BLAS
build.env-append OPENBLAS=None \
ATLAS=None \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MKL=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None \
</span> LAPACK=/usr/lib \
BLAS=/usr/lib
destroot.env-append OPENBLAS=None \
ATLAS=None \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MKL=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None \
</span> LAPACK=/usr/lib \
BLAS=/usr/lib
}
</pre><pre style='margin:0'>
</pre>