[122619] trunk/dports/math/atlas
vince at macports.org
vince at macports.org
Thu Jul 24 23:05:14 PDT 2014
Revision: 122619
https://trac.macports.org/changeset/122619
Author: vince at macports.org
Date: 2014-07-24 23:05:14 -0700 (Thu, 24 Jul 2014)
Log Message:
-----------
Bump to latest stable. Remove the clang33 option that hangs with some kind of CPU (Corei7) and makes Apple clang the default.
Modified Paths:
--------------
trunk/dports/math/atlas/Portfile
Added Paths:
-----------
trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff
Removed Paths:
-------------
trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff
trunk/dports/math/atlas/files/patch-emit_mm_c.diff
trunk/dports/math/atlas/files/patch-makes-Make.lib.diff
Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/Portfile 2014-07-25 06:05:14 UTC (rev 122619)
@@ -1,4 +1,5 @@
# $Id$
+set ports_ignore_different "yes"
PortSystem 1.0
PortGroup muniversal 1.0
@@ -6,12 +7,11 @@
categories math
license BSD
name atlas
-version 3.10.1
-revision 5
+version 3.10.2
use_bzip2 yes
# additional versions
-set lapackversion 3.4.2
+set lapackversion 3.5.0
set lapackname lapack
set atlasdist ${name}${version}${extract.suffix}
set lapackdist ${lapackname}-${lapackversion}.tgz
@@ -29,7 +29,7 @@
homepage http://math-atlas.sourceforge.net/
-master_sites sourceforge:project/math-atlas/Stable/${version}:atlas \
+master_sites sourceforge:http://downloads.sourceforge.net/project/math-atlas/Stable/${version} \
http://www.netlib.org/lapack:lapack
distfiles ${atlasdist}:atlas \
@@ -37,26 +37,37 @@
extract.only ${atlasdist}
-patchfiles patch-emit_mm_c.diff \
- patch-ATL_cmm4x4x128_av_c.diff \
- patch-makes-Make.lib.diff
+patchfiles patch-archinfo_x86_c.diff
-checksums ${atlasdist} \
- rmd160 67f928ad900caa300b23e2f824b8a495f416c8d6 \
- sha256 a215b492204aae0205f4028e7c4076492a5d6a564f8f859ff062fd79587bcc86 \
- ${lapackdist} \
- rmd160 8740c35c9a85b71424fe1ffeed192256aebeb431 \
- sha256 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
+checksums atlas3.10.2.tar.bz2 \
+ rmd160 af4099e8bb65f5d771618ca1580f5bc8210f83fe \
+ sha256 3aab139b118bf3fcdb4956fbd71676158d713ab0d3bccb2ae1dc3769db22102f \
+ lapack-3.5.0.tgz \
+ rmd160 d803308ef28f3c6cffb051850823395e2cb29b6a \
+ sha256 9ad8f0d3f3fb5521db49f2dd716463b8fb2b6bc9dc386a9956b8c6144f726352
worksrcdir ATLAS
-compiler.blacklist macports-clang-3.1 macports-clang-3.0 \
- macports-clang-2.9
+compiler.blacklist macports-clang-3.2 macports-clang-3.1 \
+ macports-clang-3.0 macports-clang-2.9
set gcc_version 0
set use_clang ""
-variant gcc48 conflicts gcc46 gcc47 clang mpclang33 perf \
+variant gcc49 conflicts gcc47 gcc48 clang mpclang34 perf\
+ description {build using macports-gcc-4.9} {
+
+ configure.compiler macports-gcc-4.9
+}
+
+if {[variant_isset gcc49]} {
+
+ set gcc_version 49
+ set use_clang ""
+
+}
+
+variant gcc48 conflicts gcc47 gcc49 clang mpclang34 perf \
description {build using macports-gcc-4.8} {
configure.compiler macports-gcc-4.8
@@ -68,7 +79,7 @@
set use_clang ""
}
-variant gcc47 conflicts gcc46 gcc48 clang mpclang33 perf \
+variant gcc47 conflicts gcc48 gcc49 clang mpclang34 perf \
description {build using macports-gcc-4.7} {
configure.compiler macports-gcc-4.7
@@ -80,20 +91,8 @@
set use_clang ""
}
-variant gcc46 conflicts gcc47 gcc48 clang mpclang33 perf\
- description {build using macports-gcc-4.6} {
- configure.compiler macports-gcc-4.6
-}
-
-if {[variant_isset gcc46]} {
-
- set gcc_version 46
- set use_clang ""
-
-}
-
-variant clang conflicts gcc46 gcc47 gcc48 mpclang33 \
+variant clang conflicts gcc47 gcc48 gcc49 mpclang34 \
description {use XCode clang and gfortran} {
pre-fetch {
@@ -112,33 +111,39 @@
set gcc_version 0
}
-variant mpclang33 conflicts gcc46 gcc47 gcc48 clang perf\
- description {use mp-clang-3.3 and gfortran} {
+variant mpclang34 conflicts gcc47 gcc48 gcc49 clang perf\
+ description {use mp-clang-3.4 and gfortran} {
- configure.compiler macports-clang-3.3
+ configure.compiler macports-clang-3.4
}
-if {[variant_isset mpclang33]} {
+if {[variant_isset mpclang34]} {
- set use_clang "33"
+ set use_clang "34"
set gcc_version 0
}
-variant perf conflicts gcc46 gcc47 gcc48 mpclang33 clang \
- description {Uses clang-mp-3.3 for C and dragonegg-3.3 for Fortran} {
+variant perf conflicts gcc47 gcc48 gcc49 mpclang34 clang \
+ description {Uses clang-mp-3.4 for C and dragonegg-3.4 for Fortran} {
- configure.compiler macports-clang-3.3
- depends_build-append port:dragonegg-3.3-gcc-4.8
- configure.f77 ${prefix}/bin/dragonegg-3.3-gfortran-mp-4.8
+ if {[vercmp ${xcodeversion} 5.0] < 0} {
+ configure.compiler macports-clang-3.4
+ } else {
+ set use_clang "XCode"
+ set gcc_version 0
+ }
+ depends_build-append port:dragonegg-3.4-gcc-4.8
+ configure.f77 ${prefix}/bin/dragonegg-3.4-gfortran-mp-4.8
+
set clang_flags "-O3 -fPIC -fomit-frame-pointer"
set gcc_flags "${clang_flags} \
- -specs=${prefix}/libexec/dragonegg/llvm33gcc48-integrated-as.specs"
+ -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
}
if {[variant_isset perf]} {
- set use_clang "33"
+ set use_clang "34"
set gcc_version 48
}
@@ -178,11 +183,11 @@
}
# If none of the above variants is chosen, make gcc47 the default for
-# up to SSE4.2 (Core i1) capable processors, and mp-clang-3.3 for newer
+# up to SSE4.2 (Core i1) capable processors, and XCode-clang for newer
-if {![variant_isset gcc46] && ![variant_isset gcc47] && \
- ![variant_isset gcc48] && ![variant_isset clang] && \
- ![variant_isset perf] && ![variant_isset mpclang33]} {
+if {![variant_isset gcc47] && ![variant_isset gcc48] && \
+ ![variant_isset gcc49] && ![variant_isset clang] && \
+ ![variant_isset perf] && ![variant_isset mpclang34]} {
if {${has_avx} == "no"} {
@@ -191,11 +196,18 @@
set gcc_version 47
set use_clang ""
} else {
-
- # Defaults to clang-mp-3.3
- default_variants +mpclang33
- set gcc_version 0
- set use_clang "33"
+
+ # Use an appropriate version of Clang
+ set gcc_version 0
+ if {[vercmp ${xcodeversion} 5.0] >= 0} {
+ # With XCode 5.0+, defaults to Xcode-clang
+ default_variants +clang
+ set use_clang "XCode"
+ } else {
+ # Otherwise use Macports clang 3.4
+ default_variants +mpclang34
+ set use_clang "34"
+ }
}
}
@@ -245,10 +257,10 @@
# Only Clang handles AVX+ correctly
set gvct_flag "-msse4.2"
# downgrade FMA to AVX for the time being
- set cvct_flag "-mavx"
+ set cvct_flag "-mfma"
if {${use_clang} != ""} {
- configure.args-append -A 26 -V 480
+ configure.args-append -A 28 -V 456
} else {
# No AVX when using GCC 4.x
@@ -425,6 +437,8 @@
set gcc_version \
[join [split [string range ${configure.f77} end-2 end] "."] ""]
}
+ } else {
+ set libgccpath ${prefix}/lib/gcc48
}
}
@@ -432,7 +446,7 @@
# Output the F77 selected compiler
if {[variant_isset perf]} {
- ui_msg "Using dragonegg-3.3-gfortran-mp-4.8 as Fortran compiler."
+ ui_msg "Using dragonegg-3.4-gfortran-mp-4.8 as Fortran compiler."
} else {
ui_msg "Selected F77 compiler: gfortran${gcc_version}"
}
@@ -478,7 +492,7 @@
# AVX stuff. GCC compilers cannot use AVX instruction set because the
# system as(1) is outdated
- # Clang 3.3 is fine
+ # Clang 3.4 is fine
if {${has_avx} == "yes" && ${use_clang} == ""} {
@@ -760,40 +774,40 @@
build.target build
build.dir ${worksrcpath}/build
-post-build {
- if {${universal} == 0} {
+#post-build {
+# if {${universal} == 0} {
+#
+# set libdir ${build.dir}/lib
+# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+# ${libdir}/Makefile
- set libdir ${build.dir}/lib
- reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
- ${libdir}/Makefile
-
# On mono-processors machines, build libsatlas.dylib only
- if {${no_threads} == 1} {
+# if {${no_threads} == 1} {
+#
+# system -W ${libdir} "${build.cmd} dylib"
+# } else {
+#
+# system -W ${libdir} "${build.cmd} shared_all"
+# }
+# } else {
+#
+# foreach arch ${universal_archs_to_use} {
- system -W ${libdir} "${build.cmd} dylib"
- } else {
+# set libdir ${worksrcpath}-${arch}/build/lib
+# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+# ${libdir}/Makefile
- system -W ${libdir} "${build.cmd} shared_all"
- }
- } else {
-
- foreach arch ${universal_archs_to_use} {
-
- set libdir ${worksrcpath}-${arch}/build/lib
- reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
- ${libdir}/Makefile
-
# Same as above
- if {${no_threads} == 1} {
+# if {${no_threads} == 1} {
- system -W ${libdir} "${build.cmd} dylib"
- } else {
+# system -W ${libdir} "${build.cmd} dylib"
+# } else {
- system -W ${libdir} "${build.cmd} shared_all"
- }
- }
- }
-}
+# system -W ${libdir} "${build.cmd} shared_all"
+# }
+# }
+# }
+#}
destroot.dir ${build.dir}
destroot.destdir DESTDIR=${destroot}${prefix}
Deleted: trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff 2014-07-25 06:05:14 UTC (rev 122619)
@@ -1,11 +0,0 @@
---- tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c.orig 2012-12-14 12:32:46.000000000 +0100
-+++ tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c 2012-12-14 12:32:55.000000000 +0100
-@@ -1321,7 +1321,7 @@
- #endif
- vmaddfp vC01, vA0, vB1, vC01
- #ifdef BETAX
-- dcbtst 0, pBETA, 0
-+ dcbtst 0, pBETA
- #endif
- vmaddfp vC11, vA1, vB1, vC11
- vmaddfp vC21, vA2, vB1, vC21
Added: trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff (rev 0)
+++ trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff 2014-07-25 06:05:14 UTC (rev 122619)
@@ -0,0 +1,10 @@
+--- CONFIG/src/backend/archinfo_x86.c.old 2014-07-17 21:47:57.000000000 +0200
++++ CONFIG/src/backend/archinfo_x86.c 2014-07-17 21:48:42.000000000 +0200
+@@ -342,6 +342,7 @@
+ break;
+ case 0x2D:
+ case 0x3A:
++ case 0x3E:
+ case 0x2A:
+ iret = IntCorei2;
+ break;
Deleted: trunk/dports/math/atlas/files/patch-emit_mm_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-emit_mm_c.diff 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/files/patch-emit_mm_c.diff 2014-07-25 06:05:14 UTC (rev 122619)
@@ -1,15 +0,0 @@
---- tune/blas/gemm/emit_mm.c.orig 2012-12-10 13:59:14.000000000 +0100
-+++ tune/blas/gemm/emit_mm.c 2012-12-10 13:59:59.000000000 +0100
-@@ -2688,10 +2688,7 @@
- {
- if (wp->CC[0]) /* need non-default compilation rule */
- {
-- char *comp = (wp->CC[0] == 'g' && wp->CC[1] == 'c'
-- && wp->CC[2] == 'c' &&
-- (wp->CC[3] == '\0' || wp->CC[3] == ' '))
-- ? "$(GOODGCC)" : wp->CC;
-+ char *comp = "$(GOODGCC)";
- for (j=0; j < nbetas; j++)
- {
- for(k=0; k < wp->ncomps; k++)
-
Deleted: trunk/dports/math/atlas/files/patch-makes-Make.lib.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-makes-Make.lib.diff 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/files/patch-makes-Make.lib.diff 2014-07-25 06:05:14 UTC (rev 122619)
@@ -1,56 +0,0 @@
---- makes/Make.lib.orig 2013-01-08 12:15:41.000000000 -0600
-+++ makes/Make.lib 2013-11-24 02:11:17.000000000 -0600
-@@ -242,7 +242,7 @@
- LIBINSTdir="$(LIBINSTdir)"
-
- # =======================================================================
--# The following commands are to build dynamib libraries on OS X (in BETA)
-+# The following commands are to build dynamic libraries on OS X (in BETA)
- # =======================================================================
- dylib :
- rm -rf $(tmpd) ; mkdir $(tmpd)
-@@ -250,7 +250,7 @@
- cd $(tmpd) ; ar x ../libf77blas.a
- cd $(tmpd) ; ar x ../libcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libsatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libsatlas.dylib \
- -install_name $(LIBINSTdir)/libsatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS) $(F77SYSLIB)
- rm -rf $(tmpd)
-@@ -260,7 +260,7 @@
- cd $(tmpd) ; ar x ../libptf77blas.a
- cd $(tmpd) ; ar x ../libptcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libtatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libtatlas.dylib \
- -install_name $(LIBINSTdir)/libtatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS) $(F77SYSLIB)
- rm -rf $(tmpd)
-@@ -269,7 +269,7 @@
- cd $(tmpd) ; ar x ../libclapack.a
- cd $(tmpd) ; ar x ../libcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libsatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libsatlas.dylib \
- -install_name $(LIBINSTdir)/libsatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS)
- rm -rf $(tmpd)
-@@ -278,7 +278,7 @@
- cd $(tmpd) ; ar x ../libptclapack.a
- cd $(tmpd) ; ar x ../libptcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libtatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libtatlas.dylib \
- -install_name $(LIBINSTdir)/libtatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS)
- rm -rf $(tmpd)
-@@ -287,7 +287,7 @@
- rm -rf $(tmpd) ; mkdir $(tmpd)
- cd $(tmpd) ; ar x ../liblapack.a
- rm -f $(tmpd)/*C2F $(tmpd)/*f77wrap*
-- cd $(tmpd) ; libtool -dynamic -o ../libclapack.dylib \
-+ cd $(tmpd) ; libtool -dynamiclib -o ../libclapack.dylib \
- -install_name $(LIBINSTdir)/libclapack.dylib \
- -compatibility_version $(VER) -current_version $(VER) \
- *.o ../libcblas.dylib ../libatlas.dylib $(LIBS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140724/15f266c0/attachment.html>
More information about the macports-changes
mailing list