<!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>[131741] trunk/dports/science/abinit</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/131741">131741</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2015-01-16 14:55:20 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>abinit: Update to 7.10.2. A compiler flag for long lines needs to be passed. Add +gcc49 and make this default variant. Remove +wannier90 as default variant since it fails the test. Patch files are no longer needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceabinitPortfile">trunk/dports/science/abinit/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsscienceabinitfilespatchconfigurediff">trunk/dports/science/abinit/files/patch-configure.diff</a></li>
<li><a href="#trunkdportsscienceabinitfilespatchsrc71_bsehaydockF90diff">trunk/dports/science/abinit/files/patch-src-71_bse-haydock.F90.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceabinitPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/abinit/Portfile (131740 => 131741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/abinit/Portfile 2015-01-16 22:22:37 UTC (rev 131740)
+++ trunk/dports/science/abinit/Portfile 2015-01-16 22:55:20 UTC (rev 131741)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx">
</span><span class="cx"> name abinit
</span><del>-version 7.8.2
</del><ins>+version 7.10.2
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3
</span><span class="lines">@@ -31,14 +31,18 @@
</span><span class="cx"> homepage http://www.abinit.org
</span><span class="cx"> master_sites http://ftp.abinit.org/
</span><span class="cx">
</span><del>-checksums rmd160 c82fcc454ab7f337728fad33ca2d563887c15cba \
- sha256 793b8b5698f8a4231e34e62711e7d5f56fb276aa5bb3bad8303af0ae2f74aead
</del><ins>+checksums rmd160 cf4078c1eab2cc3200e084379738939cafda5ba2 \
+ sha256 cbead80096d97f1c8d08ccb3b9b2851ac1e56accaebe551d9ab29757e9cd531e
</ins><span class="cx">
</span><span class="cx"> depends_lib port:atlas
</span><span class="cx">
</span><span class="cx"> configure.args --with-linalg-flavor="atlas" --enable-gw-dpc
</span><span class="cx"> configure.optflags -O3
</span><span class="cx">
</span><ins>+# FIXME: not right for g95? would be -ffree-line-length-huge. This is really the configure script's job? Not easy to set this right for MPI g95.
+# If this is not set, there will be some compilation failures, due to inadequate provisions by the code for compilers that don't accept long lines.
+configure.fcflags-append -ffree-line-length-none
+
</ins><span class="cx"> # This is a temporary measure for debugging configure failure on Mountain Lion buildslave.
</span><span class="cx">
</span><span class="cx"> #checking for gcc... mpicc-mpich-mp
</span><span class="lines">@@ -57,14 +61,15 @@
</span><span class="cx"> # but did not provide the libraries. That situation should never happen for this port.
</span><span class="cx"> #build.target multi multi_nprocs=4
</span><span class="cx">
</span><del>-default_variants +etsf_io +libxc +wannier90
-if { ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48] } {
</del><ins>+default_variants +etsf_io +libxc
+# Do not put +wannier90 since tests fail for wannier90 use.
+if { ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48] && ![variant_isset gcc49] } {
</ins><span class="cx"> if { ![variant_isset openmpi] } {
</span><span class="cx"> default_variants +mpich
</span><span class="cx"> } elseif { ![variant_isset mpich] } {
</span><span class="cx"> default_variants +openmpi
</span><span class="cx"> } else {
</span><del>- default_variants +gcc48
</del><ins>+ default_variants +gcc49
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -130,11 +135,6 @@
</span><span class="cx"> # No need to check compiler for fftw-3
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#Fix unnecessary rejection of libxc 2.1.0
-#Fix an openMP syntax error
-patchfiles patch-configure.diff \
- patch-src-71_bse-haydock.F90.diff
-
</del><span class="cx"> pre-configure {
</span><span class="cx"> if { [variant_isset etsf_io] } {
</span><span class="cx"> configure.args-append --with-trio-flavor="netcdf+etsf_io"
</span><span class="lines">@@ -194,23 +194,29 @@
</span><span class="cx"> test.run yes
</span><span class="cx"> test.cmd tests/runtests.py
</span><span class="cx"> test.target built-in fast
</span><ins>+# wannier90 test will probably fail.
</ins><span class="cx">
</span><del>-variant gcc46 conflicts gcc47 gcc48 openmpi mpich description {Build with GCC 4.6} {
</del><ins>+variant gcc46 conflicts gcc47 gcc48 gcc49 openmpi mpich description {Build with GCC 4.6} {
</ins><span class="cx"> configure.compiler macports-gcc-4.6
</span><span class="cx"> configure.args-append FCCPP="${configure.cpp} -ansi"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc47 conflicts gcc46 gcc48 openmpi mpich description {Build with GCC 4.7} {
</del><ins>+variant gcc47 conflicts gcc46 gcc48 gcc49 openmpi mpich description {Build with GCC 4.7} {
</ins><span class="cx"> configure.compiler macports-gcc-4.7
</span><span class="cx"> configure.args-append FCCPP="${configure.cpp} -ansi"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc48 conflicts gcc46 gcc47 openmpi mpich description {Build with GCC 4.8} {
</del><ins>+variant gcc48 conflicts gcc46 gcc47 gcc49 openmpi mpich description {Build with GCC 4.8} {
</ins><span class="cx"> configure.compiler macports-gcc-4.8
</span><span class="cx"> configure.args-append FCCPP="${configure.cpp} -ansi"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant openmpi conflicts gcc46 gcc47 gcc48 mpich description {Build parallel version with OpenMPI} {
</del><ins>+variant gcc49 conflicts gcc46 gcc47 gcc48 openmpi mpich description {Build with GCC 4.9} {
+ configure.compiler macports-gcc-4.9
+ configure.args-append FCCPP="${configure.cpp} -ansi"
+}
+
+variant openmpi conflicts gcc46 gcc47 gcc48 gcc49 mpich description {Build parallel version with OpenMPI} {
</ins><span class="cx"> depends_lib-append path:bin/mpif90-openmpi-mp:openmpi-default
</span><span class="cx"> configure.fc mpif90-openmpi-mp
</span><span class="cx"> configure.cc mpicc-openmpi-mp
</span><span class="lines">@@ -221,7 +227,7 @@
</span><span class="cx"> test.env-append MPIEXEC=${prefix}/bin/mpiexec-openmpi-mp
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mpich conflicts gcc46 gcc47 gcc48 openmpi description {Build parallel version with MPICH} {
</del><ins>+variant mpich conflicts gcc46 gcc47 gcc48 gcc49 openmpi description {Build parallel version with MPICH} {
</ins><span class="cx"> depends_lib-append path:bin/mpif90-mpich-mp:mpich-default
</span><span class="cx"> configure.fc mpif90-mpich-mp
</span><span class="cx"> configure.cc mpicc-mpich-mp
</span></span></pre></div>
<a id="trunkdportsscienceabinitfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/abinit/files/patch-configure.diff (131740 => 131741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/abinit/files/patch-configure.diff 2015-01-16 22:22:37 UTC (rev 131740)
+++ trunk/dports/science/abinit/files/patch-configure.diff 2015-01-16 22:55:20 UTC (rev 131741)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- configure.orig 2014-09-15 16:54:13.000000000 -0400
-+++ configure 2014-09-15 16:54:45.000000000 -0400
-@@ -36647,7 +36647,7 @@
-
- int major = -1, minor = -1;
- xc_version(&major, &minor);
-- if ( (major != 2) || (minor != 0) ) {
-+ if ( (major != 2) || (minor >= 2) ) {
- return 1; }
-
- ;
</del></span></pre></div>
<a id="trunkdportsscienceabinitfilespatchsrc71_bsehaydockF90diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/abinit/files/patch-src-71_bse-haydock.F90.diff (131740 => 131741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/abinit/files/patch-src-71_bse-haydock.F90.diff 2015-01-16 22:22:37 UTC (rev 131740)
+++ trunk/dports/science/abinit/files/patch-src-71_bse-haydock.F90.diff 2015-01-16 22:55:20 UTC (rev 131741)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>---- src/71_bse/haydock.F90.orig 2014-10-27 01:17:45.000000000 +0100
-+++ src/71_bse/haydock.F90 2014-10-27 01:14:25.000000000 +0100
-@@ -2229,7 +2229,9 @@
-
- c = czero
-
-- !$OMP PARALLEL DO DEFAULT(none) PRIVATE(A,b,c,is1,iv1,ic1,ibnd_coarse,it,allindices,is,iv,ic,idense,ineighbour,ind_with_nb) SHARED(BSp,overlaps,phi,nbnd_coarse,ophi,grid)
-+!$OMP PARALLEL DO DEFAULT(none) PRIVATE(A,b,c,is1,iv1,ic1,ibnd_coarse,it,allindices, &
-+!$OMP is,iv,ic,idense,ineighbour,ind_with_nb), &
-+!$OMP SHARED(BSp,overlaps,phi,nbnd_coarse,ophi,grid)
- do ik_dense = 1,grid%nbz_dense
- ! if( ik_dense is not in my set of k-points)
- ! ! continue
-@@ -2292,7 +2294,9 @@
- ABI_MALLOC(b,(grid%ndiv))
- ABI_MALLOC(c,(grid%ndiv))
-
-- !$OMP PARALLEL DO COLLAPSE(2) DEFAULT(none) PRIVATE(is, it_coarse, ibnd_coarse, ineighbour, b, c, tmp) SHARED(allp,BSp,interp_factors,ophi,indices)
-+ !$OMP PARALLEL DO COLLAPSE(2) DEFAULT(none), &
-+ !$OMP PRIVATE(is, it_coarse, ibnd_coarse, ineighbour, b, c, tmp), &
-+ !$OMP SHARED(allp,BSp,interp_factors,ophi,indices)
- do is = 1, BSp%nsppol
- do ineighbour = 1,8
-
-@@ -2348,7 +2352,10 @@
-
- c = czero
-
-- !$OMP PARALLEL DO COLLAPSE(2) DEFAULT(none) PRIVATE(ineighbour,ik_dense,is1,iv1,ic1,is,iv,ic,A,b,c,ibnd_coarse,ik_coarse,it,idense) SHARED(test,overlaps,ophi,BSp,grid,corresp,nbnd_coarse)
-+ !$OMP PARALLEL DO COLLAPSE(2) DEFAULT(none), &
-+ !$OMP PRIVATE(ineighbour,ik_dense,is1,iv1,ic1,is,iv,ic,A,b,c,ibnd_coarse, &
-+ !$OMP ik_coarse,it,idense), &
-+ !$OMP SHARED(test,overlaps,ophi,BSp,grid,corresp,nbnd_coarse)
- do ineighbour = 1,8
- do ik_dense = 1,grid%nbz_dense
- do is1 = 1, Bsp%nsppol
</del></span></pre>
</div>
</div>
</body>
</html>