Subject | Hash | Author | Date (UTC) |
---|---|---|---|
Select int/float, sum/prod at run-time; add those+nstats to output. | 8f9d7d47e8b6516fad0716e6c756c027d4073c66 | Jason Riedy | 2006-02-23 19:01:13 |
Little cleanups | 97b622070c66a8aded98e4e02feb860021dfaa06 | Jason Riedy | 2005-04-25 21:56:10 |
Dumb bug fix: use all_pg and not pg after allreduce. | c9aada3d4ea3cd354a27df2c91cdb5e022a48dcd | Jason Riedy | 2005-04-25 21:36:49 |
"Optimized" seaborg build, plus it has MPI memory allocation | 010c31532fbdd08ebf50815f4223719e06cc0ea1 | Jason Riedy | 2005-04-25 20:53:30 |
Fix parallel mu_min computation. | 1839c8967c53b5e7311406a4c8e630975b15ca64 | Jason Riedy | 2005-04-25 20:49:10 |
More home makefile twiddles | d8237ea380793307781f78f155244fffbc6e1065 | Jason Riedy | 2005-04-25 19:12:57 |
Add relative gap termination criteria to parallel matchers. | 4df0541dc376888d74a22b5770871cb90c1c2f70 | Jason Riedy | 2005-04-25 18:44:20 |
Add Make.inc for home | 55087d06413e6a59d1c3b41294126cd56f6d46b7 | Jason Riedy | 2005-04-25 18:10:22 |
Add Make.seaborg | 66fe7a0f65ad57d1fffeeb8db2e614f38cf6cbc0 | Jason Riedy | 2005-04-25 18:10:06 |
Move Make.inc out of the way | a6aca26e1d6cfb15faa570d63890a20798df3444 | Jason Riedy | 2005-04-20 20:23:50 |
Fix price => scaling transformation | 1c223b72d65972e9b381e576b90934c40d555e27 | Jason Riedy | 2005-04-20 20:22:12 |
Bugs go poo | a136075289af1e672e28187cf41210a5ec27eccc | Jason Riedy | 2005-04-20 02:22:32 |
More data: primal, dual, duration | 2c59b3bdc4789035f919ce2132f2d20e33884329 | Jason Riedy | 2005-04-18 18:20:44 |
Removed mistaken Acopy | 8af95560220c3dd532eba9efa95b6993a0bedf97 | Jason Riedy | 2005-04-18 05:07:13 |
write new data from matchmtx. | 9bbe665ce58799a37beed4e6557f756bdf6e8a48 | Jason Riedy | 2005-04-18 05:05:14 |
Dumb bug fix. | 0acb519a5298ca2fd3256cc54e7e91a267990022 | Jason Riedy | 2005-04-13 04:21:01 |
quit when not square | b74d721df984ae9c60d4617921d6dc7813215022 | Jason Riedy | 2005-04-12 23:36:47 |
Go back to gcc. | 9d50e51da839a9dcf5193030c9fcdd49cdfa9854 | Jason Riedy | 2005-04-12 23:31:07 |
undo extra changes | 41f6e35374346b3ac19a8342a9c4ff75796ceee5 | Jason Riedy | 2005-04-12 23:21:08 |
fix auction_shift for explicit zeros | 10be6a173d391689574e9e88774e90dc1c7ac1d9 | Jason Riedy | 2005-04-12 23:20:38 |
File | Lines added | Lines deleted |
---|---|---|
matchmtx.c | 38 | 5 |
File matchmtx.c changed (mode: 100644) (index cb06aa6..4ab6e05) | |||
... | ... | main (int argc, char **argv) | |
98 | 98 | spcsr_lascale (&A, R, C); | spcsr_lascale (&A, R, C); |
99 | 99 | #endif | #endif |
100 | 100 | ||
101 | #if 1 | ||
102 | auction_toexpint (&A, expint); | ||
103 | #else | ||
104 | auction_toexp (&A, expint); | ||
105 | #endif | ||
101 | int enttype, diagtype; | ||
102 | #define ENT_INT 1 | ||
103 | #define ENT_FLOAT 2 | ||
104 | #define DIAG_PROD 1 | ||
105 | #define DIAG_SUM 2 | ||
106 | |||
107 | if (getenv("USE_SUM")) { | ||
108 | diagtype = DIAG_SUM; | ||
109 | if (getenv("USE_FLOAT")) { | ||
110 | auction_toabs (&A, expint); | ||
111 | enttype = ENT_FLOAT; | ||
112 | } else { | ||
113 | auction_toabsint (&A, expint); | ||
114 | enttype = ENT_INT; | ||
115 | } | ||
116 | } else { | ||
117 | diagtype = DIAG_PROD; | ||
118 | if (getenv("USE_FLOAT")) { | ||
119 | auction_toexp (&A, expint); | ||
120 | enttype = ENT_FLOAT; | ||
121 | } else { | ||
122 | auction_toexpint (&A, expint); | ||
123 | enttype = ENT_INT; | ||
124 | } | ||
125 | } | ||
126 | |||
106 | 127 | shiftamount = auction_shift (&A, expint); | shiftamount = auction_shift (&A, expint); |
107 | 128 | ||
108 | 129 | { | { |
... | ... | main (int argc, char **argv) | |
135 | 156 | printf ("Primal: %20g\nDual: %20g\nTime: %20g\nmu_min: %20g\n", | printf ("Primal: %20g\nDual: %20g\nTime: %20g\nmu_min: %20g\n", |
136 | 157 | auction_primal, d, td, mu_min); | auction_primal, d, td, mu_min); |
137 | 158 | ||
159 | { | ||
160 | extern int a_nstats; | ||
161 | printf("nstats: %d\n", a_nstats); | ||
162 | } | ||
163 | |||
138 | 164 | { | { |
139 | 165 | int i, j; | int i, j; |
140 | 166 | for (j = 0; j < A.nc; ++j) { | for (j = 0; j < A.nc; ++j) { |
... | ... | main (int argc, char **argv) | |
169 | 195 | fwrite (&auction_primal, sizeof(double), 1, fout); | fwrite (&auction_primal, sizeof(double), 1, fout); |
170 | 196 | fwrite (&d, sizeof(double), 1, fout); | fwrite (&d, sizeof(double), 1, fout); |
171 | 197 | fwrite (&td, sizeof(double), 1, fout); | fwrite (&td, sizeof(double), 1, fout); |
198 | { | ||
199 | extern int a_nstats; | ||
200 | fwrite (&a_nstats, sizeof(int), 1, fout); | ||
201 | } | ||
202 | |||
203 | fwrite (&enttype, sizeof(int), 1, fout); | ||
204 | fwrite (&diagtype, sizeof(int), 1, fout); | ||
172 | 205 | ||
173 | 206 | fwrite (match, sizeof(int), A.nc, fout); | fwrite (match, sizeof(int), A.nc, fout); |
174 | 207 |