<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/d8f7def2ffdcc42f2f8a2a24073ce5a98fa9211d">https://github.com/macports/macports-ports/commit/d8f7def2ffdcc42f2f8a2a24073ce5a98fa9211d</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 d8f7def OpenBLAS: when on PPC, disable all AXV quietly; whitespace
</span>d8f7def is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d8f7def2ffdcc42f2f8a2a24073ce5a98fa9211d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Mar 11 12:51:09 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> OpenBLAS: when on PPC, disable all AXV quietly; whitespace
</span>---
math/OpenBLAS/Portfile | 72 ++++++++++++++++++++++++++++++++------------------
1 file changed, 46 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/Portfile b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13ca692..f2ebeaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ if {[string first "-devel" $subport] > 0} {
</span> patch-openblas-powermac970-fix.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.choose fc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.choose fc
</span> compilers.setup default_fortran
variant lapack description "Add Lapack/CLapack support to the library" { }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,25 +79,35 @@ pre-build {
</span> } else {
puts $makeINC "BINARY = 32"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts $makeINC "COMMON_OPT = -O3"
puts $makeINC "COMMON_PROF = -pg"
if {![variant_isset lapack]} {
puts $makeINC "NO_LAPACK = 1"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![avx_compiler_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on a PPC of some sort; just disable AVX
</span> puts $makeINC "NO_AVX = 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable AVX2 on OSX10.6 and older only.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On newer platforms AVX2 is now supported via
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-ports/pull/3486
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= 10 } {
</span> puts $makeINC "NO_AVX2 = 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Deactivating AVX512 instructions which do not build at this point.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Keeping them in -devel subport. See https://trac.macports.org/ticket/57912
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first "-devel" $subport] < 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![avx_compiler_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disable AVX2 on OSX10.6 and older only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On newer platforms AVX2 is now supported via
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/pull/3486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} <= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX2 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Deactivating AVX512 instructions which do not build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # at this point. Keeping them in -devel subport. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/57912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first "-devel" $subport] < 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
close $makeINC
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,27 +124,37 @@ pre-build {
</span> } else {
puts $makeINC "BINARY = 32"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts $makeINC "COMMON_OPT = -O3"
puts $makeINC "COMMON_PROF = -pg"
if {![variant_isset lapack]} {
puts $makeINC "NO_LAPACK = 1"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![avx_compiler_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Warning: the chosen compiler cannot handle advanced optimisation instructions."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " AVX instructions are disabled."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on a PPC of some sort; just disable AVX
</span> puts $makeINC "NO_AVX = 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable AVX2 on OSX10.6 (Darwin10) and older only.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On newer platforms AVX2 is now supported via
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-ports/pull/3486
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= 10 } {
</span> puts $makeINC "NO_AVX2 = 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Deactivating AVX512 instructions which do not build at this point.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Keeping them in -devel subport. See https://trac.macports.org/ticket/57912
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first "-devel" $subport] < 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![avx_compiler_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Warning: the chosen compiler cannot handle advanced optimisation instructions."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " AVX instructions are disabled."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disable AVX2 on OSX10.6 (Darwin10) and older only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On newer platforms AVX2 is now supported via
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/pull/3486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} <= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX2 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Deactivating AVX512 instructions which do not build at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this point. Keeping them in -devel subport. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/57912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first "-devel" $subport] < 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
close $makeINC
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +166,7 @@ build.args "AR=${prefix}/bin/ar RANLIB=${prefix}/bin/ranlib"
</span> platform darwin 8 {
depends_build-append port:gmake
build.cmd ${prefix}/bin/gmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_test-append port:gmake
test.cmd build.cmd
}
</pre><pre style='margin:0'>
</pre>