<!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>[140101] trunk/dports/math/superlu_dist</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/140101">140101</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2015-09-09 14:27:18 -0700 (Wed, 09 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>superlu_dist: update to 4.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathsuperlu_distPortfile">trunk/dports/math/superlu_dist/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathsuperlu_distfilespatchremoveduplicatesymbolsdiff">trunk/dports/math/superlu_dist/files/patch-remove-duplicate-symbols.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmathsuperlu_distfilesduplicatepatch">trunk/dports/math/superlu_dist/files/duplicate.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathsuperlu_distPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/superlu_dist/Portfile (140100 => 140101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/superlu_dist/Portfile 2015-09-09 21:27:16 UTC (rev 140100)
+++ trunk/dports/math/superlu_dist/Portfile 2015-09-09 21:27:18 UTC (rev 140101)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup mpi 1.0
</span><span class="cx">
</span><span class="cx"> name superlu_dist
</span><del>-version 3.3
</del><ins>+version 4.1
</ins><span class="cx"> categories math
</span><span class="cx"> license BSD
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -21,15 +21,15 @@
</span><span class="cx"> distname ${name}_${version}
</span><span class="cx"> worksrcdir SuperLU_DIST_${version}
</span><span class="cx">
</span><del>-checksums rmd160 36441437d9a8e22c9f635336d7a71b8d9aea97b5 \
- sha256 d2fd8dc847ae63ed7980cff2ad4db8d117640ecdf0234c9711e0f6ee1398cac2
</del><ins>+checksums rmd160 0212b417c4187ece0a249f5e1545adea75074840 \
+ sha256 8afb48036e9b3020d268d49d5a3711aaed2f65105747aa6a111ff8f64dcde93e
</ins><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><span class="cx"> mpi.setup require
</span><span class="cx">
</span><span class="cx"> depends_lib port:parmetis
</span><span class="cx">
</span><del>-patchfiles-append duplicate.patch
</del><ins>+patchfiles-append patch-remove-duplicate-symbols.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmathsuperlu_distfilesduplicatepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/superlu_dist/files/duplicate.patch (140100 => 140101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/superlu_dist/files/duplicate.patch 2015-09-09 21:27:16 UTC (rev 140100)
+++ trunk/dports/math/superlu_dist/files/duplicate.patch 2015-09-09 21:27:18 UTC (rev 140101)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>---- SRC/dreadtriple.c 2012-11-08 17:36:07.000000000 -0600
-+++ SRC/dreadtriple.c 2012-11-08 17:36:36.000000000 -0600
-@@ -149,22 +149,3 @@
-
- }
-
--
--void dreadrhs(int m, double *b)
--{
-- FILE *fp, *fopen();
-- int i, j;
--
-- if ( !(fp = fopen("b.dat", "r")) ) {
-- fprintf(stderr, "dreadrhs: file does not exist\n");
-- exit(-1);
-- }
-- for (i = 0; i < m; ++i)
-- fscanf(fp, "%lf\n", &b[i]);
-- /*fscanf(fp, "%d%lf\n", &j, &b[i]);*/
-- /* readpair_(j, &b[i]);*/
--
-- fclose(fp);
--}
--
--
---- SRC/zreadtriple.c 2012-11-08 17:36:07.000000000 -0600
-+++ SRC/zreadtriple.c 2012-11-08 17:36:46.000000000 -0600
-@@ -148,20 +148,3 @@
-
- }
-
--
--void zreadrhs(int m, doublecomplex *b)
--{
-- FILE *fp, *fopen();
-- int i, j;
--
-- if ( !(fp = fopen("b.dat", "r")) ) {
-- fprintf(stderr, "zreadrhs: file does not exist\n");
-- exit(-1);
-- }
-- for (i = 0; i < m; ++i)
-- fscanf(fp, "%lf%lf\n", &(b[i].r), &(b[i].i));
--
-- fclose(fp);
--}
--
--
</del></span></pre></div>
<a id="trunkdportsmathsuperlu_distfilespatchremoveduplicatesymbolsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/superlu_dist/files/patch-remove-duplicate-symbols.diff (0 => 140101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/superlu_dist/files/patch-remove-duplicate-symbols.diff (rev 0)
+++ trunk/dports/math/superlu_dist/files/patch-remove-duplicate-symbols.diff 2015-09-09 21:27:18 UTC (rev 140101)
</span><span class="lines">@@ -0,0 +1,284 @@
</span><ins>+diff -ur SRC-bak/dreadMM.c SRC/dreadMM.c
+--- SRC-bak/dreadMM.c 2015-09-04 11:32:08.000000000 -0700
++++ SRC/dreadMM.c 2015-09-04 11:32:21.000000000 -0700
+@@ -212,22 +212,3 @@
+ #endif
+
+ }
+-
+-
+-void dreadrhs(int m, double *b)
+-{
+- FILE *fp, *fopen();
+- int i;
+-
+- if ( !(fp = fopen("b.dat", "r")) ) {
+- fprintf(stderr, "dreadrhs: file does not exist\n");
+- exit(-1);
+- }
+- for (i = 0; i < m; ++i)
+- fscanf(fp, "%lf\n", &b[i]);
+- /*fscanf(fp, "%d%lf\n", &j, &b[i]);*/
+- /* readpair_(j, &b[i]);*/
+- fclose(fp);
+-}
+-
+-
+diff -ur SRC-bak/dscatter.c SRC/dscatter.c
+--- SRC-bak/dscatter.c 2015-09-04 11:35:38.000000000 -0700
++++ SRC/dscatter.c 2015-09-04 12:06:22.000000000 -0700
+@@ -302,57 +302,6 @@
+ *iukp += UB_DESCRIPTOR; /* Start fstnz of block U(k,j). */
+ }
+
+-typedef struct pair pair;
+-
+-int_t
+-get_min (int_t * sums, int_t nprocs)
+-{
+- int_t min_ind, min_val;
+- min_ind = 0;
+- min_val = 2147483647;
+- for (int i = 0; i < nprocs; i++)
+- {
+- if (sums[i] < min_val)
+- {
+- min_val = sums[i];
+- min_ind = i;
+- }
+- }
+-
+- return min_ind;
+-}
+-
+-int
+-compare_pair (const void *a, const void *b)
+-{
+- return (((pair *) a)->val - ((pair *) b)->val);
+-}
+-
+-int_t
+-static_partition (pair * work_load, int_t nwl, int_t * partition, int_t ldp,
+- int_t * sums, int_t * counts, int nprocs)
+-{
+- //initialization loop
+- for (int i = 0; i < nprocs; ++i)
+- {
+- counts[i] = 0;
+- sums[i] = 0;
+- }
+- qsort (work_load, nwl, sizeof (pair), compare_pair);
+- // for(int i=0;i<nwl;i++)
+- for (int i = nwl - 1; i >= 0; i--)
+- {
+- int_t ind = get_min (sums, nprocs);
+- // printf("ind %d\n",ind );
+- partition[ldp * ind + counts[ind]] = work_load[i].ind;
+- counts[ind]++;
+- sums[ind] += work_load[i].val;
+-
+- }
+-
+- return 0;
+-}
+-
+ /*Divide CPU-GPU dgemm work here*/
+ #ifdef PI_DEBUG
+ int Ngem = 2;
+diff -ur SRC-bak/pdgstrf.c SRC/pdgstrf.c
+--- SRC-bak/pdgstrf.c 2015-09-04 11:33:00.000000000 -0700
++++ SRC/pdgstrf.c 2015-09-04 12:06:20.000000000 -0700
+@@ -158,71 +158,59 @@
+ }
+ #endif
+
++/************************************************************************/
+
+-int get_thread_per_process()
+-{
+- char* ttemp;
+- ttemp = getenv("THREAD_PER_PROCESS");
+-
+- if(ttemp) return atoi(ttemp);
+- else return 1;
+-}
+-
+-int
+-get_mic_offload ()
++int_t
++get_min (int_t * sums, int_t nprocs)
+ {
+- char *ttemp;
+- ttemp = getenv ("SUPERLU_MIC_OFFLOAD");
++ int_t min_ind, min_val;
++ min_ind = 0;
++ min_val = 2147483647;
++ for (int i = 0; i < nprocs; i++)
++ {
++ if (sums[i] < min_val)
++ {
++ min_val = sums[i];
++ min_ind = i;
++ }
++ }
+
+- if (ttemp)
+- return atoi (ttemp);
+- else
+- return 0;
++ return min_ind;
+ }
+
+-int_t
+-get_max_buffer_size ()
+-{
+- char *ttemp;
+- ttemp = getenv ("MAX_BUFFER_SIZE");
+- if (ttemp)
+- return atoi (ttemp);
+- else
+- return 5000000;
+-}
++typedef struct pair pair;
+
+-int_t
+-get_cublas_nb ()
++int
++compare_pair (const void *a, const void *b)
+ {
+- char *ttemp;
+- ttemp = getenv ("CUBLAS_NB");
+- if (ttemp)
+- return atoi (ttemp);
+- else
+- return 64;
++ return (((pair *) a)->val - ((pair *) b)->val);
+ }
+
+ int_t
+-get_num_cuda_streams ()
++static_partition (pair * work_load, int_t nwl, int_t * partition, int_t ldp,
++ int_t * sums, int_t * counts, int nprocs)
+ {
+- char *ttemp;
+- ttemp = getenv ("NUM_CUDA_STREAMS");
+- if (ttemp)
+- return atoi (ttemp);
+- else
+- return 8;
+-}
++ //initialization loop
++ for (int i = 0; i < nprocs; ++i)
++ {
++ counts[i] = 0;
++ sums[i] = 0;
++ }
++ qsort (work_load, nwl, sizeof (pair), compare_pair);
++ // for(int i=0;i<nwl;i++)
++ for (int i = nwl - 1; i >= 0; i--)
++ {
++ int_t ind = get_min (sums, nprocs);
++ // printf("ind %d\n",ind );
++ partition[ldp * ind + counts[ind]] = work_load[i].ind;
++ counts[ind]++;
++ sums[ind] += work_load[i].val;
+
+-/*int omp_get_num_threads (void);
+- int omp_get_thread_num (void);*/
++ }
+
+-int AssignMic(int my_rank)
+-{
+- return (my_rank+1)%2;
++ return 0;
+ }
+
+-/************************************************************************/
+-
+ #include "dscatter.c"
+
+ /************************************************************************/
+diff -ur SRC-bak/zreadMM.c SRC/zreadMM.c
+--- SRC-bak/zreadMM.c 2015-09-04 11:29:44.000000000 -0700
++++ SRC/zreadMM.c 2015-09-04 11:29:48.000000000 -0700
+@@ -212,19 +212,3 @@
+
+ }
+
+-
+-void zreadrhs(int m, doublecomplex *b)
+-{
+- FILE *fp, *fopen();
+- int i;
+-
+- if ( !(fp = fopen("b.dat", "r")) ) {
+- fprintf(stderr, "zreadrhs: file does not exist\n");
+- exit(-1);
+- }
+- for (i = 0; i < m; ++i)
+- fscanf(fp, "%lf%lf\n", &b[i].r, &b[i].i);
+- fclose(fp);
+-}
+-
+-
+diff -ur SRC-bak/zscatter.c SRC/zscatter.c
+--- SRC-bak/zscatter.c 2015-09-04 11:52:48.000000000 -0700
++++ SRC/zscatter.c 2015-09-04 12:06:29.000000000 -0700
+@@ -302,57 +302,6 @@
+ *iukp += UB_DESCRIPTOR; /* Start fstnz of block U(k,j). */
+ }
+
+-typedef struct pair pair;
+-
+-int_t
+-get_min (int_t * sums, int_t nprocs)
+-{
+- int_t min_ind, min_val;
+- min_ind = 0;
+- min_val = 2147483647;
+- for (int i = 0; i < nprocs; i++)
+- {
+- if (sums[i] < min_val)
+- {
+- min_val = sums[i];
+- min_ind = i;
+- }
+- }
+-
+- return min_ind;
+-}
+-
+-int
+-compare_pair (const void *a, const void *b)
+-{
+- return (((pair *) a)->val - ((pair *) b)->val);
+-}
+-
+-int_t
+-static_partition (pair * work_load, int_t nwl, int_t * partition, int_t ldp,
+- int_t * sums, int_t * counts, int nprocs)
+-{
+- //initialization loop
+- for (int i = 0; i < nprocs; ++i)
+- {
+- counts[i] = 0;
+- sums[i] = 0;
+- }
+- qsort (work_load, nwl, sizeof (pair), compare_pair);
+- // for(int i=0;i<nwl;i++)
+- for (int i = nwl - 1; i >= 0; i--)
+- {
+- int_t ind = get_min (sums, nprocs);
+- // printf("ind %d\n",ind );
+- partition[ldp * ind + counts[ind]] = work_load[i].ind;
+- counts[ind]++;
+- sums[ind] += work_load[i].val;
+-
+- }
+-
+- return 0;
+-}
+-
+ /*Divide CPU-GPU dgemm work here*/
+ #ifdef PI_DEBUG
+ int Ngem = 2;
</ins></span></pre>
</div>
</div>
</body>
</html>