<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31403bd47945acece2f608bbe66f284035a9a3f6">https://github.com/macports/macports-ports/commit/31403bd47945acece2f608bbe66f284035a9a3f6</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 31403bd OpenBLAS,OpenBLAS-devel: Re-enable AVX2 support (#3519)
</span>31403bd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 31403bd47945acece2f608bbe66f284035a9a3f6
</span>Author: Chris Jones <jonesc@hep.phy.cam.ac.uk>
AuthorDate: Tue Jan 29 09:14:34 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> OpenBLAS,OpenBLAS-devel: Re-enable AVX2 support (#3519)
</span>---
math/OpenBLAS/Portfile | 26 +++++++++++++++++---------
math/OpenBLAS/files/patch-43c2b0eb.diff | 20 --------------------
2 files changed, 17 insertions(+), 29 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 6d8c381..28f4ae1 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;'>@@ -25,15 +25,13 @@ if {[string first "-devel" $subport] > 0} {
</span> checksums rmd160 af01d52f2d570756d810e0ccb1a99734690dd0e8 \
sha256 b3dff6ebaae328bb6d502e753cdabbd1000279fd7089b7ad2c61a0cdde064044 \
size 11863423
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
name ${github.project}-devel
conflicts OpenBLAS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #patch-43c2b0eb cancels commit that added -mavx2 option that does not work
</span> patchfiles patch-libnoarch.devel.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-linkLib.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-43c2b0eb.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-linkLib.devel.diff
</span>
github.livecheck.branch develop
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,13 +41,11 @@ if {[string first "-devel" $subport] > 0} {
</span> checksums rmd160 7089b502d723602c74bac7ff42bb4de7a7157696 \
sha256 f4761d863a8738b2ebe4522dabaae1402d08dcba64ddfcca3c9ffbe02d795318 \
size 11853101
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> conflicts OpenBLAS-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #patch-43c2b0eb cancels commit that added -mavx2 option that does not work
</span> patchfiles patch-libnoarch.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-linkLib.release.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-43c2b0eb.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-linkLib.release.diff
</span> }
compilers.choose fc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +79,13 @@ pre-build {
</span> }
if {![avx_compiler_isset]} {
puts $makeINC "NO_AVX = 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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> #Deactivating AVX512 instructions which do not build at this point.
#Keeping them in -devel subport. See https://trac.macports.org/ticket/57912
if {[string first "-devel" $subport] < 1} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,6 +117,12 @@ pre-build {
</span> ui_msg " AVX instructions are disabled."
puts $makeINC "NO_AVX = 1"
}
<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> #Deactivating AVX512 instructions which do not build at this point.
#Keeping them in -devel subport. See https://trac.macports.org/ticket/57912
if {[string first "-devel" $subport] < 1} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/files/patch-43c2b0eb.diff b/math/OpenBLAS/files/patch-43c2b0eb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 13023ae..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/OpenBLAS/files/patch-43c2b0eb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.x86_64.orig 2019-01-05 18:49:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.x86_64 2019-01-05 19:19:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,17 +25,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(CORE), HASWELL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifndef DYNAMIC_ARCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifndef NO_AVX2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CCOMMON_OPT += -mavx2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FCOMMON_OPT += -mavx2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OSNAME), Interix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARFLAGS = -m x64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span></pre><pre style='margin:0'>
</pre>