1 |
jlec 10/11/01 14:52:26 |
2 |
|
3 |
Added: 1.4-multilib.patch 1.4-overflow.patch |
4 |
1.4-superlu.patch |
5 |
Log: |
6 |
New addition |
7 |
|
8 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sci-libs/mc/files/1.4-multilib.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/files/1.4-multilib.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/files/1.4-multilib.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: 1.4-multilib.patch |
17 |
=================================================================== |
18 |
diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am |
19 |
index d5b8d47..132824b 100644 |
20 |
--- a/src/aaa_lib/Makefile.am |
21 |
+++ b/src/aaa_lib/Makefile.am |
22 |
@@ -47,10 +47,9 @@ NAM_LIBS = ../nam/libnam.la |
23 |
DYN_LIBS = ../dyn/libdyn.la |
24 |
PDE_LIBS = ../pde/libpde.la |
25 |
|
26 |
-libdir = ${prefix}/lib |
27 |
lib_LTLIBRARIES = libmc.la |
28 |
|
29 |
libmc_la_SOURCES = |
30 |
-libmc_la_LIBADD = ${BASE_LIBS} ${BAM_LIBS} ${WHB_LIBS} ${APRX_LIBS} ${GEM_LIBS} ${MCSH_LIBS} ${NAM_LIBS} ${DYN_LIBS} ${PDE_LIBS} |
31 |
+libmc_la_LIBADD = ${BASE_LIBS} ${BAM_LIBS} ${WHB_LIBS} ${APRX_LIBS} ${GEM_LIBS} ${MCSH_LIBS} ${NAM_LIBS} ${DYN_LIBS} ${PDE_LIBS} -lmaloc -lpunc -lumfpack -lamd -lsuperlu |
32 |
libmc_la_LDFLAGS = -version-info ${FETK_VERSION} |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.1 sci-libs/mc/files/1.4-overflow.patch |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/files/1.4-overflow.patch?rev=1.1&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/files/1.4-overflow.patch?rev=1.1&content-type=text/plain |
41 |
|
42 |
Index: 1.4-overflow.patch |
43 |
=================================================================== |
44 |
diff --git a/src/gem/gemdisp.c b/src/gem/gemdisp.c |
45 |
index 01f277f..96d5851 100644 |
46 |
--- a/src/gem/gemdisp.c |
47 |
+++ b/src/gem/gemdisp.c |
48 |
@@ -1631,7 +1631,7 @@ VPUBLIC void Gem_writeDX(Gem *thee, Vio *sock, |
49 |
VPUBLIC void Gem_writeTEC(Gem *thee, Vio *sock, |
50 |
int fldKey, double *defX[MAXV]) |
51 |
{ |
52 |
- char str1[10], str2[10]; |
53 |
+ char str1[16], str2[16]; |
54 |
int i, j, vec, dim, dimII, dimVV, numVV, numSS; |
55 |
VV *vx; |
56 |
SS *sm; |
57 |
|
58 |
|
59 |
|
60 |
1.1 sci-libs/mc/files/1.4-superlu.patch |
61 |
|
62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/files/1.4-superlu.patch?rev=1.1&view=markup |
63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mc/files/1.4-superlu.patch?rev=1.1&content-type=text/plain |
64 |
|
65 |
Index: 1.4-superlu.patch |
66 |
=================================================================== |
67 |
diff --git a/src/bam/zslu.c b/src/bam/zslu.c |
68 |
index 973b911..d82c7fd 100644 |
69 |
--- a/src/bam/zslu.c |
70 |
+++ b/src/bam/zslu.c |
71 |
@@ -401,6 +401,7 @@ VPUBLIC int Zslu_factor(Zslu *thee) |
72 |
SCformat *Lstore; |
73 |
SuperMatrix *BB; |
74 |
superlu_options_t *oopts; |
75 |
+ SuperLUStat_t stat; |
76 |
|
77 |
VASSERT( thee != VNULL ); |
78 |
|
79 |
@@ -444,7 +445,7 @@ VPUBLIC int Zslu_factor(Zslu *thee) |
80 |
Lstore->nnz + Ustore->nnz - thee->n); |
81 |
printf("L\\U MB %.3f\ttotal MB needed %.3f\texpansions %d\n", |
82 |
mem_usage.for_lu/1e6, mem_usage.total_needed/1e6, |
83 |
- mem_usage.expansions); |
84 |
+ stat.expansions); |
85 |
fflush(stdout); |
86 |
|
87 |
} else if ( info > 0 && thee->lwork == -1 ) { |