<!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>[149006] trunk/dports/math/mumps</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/149006">149006</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2016-05-24 14:56:20 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mumps: Use linear_algebra port group, thus offering atlas and openblas as options for BLAS. Add test phase: this required undoing the patch in the examples directory which seemed confused about which libraries were being built shared.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathmumpsPortfile">trunk/dports/math/mumps/Portfile</a></li>
<li><a href="#trunkdportsmathmumpsfilespatchshareddiff">trunk/dports/math/mumps/files/patch-shared.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathmumpsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/mumps/Portfile (149005 => 149006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/mumps/Portfile 2016-05-24 21:44:58 UTC (rev 149005)
+++ trunk/dports/math/mumps/Portfile 2016-05-24 21:56:20 UTC (rev 149006)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup mpi 1.0
</span><ins>+PortGroup linear_algebra 1.0
</ins><span class="cx">
</span><span class="cx"> name mumps
</span><span class="cx"> version 5.0.1
</span><span class="lines">@@ -28,6 +29,8 @@
</span><span class="cx">
</span><span class="cx"> mpi.enforce_variant scalapack
</span><span class="cx">
</span><ins>+linalg.setup blas_only
+
</ins><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles-append patch-shared.diff
</span><span class="cx">
</span><span class="lines">@@ -58,7 +61,7 @@
</span><span class="cx"> reinplace "s|^SCALAP.*$|SCALAP = ${prefix}/lib/libscalapack.dylib|" ${worksrcpath}/Makefile.inc
</span><span class="cx"> reinplace "s|^INCPAR.*$|INCPAR = -I\$(topdir)/include|" ${worksrcpath}/Makefile.inc
</span><span class="cx"> reinplace "s|^LIBPAR.*$|LIBPAR = \$(SCALAP)|" ${worksrcpath}/Makefile.inc
</span><del>- reinplace "s|^LIBBLAS.*$|LIBBLAS = -framework Accelerate|" ${worksrcpath}/Makefile.inc
</del><ins>+ reinplace "s|^LIBBLAS.*$|LIBBLAS = ${linalglib}|" ${worksrcpath}/Makefile.inc
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot {
</span><span class="lines">@@ -68,3 +71,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type none
</span><ins>+
+test.run yes
+test.target all
+test.args-append PREFIX="${prefix}" LPORD=../lib/libpord.a
+
+post-test {
+ if {![catch {sysctl hw.ncpu} result]} {
+ set njobs $result
+ } else {
+ set njobs 1
+ }
+ set runcmd "${mpi.exec} -np ${njobs}"
+
+ system -W ${worksrcpath}/examples "${runcmd} ./ssimpletest < input_simpletest_real"
+ system -W ${worksrcpath}/examples "${runcmd} ./dsimpletest < input_simpletest_real"
+ system -W ${worksrcpath}/examples "${runcmd} ./csimpletest < input_simpletest_cmplx"
+ system -W ${worksrcpath}/examples "${runcmd} ./zsimpletest < input_simpletest_cmplx"
+ system -W ${worksrcpath}/examples "${runcmd} ./c_example"
+}
</ins></span></pre></div>
<a id="trunkdportsmathmumpsfilespatchshareddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/mumps/files/patch-shared.diff (149005 => 149006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/mumps/files/patch-shared.diff 2016-05-24 21:44:58 UTC (rev 149005)
+++ trunk/dports/math/mumps/files/patch-shared.diff 2016-05-24 21:56:20 UTC (rev 149006)
</span><span class="lines">@@ -61,75 +61,6 @@
</span><span class="cx"> realclean:
</span><span class="cx"> - rm -f *.o libpord.a
</span><span class="cx"> + rm -f *.o libpord$(LIBEXT) libpord$(SHAREDLIBEXT)
</span><del>-diff --git a/examples/Makefile b/examples/Makefile
---- a/examples/Makefile
-+++ b/examples/Makefile
-@@ -18,32 +18,32 @@ s: ssimpletest
- d: dsimpletest c_example
-
-
- include $(topdir)/Makefile.inc
-
--LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT)$(LIBEXT)
-+LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT)$(SHAREDLIBEXT)
-
-
--LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON)
-
- ssimpletest: $(LIBSMUMPS) $$@.o
- $(FL) -o $@ $(OPTL) ssimpletest.o $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
-
-
--LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON)
-
- dsimpletest: $(LIBDMUMPS) $$@.o
- $(FL) -o $@ $(OPTL) dsimpletest.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
-
-
--LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON)
-
- csimpletest: $(LIBCMUMPS) $$@.o
- $(FL) -o $@ $(OPTL) csimpletest.o $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
-
-
--LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON)
-
- zsimpletest: $(LIBZMUMPS) $$@.o
- $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
-
-
-@@ -56,23 +56,23 @@ c_example: $(LIBDMUMPS) $$@.o
- $(FC) $(OPTF) $(INCS) -I. -I$(topdir)/include -c $*.F $(OUTF)$*.o
- .c.o:
- $(CC) $(OPTC) $(INCS) $(CDEFS) -I. -I$(topdir)/include -I$(topdir)/src -c $*.c $(OUTC)$*.o
-
-
--$(libdir)/libsmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libsmumps$(PLAT)$(SHAREDLIBEXT):
- @echo 'Error: you should build the library' $@ 'first'
- exit 1
-
--$(libdir)/libdmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libdmumps$(PLAT)$(SHAREDLIBEXT):
- @echo 'Error: you should build the library' $@ 'first'
- exit 1
-
--$(libdir)/libcmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libcmumps$(PLAT)$(SHAREDLIBEXT):
- @echo 'Error: you should build the library' $@ 'first'
- exit 1
-
--$(libdir)/libzmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libzmumps$(PLAT)$(SHAREDLIBEXT):
- @echo 'Error: you should build the library' $@ 'first'
- exit 1
-
- $(LIBMUMPS_COMMON):
- @echo 'Error: you should build the library' $@ 'first'
</del><span class="cx"> diff --git a/src/Makefile b/src/Makefile
</span><span class="cx"> --- a/src/Makefile
</span><span class="cx"> +++ b/src/Makefile
</span></span></pre>
</div>
</div>
</body>
</html>