<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[142030] trunk/dports/math/OpenBLAS</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/142030">142030</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2015-11-02 04:00:07 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>OpenBLAS: update to version 0.2.15 and *-devel to latest commit
Use latest default compilers (in particular gcc5 for gfortran)
Ensure that the library name does not change with each upgrade
Add gcc5 and gcc6 variants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathOpenBLASPortfile">trunk/dports/math/OpenBLAS/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmathOpenBLASfilespatchbroadwelldiff">trunk/dports/math/OpenBLAS/files/patch-broadwell.diff</a></li>
<li><a href="#trunkdportsmathOpenBLASfilespatchdeployTargetdiff">trunk/dports/math/OpenBLAS/files/patch-deployTarget.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathOpenBLASPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/OpenBLAS/Portfile (142029 => 142030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/OpenBLAS/Portfile 2015-11-02 10:31:32 UTC (rev 142029)
+++ trunk/dports/math/OpenBLAS/Portfile 2015-11-02 12:00:07 UTC (rev 142030)
</span><span class="lines">@@ -22,72 +22,84 @@
</span><span class="cx">
</span><span class="cx"> subport OpenBLAS-devel {}
</span><span class="cx"> if {[string first "-devel" $subport] > 0} {
</span><del>- github.setup xianyi OpenBLAS 3684706a121f
</del><ins>+ github.setup xianyi OpenBLAS 839395fc2599
</ins><span class="cx"> name ${github.project}-devel
</span><del>- version 20151008
</del><ins>+ version 20151029
</ins><span class="cx"> conflicts OpenBLAS
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> livecheck.url ${github.homepage}/commits/develop.atom
</span><span class="cx"> } else {
</span><del>- github.setup xianyi OpenBLAS 0.2.14 v
- revision 3
</del><ins>+ github.setup xianyi OpenBLAS 0.2.15 v
</ins><span class="cx"> conflicts OpenBLAS-devel
</span><span class="cx">
</span><del>- checksums rmd160 b8a5bbcdf1816a061e45aa086a9caa8540a45f6d \
- sha256 aba5088534719cefd77e4155c281c56a3accd3eea218574c2c3d236952bb632b
- patchfiles-append patch-broadwell.diff \
- patch-deployTarget.diff
</del><ins>+checksums rmd160 776f78d6abd2c2733bf673ac18f0360f4bb12430 \
+ sha256 fe32d7977e9a2dddcd6e9c5350683b5e3cc3d59afdd432e9a5989449e536aecc
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 clang \
</del><ins>+variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 gcc5 gcc6 clang \
</ins><span class="cx"> description "Use Gcc45 as compiler" {
</span><span class="cx"> configure.compiler macports-gcc-4.5
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 clang \
</del><ins>+variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 gcc5 gcc6 clang \
</ins><span class="cx"> description "Use Gcc46 as compiler" {
</span><span class="cx"> configure.compiler macports-gcc-4.6
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 clang \
</del><ins>+variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 gcc5 gcc6 clang \
</ins><span class="cx"> description "Use Gcc47 as compiler" {
</span><span class="cx"> configure.compiler macports-gcc-4.7
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 clang \
</del><ins>+variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 gcc5 gcc6 clang \
</ins><span class="cx"> description "Use Gcc48 as compiler" {
</span><span class="cx"> configure.compiler macports-gcc-4.8
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 clang \
</del><ins>+variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 gcc5 gcc6 clang \
</ins><span class="cx"> description "Use Gcc49 as compiler" {
</span><span class="cx"> configure.compiler macports-gcc-4.9
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant clang conflicts gcc45 gcc46 gcc47 gcc48 gcc49 \
</del><ins>+variant gcc5 conflicts gcc45 gcc46 gcc47 gcc48 gcc49 gcc6 clang \
+ description "Use Gcc49 as compiler" {
+ configure.compiler macports-gcc-5
+}
+
+variant gcc6 conflicts gcc45 gcc46 gcc47 gcc48 gcc49 gcc5 clang \
+ description "Use Gcc49 as compiler" {
+ configure.compiler macports-gcc-6
+}
+
+variant clang conflicts gcc45 gcc46 gcc47 gcc48 gcc49 gcc5 gcc6 \
</ins><span class="cx"> description "Use Clang as compiler" {
</span><span class="cx"> if {[vercmp $xcodeversion 5.0] >= 0} {
</span><span class="cx"> configure.compiler clang
</span><span class="cx"> } else {
</span><span class="cx"> # Xcode's clang < 5.0 does not support avx
</span><del>- configure.compiler macports-clang-3.4
</del><ins>+
+ #Use a compiler depending on system
+ if {${configure.cxx_stdlib} eq "libc++"} {
+ configure.compiler macports-clang-3.7
+ } else {
+ configure.compiler macports-clang-3.4
+ }
</ins><span class="cx"> }
</span><del>- #Also need a compiler for fortran code: forcing to dragonegg to
- #ensure AVX-capable fortran compiler
- depends_build-append port:dragonegg-3.4-gcc-4.8
- configure.fc ${prefix}/bin/dragonegg-3.4-gfortran-mp-4.8
</del><ins>+ depends_build-append port:gcc5
+ configure.fc ${prefix}/bin/gfortran-mp-5
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && \
</span><del>- ![variant_isset gcc48] && ![variant_isset gcc49] && ![variant_isset clang]} {
</del><ins>+ ![variant_isset gcc48] && ![variant_isset gcc49] && ![variant_isset gcc5] && \
+ ![variant_isset gcc6] && ![variant_isset clang]} {
</ins><span class="cx"> if { ![catch {sysctl hw.optional.avx1_0} has_avx] && $has_avx == 1 } {
</span><span class="cx"> #Use clang if the processor has avx instructions
</span><span class="cx"> default_variants +clang
</span><span class="cx"> } else {
</span><del>- #Else, use gcc48 as default
- default_variants +gcc48
</del><ins>+ #Else, use gcc5 as default
+ default_variants +gcc5
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -99,7 +111,7 @@
</span><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> foreach arch ${universal_archs_to_use} {
</span><span class="cx"> set makeINC [open ${worksrcpath}-${arch}/Makefile.rule "w"]
</span><del>- puts $makeINC "VERSION = ${version}"
</del><ins>+ puts $makeINC "VERSION = 1"
</ins><span class="cx"> puts $makeINC "LIBNAMESUFFIX = "
</span><span class="cx">
</span><span class="cx"> puts $makeINC "CC = ${configure.cc}"
</span><span class="lines">@@ -114,8 +126,7 @@
</span><span class="cx"> puts $makeINC "COMMON_OPT = -O3"
</span><span class="cx"> } else {
</span><span class="cx"> #Ensure to use the AVX-capable assembler
</span><del>- puts $makeINC "COMMON_OPT = -O3 \
- -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
</del><ins>+ puts $makeINC "COMMON_OPT = -O3"
</ins><span class="cx"> }
</span><span class="cx"> puts $makeINC "COMMON_PROF = -pg"
</span><span class="cx">
</span><span class="lines">@@ -129,7 +140,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> set makeINC [open ${worksrcpath}/Makefile.rule "w"]
</span><del>- puts $makeINC "VERSION = ${version}"
</del><ins>+ puts $makeINC "VERSION = 1"
</ins><span class="cx"> puts $makeINC "LIBNAMESUFFIX = "
</span><span class="cx">
</span><span class="cx"> puts $makeINC "CC = ${configure.cc}"
</span><span class="lines">@@ -144,8 +155,7 @@
</span><span class="cx"> puts $makeINC "COMMON_OPT = -O3"
</span><span class="cx"> } else {
</span><span class="cx"> #Ensure to use the AVX-capable assembler
</span><del>- puts $makeINC "COMMON_OPT = -O3 \
- -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
</del><ins>+ puts $makeINC "COMMON_OPT = -O3"
</ins><span class="cx"> }
</span><span class="cx"> puts $makeINC "COMMON_PROF = -pg"
</span><span class="cx">
</span><span class="lines">@@ -174,8 +184,8 @@
</span><span class="cx"> ${destroot}${prefix}/include/cblas_openblas.h
</span><span class="cx"> #Correct library name
</span><span class="cx"> system "install_name_tool -id \
</span><del>- ${prefix}/lib/libopenblas-r${version}.dylib \
- ${destroot}${prefix}/lib/libopenblas-r${version}.dylib"
</del><ins>+ ${prefix}/lib/libopenblas-r1.dylib \
+ ${destroot}${prefix}/lib/libopenblas-r1.dylib"
</ins><span class="cx"> delete file ${destroot}/${prefix}/lib/cmake
</span><span class="cx"> if {[variant_isset lapack]} {
</span><span class="cx"> #Install lapacke headers too
</span></span></pre></div>
<a id="trunkdportsmathOpenBLASfilespatchbroadwelldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/OpenBLAS/files/patch-broadwell.diff (142029 => 142030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/OpenBLAS/files/patch-broadwell.diff 2015-11-02 10:31:32 UTC (rev 142029)
+++ trunk/dports/math/OpenBLAS/files/patch-broadwell.diff 2015-11-02 12:00:07 UTC (rev 142030)
</span><span class="lines">@@ -1,152 +0,0 @@
</span><del>-diff -ur ../OpenBLAS-0.2.14-orig/cpuid_x86.c ./cpuid_x86.c
---- ../OpenBLAS-0.2.14-orig/cpuid_x86.c 2015-03-25 05:07:07.000000000 +0900
-+++ ./cpuid_x86.c 2015-08-08 22:26:31.000000000 +0900
-@@ -1101,6 +1101,16 @@
- #endif
- else
- return CPUTYPE_NEHALEM;
-+ case 13:
-+ //Broadwell
-+ if(support_avx())
-+#ifndef NO_AVX2
-+ return CPUTYPE_HASWELL;
-+#else
-+ return CPUTYPE_SANDYBRIDGE;
-+#endif
-+ else
-+ return CPUTYPE_NEHALEM;
- }
- break;
- case 4:
-@@ -1115,8 +1125,33 @@
- #endif
- else
- return CPUTYPE_NEHALEM;
-+ case 7:
-+ case 15:
-+ //Broadwell
-+ if(support_avx())
-+#ifndef NO_AVX2
-+ return CPUTYPE_HASWELL;
-+#else
-+ return CPUTYPE_SANDYBRIDGE;
-+#endif
-+ else
-+ return CPUTYPE_NEHALEM;
- }
- break;
-+ case 5:
-+ switch (model) {
-+ case 6:
-+ //Broadwell
-+ if(support_avx())
-+#ifndef NO_AVX2
-+ return CPUTYPE_HASWELL;
-+#else
-+ return CPUTYPE_SANDYBRIDGE;
-+#endif
-+ else
-+ return CPUTYPE_NEHALEM;
-+ }
-+ break;
- }
- break;
- case 0x7:
-@@ -1528,6 +1563,16 @@
- #endif
- else
- return CORE_NEHALEM;
-+ case 13:
-+ //broadwell
-+ if(support_avx())
-+#ifndef NO_AVX2
-+ return CORE_HASWELL;
-+#else
-+ return CORE_SANDYBRIDGE;
-+#endif
-+ else
-+ return CORE_NEHALEM;
- }
- break;
- case 4:
-@@ -1542,8 +1587,33 @@
- #endif
- else
- return CORE_NEHALEM;
-+ case 7:
-+ case 15:
-+ //broadwell
-+ if(support_avx())
-+#ifndef NO_AVX2
-+ return CORE_HASWELL;
-+#else
-+ return CORE_SANDYBRIDGE;
-+#endif
-+ else
-+ return CORE_NEHALEM;
- }
- break;
-+ case 5:
-+ switch (model) {
-+ case 6:
-+ //broadwell
-+ if(support_avx())
-+#ifndef NO_AVX2
-+ return CORE_HASWELL;
-+#else
-+ return CORE_SANDYBRIDGE;
-+#endif
-+ else
-+ return CORE_NEHALEM;
-+ }
-+ break;
- }
- break;
-
-diff -ur ../OpenBLAS-0.2.14-orig/driver/others/dynamic.c ./driver/others/dynamic.c
---- ../OpenBLAS-0.2.14-orig/driver/others/dynamic.c 2015-03-25 05:07:07.000000000 +0900
-+++ ./driver/others/dynamic.c 2015-08-08 22:26:45.000000000 +0900
-@@ -221,6 +221,15 @@
- return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
- }
- }
-+ //Intel Broadwell
-+ if (model == 13) {
-+ if(support_avx())
-+ return &gotoblas_HASWELL;
-+ else{
-+ openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
-+ return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
-+ }
-+ }
- return NULL;
- case 4:
- //Intel Haswell
-@@ -232,6 +241,26 @@
- return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
- }
- }
-+ //Intel Broadwell
-+ if (model == 7 || model == 15) {
-+ if(support_avx())
-+ return &gotoblas_HASWELL;
-+ else{
-+ openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
-+ return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
-+ }
-+ }
-+ return NULL;
-+ case 5:
-+ //Intel Broadwell
-+ if (model == 6) {
-+ if(support_avx())
-+ return &gotoblas_HASWELL;
-+ else{
-+ openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
-+ return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
-+ }
-+ }
- return NULL;
- }
- case 0xf:
-Only in .: patch-broadwell.diff
</del></span></pre></div>
<a id="trunkdportsmathOpenBLASfilespatchdeployTargetdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/OpenBLAS/files/patch-deployTarget.diff (142029 => 142030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/OpenBLAS/files/patch-deployTarget.diff 2015-11-02 10:31:32 UTC (rev 142029)
+++ trunk/dports/math/OpenBLAS/files/patch-deployTarget.diff 2015-11-02 12:00:07 UTC (rev 142030)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- Makefile.system.orig 2015-10-02 21:34:09.000000000 +0900
-+++ Makefile.system 2015-10-02 21:34:40.000000000 +0900
-@@ -200,7 +200,6 @@
- #
-
- ifeq ($(OSNAME), Darwin)
--export MACOSX_DEPLOYMENT_TARGET=10.2
- MD5SUM = md5 -r
- endif
-
</del></span></pre>
</div>
</div>
</body>
</html>