[142030] trunk/dports/math/OpenBLAS
nicos at macports.org
nicos at macports.org
Sat Dec 12 04:02:04 PST 2015
Revision: 142030
https://trac.macports.org/changeset/142030
Author: nicos at macports.org
Date: 2015-11-02 04:00:07 -0800 (Mon, 02 Nov 2015)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/dports/math/OpenBLAS/Portfile
Removed Paths:
-------------
trunk/dports/math/OpenBLAS/files/patch-broadwell.diff
trunk/dports/math/OpenBLAS/files/patch-deployTarget.diff
Modified: trunk/dports/math/OpenBLAS/Portfile
===================================================================
--- 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)
@@ -22,72 +22,84 @@
subport OpenBLAS-devel {}
if {[string first "-devel" $subport] > 0} {
- github.setup xianyi OpenBLAS 3684706a121f
+ github.setup xianyi OpenBLAS 839395fc2599
name ${github.project}-devel
- version 20151008
+ version 20151029
conflicts OpenBLAS
fetch.type git
livecheck.url ${github.homepage}/commits/develop.atom
} else {
- github.setup xianyi OpenBLAS 0.2.14 v
- revision 3
+ github.setup xianyi OpenBLAS 0.2.15 v
conflicts OpenBLAS-devel
- checksums rmd160 b8a5bbcdf1816a061e45aa086a9caa8540a45f6d \
- sha256 aba5088534719cefd77e4155c281c56a3accd3eea218574c2c3d236952bb632b
- patchfiles-append patch-broadwell.diff \
- patch-deployTarget.diff
+checksums rmd160 776f78d6abd2c2733bf673ac18f0360f4bb12430 \
+ sha256 fe32d7977e9a2dddcd6e9c5350683b5e3cc3d59afdd432e9a5989449e536aecc
}
-variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 clang \
+variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 gcc5 gcc6 clang \
description "Use Gcc45 as compiler" {
configure.compiler macports-gcc-4.5
}
-variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 clang \
+variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 gcc5 gcc6 clang \
description "Use Gcc46 as compiler" {
configure.compiler macports-gcc-4.6
}
-variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 clang \
+variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 gcc5 gcc6 clang \
description "Use Gcc47 as compiler" {
configure.compiler macports-gcc-4.7
}
-variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 clang \
+variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 gcc5 gcc6 clang \
description "Use Gcc48 as compiler" {
configure.compiler macports-gcc-4.8
}
-variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 clang \
+variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 gcc5 gcc6 clang \
description "Use Gcc49 as compiler" {
configure.compiler macports-gcc-4.9
}
-variant clang conflicts gcc45 gcc46 gcc47 gcc48 gcc49 \
+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 \
description "Use Clang as compiler" {
if {[vercmp $xcodeversion 5.0] >= 0} {
configure.compiler clang
} else {
# Xcode's clang < 5.0 does not support avx
- configure.compiler macports-clang-3.4
+
+ #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
+ }
}
- #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
+ depends_build-append port:gcc5
+ configure.fc ${prefix}/bin/gfortran-mp-5
}
if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && \
- ![variant_isset gcc48] && ![variant_isset gcc49] && ![variant_isset clang]} {
+ ![variant_isset gcc48] && ![variant_isset gcc49] && ![variant_isset gcc5] && \
+ ![variant_isset gcc6] && ![variant_isset clang]} {
if { ![catch {sysctl hw.optional.avx1_0} has_avx] && $has_avx == 1 } {
#Use clang if the processor has avx instructions
default_variants +clang
} else {
- #Else, use gcc48 as default
- default_variants +gcc48
+ #Else, use gcc5 as default
+ default_variants +gcc5
}
}
@@ -99,7 +111,7 @@
if {[variant_isset universal]} {
foreach arch ${universal_archs_to_use} {
set makeINC [open ${worksrcpath}-${arch}/Makefile.rule "w"]
- puts $makeINC "VERSION = ${version}"
+ puts $makeINC "VERSION = 1"
puts $makeINC "LIBNAMESUFFIX = "
puts $makeINC "CC = ${configure.cc}"
@@ -114,8 +126,7 @@
puts $makeINC "COMMON_OPT = -O3"
} else {
#Ensure to use the AVX-capable assembler
- puts $makeINC "COMMON_OPT = -O3 \
- -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
+ puts $makeINC "COMMON_OPT = -O3"
}
puts $makeINC "COMMON_PROF = -pg"
@@ -129,7 +140,7 @@
}
} else {
set makeINC [open ${worksrcpath}/Makefile.rule "w"]
- puts $makeINC "VERSION = ${version}"
+ puts $makeINC "VERSION = 1"
puts $makeINC "LIBNAMESUFFIX = "
puts $makeINC "CC = ${configure.cc}"
@@ -144,8 +155,7 @@
puts $makeINC "COMMON_OPT = -O3"
} else {
#Ensure to use the AVX-capable assembler
- puts $makeINC "COMMON_OPT = -O3 \
- -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
+ puts $makeINC "COMMON_OPT = -O3"
}
puts $makeINC "COMMON_PROF = -pg"
@@ -174,8 +184,8 @@
${destroot}${prefix}/include/cblas_openblas.h
#Correct library name
system "install_name_tool -id \
- ${prefix}/lib/libopenblas-r${version}.dylib \
- ${destroot}${prefix}/lib/libopenblas-r${version}.dylib"
+ ${prefix}/lib/libopenblas-r1.dylib \
+ ${destroot}${prefix}/lib/libopenblas-r1.dylib"
delete file ${destroot}/${prefix}/lib/cmake
if {[variant_isset lapack]} {
#Install lapacke headers too
Deleted: trunk/dports/math/OpenBLAS/files/patch-broadwell.diff
===================================================================
--- 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)
@@ -1,152 +0,0 @@
-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
Deleted: trunk/dports/math/OpenBLAS/files/patch-deployTarget.diff
===================================================================
--- 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)
@@ -1,10 +0,0 @@
---- 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
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/ba75109d/attachment-0001.html>
More information about the macports-changes
mailing list