<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/00fc836eb9ee2ced138aaa068983e2386bbb1402">https://github.com/macports/macports-ports/commit/00fc836eb9ee2ced138aaa068983e2386bbb1402</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00fc836eb9ee2ced138aaa068983e2386bbb1402
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Dec 14 10:41:30 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: use specified BLAS/LAPACK libraries
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add mkl variant; patch MKL library name; use install_name_tool to
</span><span style='display:block; white-space:pre;color:#404040;'> remove @path references to MKL library
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62578
</span>---
python/py-numpy/Portfile | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 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 9101d3bd154..18931b16bcf 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;'>@@ -108,20 +108,32 @@ if {${name} ne ${subport}} {
</span> destroot.env-append ARCHFLAGS=[get_canonical_archflags ld]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant atlas conflicts openblas description "Use MacPorts ATLAS Libraries" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant atlas conflicts openblas mkl description "Use MacPorts ATLAS Libraries" {
</span> depends_lib-append port:atlas
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant openblas conflicts atlas description "Use MacPorts OpenBLAS Libraries" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant openblas conflicts atlas mkl description "Use MacPorts OpenBLAS Libraries" {
</span> depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mkl conflicts atlas openblas description "Use MacPorts MKL Libraries" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-mkl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mkl-include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set absolute path to remove references to @rpath/libmkl_rt.2.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</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 ${destroot}${python.pkgd}/numpy/core/_multiarray_umath.cpython-${python.version}-darwin.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 ${destroot}${python.pkgd}/numpy/linalg/lapack_lite.cpython-${python.version}-darwin.so"
</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;'>+
</span> # Make +openblas a default variant, at least temporarily, to
# overcome issues with polyfit. see also:
# https://trac.macports.org/ticket/56954
# https://github.com/numpy/numpy/issues/12230
if {![variant_isset atlas] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset openblas] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset mkl]} {
</span> default_variants-append +openblas
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,10 +166,12 @@ variant."
</span>
# use MacPorts atlas
build.env-append OPENBLAS=None \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKL=None \
</span> ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
destroot.env-append OPENBLAS=None \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKL=None \
</span> ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,14 +184,28 @@ variant."
</span> destroot.env-append OPENBLAS=${prefix}/lib \
ATLAS=None
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset mkl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use MacPorts MKL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|mkl_rt|mkl_rt.2|g" ${worksrcpath}/numpy/distutils/system_info.py
</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;'>+ build.env-append OPENBLAS=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATLAS=None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append OPENBLAS=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATLAS=None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# use Accelerate BLAS
build.env-append OPENBLAS=None \
ATLAS=None \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKL=None \
</span> LAPACK=/usr/lib \
BLAS=/usr/lib
destroot.env-append OPENBLAS=None \
ATLAS=None \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKL=None \
</span> LAPACK=/usr/lib \
BLAS=/usr/lib
}
</pre><pre style='margin:0'>
</pre>