<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/384788f66ce6abee523818bc1bdb274851501227">https://github.com/macports/macports-ports/commit/384788f66ce6abee523818bc1bdb274851501227</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 384788f66ce py-scipy: add mkl variant
</span>384788f66ce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 384788f66ce6abee523818bc1bdb274851501227
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Jan 13 11:28:56 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-scipy: add mkl variant
</span>---
python/py-scipy/Portfile | 50 +++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 45 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/Portfile b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15918209b5a..d4804cd8245 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,30 +149,38 @@ if {${name} ne ${subport}} {
</span> system "chmod -R a+r ${destroot}${prefix}"
}
<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;'>+
</span> # Make +openblas a default variant, at least temporarily, to
# overcome issues with Apple's /usr/lib/libblas.* and
# /usr/lib/liblapack.* missing a symbol. see also:
# https://trac.macports.org/ticket/57829
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 +openblas
}
if {[variant_isset atlas]} {
# use MacPorts atlas
build.env-append OPENBLAS=None \
<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:#e0ffe0;'>+ MKLROOT=None \
</span> ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,9 +212,41 @@ have the +atlas variant active. Please ensure that numpy is activated with the\
</span> } elseif {[variant_isset openblas]} {
# use MacPorts OpenBLAS
build.env-append OPENBLAS=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ATLAS=None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATLAS=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None
</span> destroot.env-append OPENBLAS=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ATLAS=None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATLAS=None \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MKLROOT=None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset mkl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use MacPorts MKL
</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;'>+ MKLROOT=${python.prefix}
</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;'>+ MKLROOT=${python.prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check that numpy has the mkl variant active
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants py${python.version}-numpy mkl ""]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"You have selected the +mkl variant but py${python.version}-numpy does not\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+have the +mkl variant active. Please ensure that numpy is activated with the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mkl variant."
</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><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;'>+ foreach soname [exec find ${destroot}${python.pkgd}/scipy -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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# use Accelerate BLAS
build.env-append OPENBLAS=None \
</pre><pre style='margin:0'>
</pre>