<!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>[147134] trunk/dports/python/py-graph-tool</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/147134">147134</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2016-03-29 08:28:56 -0700 (Tue, 29 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-graph-tool: enable OpenMP when using the clang-3.[89] compilers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpygraphtoolPortfile">trunk/dports/python/py-graph-tool/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-graph-tool/files/</li>
<li><a href="#trunkdportspythonpygraphtoolfilesgraph_blockmodelhhpatch">trunk/dports/python/py-graph-tool/files/graph_blockmodel.hh.patch</a></li>
<li><a href="#trunkdportspythonpygraphtoolfilesgraph_blockmodel_overlaphhpatch">trunk/dports/python/py-graph-tool/files/graph_blockmodel_overlap.hh.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpygraphtoolPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-graph-tool/Portfile (147133 => 147134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-graph-tool/Portfile 2016-03-29 14:47:50 UTC (rev 147133)
+++ trunk/dports/python/py-graph-tool/Portfile 2016-03-29 15:28:56 UTC (rev 147134)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> set realname graph-tool
</span><span class="cx"> name py-${realname}
</span><span class="cx"> version 2.13
</span><del>-revision 1
-epoch 20160307
</del><ins>+revision 2
+epoch 20160329
</ins><span class="cx"> categories python science
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> sha1 108be4cf6212eb6886f172ea03813187f73e4c3c \
</span><span class="cx"> rmd160 cd2e8506522821750d70a97b951254f0a133d218
</span><span class="cx"> } else {
</span><ins>+ patchfiles graph_blockmodel.hh.patch graph_blockmodel_overlap.hh.patch
</ins><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> compiler.blacklist *gcc* {clang <= 700.1.81} {macports-clang-3.[0-6]}
</span><span class="cx"> compiler.fallback-append macports-clang-3.7
</span><span class="lines">@@ -82,6 +83,10 @@
</span><span class="cx"> configure.cppflags-append -I${prefix}/include -I${python.include}/..
</span><span class="cx"> configure.ldflags-append -L${prefix}/lib
</span><span class="cx"> configure.args-append --with-boost=${prefix} --exec-prefix=${python.prefix}
</span><ins>+ if {${configure.compiler} eq "macports-clang-3.8" ||
+ ${configure.compiler} eq "macports-clang-3.9"} {
+ configure.args-append --enable-openmp
+ }
</ins><span class="cx"> # Clang uses the old libstc++ from gcc 4.2 before OS X 10.9. Boost doesn't
</span><span class="cx"> # include some of the tr1 headers in libstdc++ and defines its own tr1
</span><span class="cx"> # classes. This causes conflicts with sparsehash which insists on using
</span></span></pre></div>
<a id="trunkdportspythonpygraphtoolfilesgraph_blockmodelhhpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-graph-tool/files/graph_blockmodel.hh.patch (0 => 147134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-graph-tool/files/graph_blockmodel.hh.patch (rev 0)
+++ trunk/dports/python/py-graph-tool/files/graph_blockmodel.hh.patch 2016-03-29 15:28:56 UTC (rev 147134)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+--- ./src/graph/community/graph_blockmodel.hh.orig 2016-03-29 05:31:22.000000000 -0400
++++ ./src/graph/community/graph_blockmodel.hh 2016-03-29 05:43:27.000000000 -0400
+@@ -2638,21 +2638,21 @@
+ vector<int64_t>& vlist, vector<int64_t>& block_list,
+ bool deg_corr, bool dense, bool multigraph, double beta,
+ Eprop eweight, Vprop vweight, Graph& g, bool sequential,
+- bool parallel, bool random_move, double c, size_t nmerges,
++ bool parallel_enabled, bool random_move, double c, size_t nmerges,
+ Vprop merge_map, size_t niter, size_t B, bool verbose, RNG& rng,
+ double& S, size_t& nmoves)
+ {
+ typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
+
+ if (vlist.size() < 100)
+- parallel = false;
++ parallel_enabled = false;
+
+ nmoves = 0;
+ S = 0;
+
+ vector<rng_t*> rngs;
+ size_t num_threads = 1;
+- if (parallel)
++ if (parallel_enabled)
+ {
+ #ifdef USING_OPENMP
+ num_threads = omp_get_max_threads();
+@@ -2690,7 +2690,7 @@
+ // used only if merging
+ gt_hash_set<vertex_t> past_moves;
+ vector<pair<vertex_t, double> > best_move;
+- if (nmerges > 0 || parallel)
++ if (nmerges > 0 || parallel_enabled)
+ best_move.resize(num_vertices(g), make_pair(vertex_t(0), numeric_limits<double>::max()));
+
+ std::uniform_int_distribution<size_t> s_rand(0, block_list.size() - 1);
+@@ -2699,17 +2699,17 @@
+
+ for (size_t iter = 0; iter < niter; ++iter)
+ {
+- if (nmerges == 0 && !parallel)
++ if (nmerges == 0 && !parallel_enabled)
+ std::shuffle(vlist.begin(), vlist.end(), rng);
+
+ int i = 0, N = vlist.size();
+ #pragma omp parallel for default(shared) private(i) \
+ firstprivate(past_moves, m_entries) \
+- schedule(runtime) if (parallel)
++ schedule(runtime) if (parallel_enabled)
+ for (i = 0; i < N; ++i)
+ {
+ size_t tid = 0;
+- if (parallel)
++ if (parallel_enabled)
+ {
+ #ifdef USING_OPENMP
+ tid = omp_get_thread_num();
+@@ -2862,7 +2862,7 @@
+
+ if (accept)
+ {
+- if (!parallel)
++ if (!parallel_enabled)
+ {
+ assert(b[v] == int(r));
+ move_vertex(v, s, b, cv, vmap, deg_corr, states,
+@@ -2884,7 +2884,7 @@
+ }
+ }
+
+- if (parallel && (nmerges == 0))
++ if (parallel_enabled && (nmerges == 0))
+ {
+ for (vertex_t v : vlist)
+ {
+@@ -2910,7 +2910,7 @@
+ }
+ }
+
+- if (parallel && (nmerges == 0))
++ if (parallel_enabled && (nmerges == 0))
+ {
+ for (auto r : rngs)
+ delete r;
</ins></span></pre></div>
<a id="trunkdportspythonpygraphtoolfilesgraph_blockmodel_overlaphhpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-graph-tool/files/graph_blockmodel_overlap.hh.patch (0 => 147134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-graph-tool/files/graph_blockmodel_overlap.hh.patch (rev 0)
+++ trunk/dports/python/py-graph-tool/files/graph_blockmodel_overlap.hh.patch 2016-03-29 15:28:56 UTC (rev 147134)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+--- ./src/graph/community/graph_blockmodel_overlap.hh.orig 2016-03-29 05:31:42.000000000 -0400
++++ ./src/graph/community/graph_blockmodel_overlap.hh 2016-03-29 05:37:52.000000000 -0400
+@@ -1287,7 +1287,7 @@
+ VLprop cv, VVprop vmap, Vprop clabel,
+ vector<int64_t>& vlist, vector<int64_t>& block_list,
+ bool deg_corr, bool dense, bool multigraph, double beta,
+- Vprop vweight, Graph& g, bool sequential, bool parallel,
++ Vprop vweight, Graph& g, bool sequential, bool parallel_enabled,
+ bool random_move, double c, size_t niter, size_t B,
+ bool verbose, RNG& rng, double& S, size_t& nmoves)
+ {
+@@ -1297,11 +1297,11 @@
+ S = 0;
+
+ if (vlist.size() < 100)
+- parallel = false;
++ parallel_enabled = false;
+
+ vector<pair<vertex_t, double> > best_move;
+ vector<rng_t*> rngs;
+- if (parallel)
++ if (parallel_enabled)
+ {
+ best_move.resize(num_vertices(g), make_pair(vertex_t(0), numeric_limits<double>::max()));
+
+@@ -1334,11 +1334,11 @@
+
+ int i = 0, N = vlist.size();
+ #pragma omp parallel for default(shared) private(i) \
+- firstprivate(m_entries) schedule(runtime) if (parallel)
++ firstprivate(m_entries) schedule(runtime) if (parallel_enabled)
+ for (i = 0; i < N; ++i)
+ {
+ size_t tid = 0;
+- if (parallel)
++ if (parallel_enabled)
+ {
+ #ifdef USING_OPENMP
+ tid = omp_get_thread_num();
+@@ -1464,7 +1464,7 @@
+
+ if (accept)
+ {
+- if (!parallel)
++ if (!parallel_enabled)
+ {
+
+ assert(b[v] == int(r));
+@@ -1488,7 +1488,7 @@
+ }
+ }
+
+- if (parallel)
++ if (parallel_enabled)
+ {
+ for (vertex_t v : vlist)
+ {
+@@ -1512,7 +1512,7 @@
+ }
+ }
+
+- if (parallel)
++ if (parallel_enabled)
+ {
+ for (auto r : rngs)
+ delete r;
</ins></span></pre>
</div>
</div>
</body>
</html>