<!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>[141257] trunk/dports/science/octopus</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/141257">141257</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2015-10-13 13:15:11 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>octopus: Add variants to choose between ATLAS (previous default), Accelerate, and OpenBLAS for serial linear algebra. Remove unused patch mistakenly added before.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceoctopusPortfile">trunk/dports/science/octopus/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsscienceoctopusfilespatchm4metism4diff">trunk/dports/science/octopus/files/patch-m4-metis.m4.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceoctopusPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/octopus/Portfile (141256 => 141257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/octopus/Portfile 2015-10-13 20:01:04 UTC (rev 141256)
+++ trunk/dports/science/octopus/Portfile 2015-10-13 20:15:11 UTC (rev 141257)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> mpi.setup require_fortran -dragonegg34 -gcc5 -gcc6 -clang
</span><span class="cx"> compilers.enforce_fortran libxc
</span><span class="cx">
</span><del>-depends_lib port:atlas port:libxc port:fftw-3 port:gsl
</del><ins>+depends_lib port:libxc port:fftw-3 port:gsl
</ins><span class="cx"> # openblas or accelerate/veclibfort instead of atlas?
</span><span class="cx">
</span><del>-configure.args --with-libxc-prefix=${prefix} --with-blas=-lsatlas \
</del><ins>+configure.args --with-libxc-prefix=${prefix} \
</ins><span class="cx"> --disable-gdlib --without-sparskit --with-netcdf-prefix=no \
</span><span class="cx"> --with-etsf-io-prefix=no --with-berkeleygw-prefix=no \
</span><span class="cx"> --with-arpack=no --with-parpack=no --with-feast=no \
</span><span class="lines">@@ -48,6 +48,10 @@
</span><span class="cx"> configure.optflags -O3
</span><span class="cx">
</span><span class="cx"> default_variants +newuoa
</span><ins>+if {![variant_isset accelerate] && ![variant_isset openblas]} {
+ default_variants-append +atlas
+}
+
</ins><span class="cx"> # FIXME: does fortran default variant not happen in time to make fftw-3 get
</span><span class="cx"> # installed +gcc48?
</span><span class="cx"> # gfortran -> gfortran5?
</span><span class="lines">@@ -150,6 +154,24 @@
</span><span class="cx"> mpi.enforce_variant scalapack
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# choose one of the following for serial linear algebra
+variant accelerate conflicts atlas openblas description {Build with linear algebra from built-in Accelerate framework} {
+ depends_lib-append port:veclibfort
+ configure.args-append --with-blas=-lveclibfort
+}
+
+variant atlas conflicts accelerate openblas description {Build with linear algebra from ATLAS} {
+ depends_lib-append port:atlas
+ configure.args-append --with-blas=-lsatlas
+}
+
+variant openblas conflicts accelerate atlas description {Build with linear algebra from OpenBLAS} {
+ # allow OpenBLAS-devel too
+ depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
+ require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
+ configure.args-append --with-blas=-lopenblas
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}/wiki/index.php/Main_Page
</span><span class="cx"> livecheck.regex ${name} (\[0-9.\]+)
</span></span></pre></div>
<a id="trunkdportsscienceoctopusfilespatchm4metism4diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/octopus/files/patch-m4-metis.m4.diff (141256 => 141257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/octopus/files/patch-m4-metis.m4.diff 2015-10-13 20:01:04 UTC (rev 141256)
+++ trunk/dports/science/octopus/files/patch-m4-metis.m4.diff 2015-10-13 20:15:11 UTC (rev 141257)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>---- m4/metis.m4.orig 2015-02-26 16:20:51.000000000 -0500
-+++ m4/metis.m4 2015-10-09 10:46:57.000000000 -0400
-@@ -15,7 +15,7 @@
- ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- ## 02110-1301, USA.
- ##
--## $Id: metis.m4 13225 2015-02-26 21:20:25Z dstrubbe $
-+## $Id: metis.m4 14659 2015-10-09 14:17:20Z dstrubbe $
- ##
-
- AC_DEFUN([ACX_PATH_METIS], [
-@@ -31,15 +31,15 @@
- AC_REQUIRE([AC_PROG_CC])
-
- AC_ARG_WITH([metis-prefix],
-- [AC_HELP_STRING([--with-metis-prefix],
-+ [AS_HELP_STRING([--with-metis-prefix=DIR],
- [Directory where external METIS library was installed (must be single-precision)])])
-
- case $with_metis_prefix in
-- no ) acx_external_metis=disabled ;;
-+ no ) acx_external_metis=no ;;
- "") with_metis_prefix="/usr" ;;
- esac
-
-- if test x"$acx_external_metis" != xdisabled; then
-+ if test x"$acx_external_metis" != xno; then
-
- dnl Backup CFLAGS and LIBS
- acx_metis_save_CFLAGS="$CFLAGS"
-@@ -86,6 +86,8 @@
-
- CFLAGS="$acx_metis_save_CFLAGS"
- LIBS="$acx_metis_save_LIBS"
-+ else
-+ AC_MSG_RESULT([disabled])
- fi
-
- if test x"$acx_external_metis" = xno ; then
</del></span></pre>
</div>
</div>
</body>
</html>