diff -urN spooles-2.2.orig/A2/A2.h spooles-2.2-June_2006/A2/A2.h --- spooles-2.2.orig/A2/A2.h Wed Dec 16 18:59:28 1998 +++ spooles-2.2-June_2006/A2/A2.h Tue Jun 13 21:00:13 2006 @@ -469,7 +469,7 @@ permute the rows of the matrix A(*,*) = A(index(*),*) this method calls A2_sortRowsUp - but does not overwrite the index[] vector + but does not overwrite the index_[] vector created -- 98apr15, cca ----------------------------------------- @@ -478,14 +478,14 @@ A2_permuteRows ( A2 *mtx, int nrow, - int index[] + int index_[] ) ; /* ----------------------------------------- permute the columns of the matrix A(*,*) = A(*,index(*)) this method calls A2_sortColumnsUp - but does not overwrite the index[] vector + but does not overwrite the index_[] vector created -- 98apr15, cca ----------------------------------------- @@ -494,7 +494,7 @@ A2_permuteColumns ( A2 *mtx, int ncol, - int index[] + int index_[] ) ; /* ---------------------------------------------- diff -urN spooles-2.2.orig/Eigen/Bridge.h spooles-2.2-June_2006/Eigen/Bridge.h --- spooles-2.2.orig/Eigen/Bridge.h Thu Dec 17 20:17:36 1998 +++ spooles-2.2-June_2006/Eigen/Bridge.h Tue Jun 13 20:42:57 2006 @@ -148,7 +148,7 @@ output parameters *pinertia -- on return contains the number of negative eigenvalues - *perror -- on return contains an error code + *perror_ -- on return contains an error code 1 -- error found during factorization 0 -- normal return -1 -- psigma is NULL @@ -165,7 +165,7 @@ double *ppvttol, void *data, int *pinertia, - int *perror + int *perror_ ) ; /* ------------------------------------------------------------- @@ -204,7 +204,7 @@ note: rhs[] and sol[] can be the same array. - on return, *perror holds an error code. + on return, *perror_ holds an error code. 1 -- normal return -1 -- pnrows is NULL -2 -- pncols is NULL @@ -222,7 +222,7 @@ double rhs[], double sol[], void *data, - int *perror + int *perror_ ) ; /* -------------------------------------------- diff -urN spooles-2.2.orig/Eigen/BridgeMPI.h spooles-2.2-June_2006/Eigen/BridgeMPI.h --- spooles-2.2.orig/Eigen/BridgeMPI.h Sat Dec 19 19:49:44 1998 +++ spooles-2.2-June_2006/Eigen/BridgeMPI.h Tue Jun 13 20:42:57 2006 @@ -167,7 +167,7 @@ output parameters *pinertia -- on return contains the number of negative eigenvalues - *perror -- on return contains an error code + *perror_ -- on return contains an error code 1 -- error found during factorization 0 -- normal return -1 -- psigma is NULL @@ -184,7 +184,7 @@ double *ppvttol, void *data, int *pinertia, - int *perror + int *perror_ ) ; /* ------------------------------------------------------------- @@ -223,7 +223,7 @@ note: rhs[] and sol[] can be the same array. - on return, *perror holds an error code. + on return, *perror_ holds an error code. created -- 98aug10, cca & jcp ---------------------------------------------- @@ -235,7 +235,7 @@ double rhs[], double sol[], void *data, - int *perror + int *perror_ ) ; /* -------------------------------------------- diff -urN spooles-2.2.orig/Eigen/BridgeMT.h spooles-2.2-June_2006/Eigen/BridgeMT.h --- spooles-2.2.orig/Eigen/BridgeMT.h Thu Dec 17 20:26:31 1998 +++ spooles-2.2-June_2006/Eigen/BridgeMT.h Tue Jun 13 20:42:56 2006 @@ -154,7 +154,7 @@ output parameters *pinertia -- on return contains the number of negative eigenvalues - *perror -- on return contains an error code + *perror_ -- on return contains an error code 1 -- error found during factorization 0 -- normal return -1 -- psigma is NULL @@ -171,7 +171,7 @@ double *ppvttol, void *data, int *pinertia, - int *perror + int *perror_ ) ; /* ------------------------------------------------------------- @@ -210,7 +210,7 @@ note: rhs[] and sol[] can be the same array. - on return, *perror holds an error code. + on return, *perror_ holds an error code. 1 -- normal return -1 -- pnrows is NULL -2 -- pncols is NULL @@ -228,7 +228,7 @@ double rhs[], double sol[], void *data, - int *perror + int *perror_ ) ; /* -------------------------------------------- diff -urN spooles-2.2.orig/FrontMtx/FrontMtx.h spooles-2.2-June_2006/FrontMtx/FrontMtx.h --- spooles-2.2.orig/FrontMtx/FrontMtx.h Fri Oct 2 18:49:30 1998 +++ spooles-2.2-June_2006/FrontMtx/FrontMtx.h Tue Jun 13 20:42:56 2006 @@ -525,9 +525,9 @@ used only when pivoting enabled droptol -- lower bound on entries in L and U, used only when sparsity enabled - perror -- error flag, on return - *perror >= 0 --> factorization failed at front *perror - *perror < 0 --> factorization succeeded + perror_ -- error flag, on return + *perror_ >= 0 --> factorization failed at front *perror_ + *perror_ < 0 --> factorization succeeded cpus[] -- timing array cpus[0] -- initialize fronts cpus[1] -- load original entries @@ -550,7 +550,7 @@ created -- 98mar27, cca modified -- 98mar27, cca - perror added to argument list + perror_ added to argument list ------------------------------------------------------------------- */ Chv * @@ -560,7 +560,7 @@ double tau, double droptol, ChvManager *chvmanager, - int *perror, + int *perror_, double cpus[], int stats[], int msglvl, @@ -580,9 +580,9 @@ used only when pivoting enabled droptol -- lower bound on entries in L and U, used only when sparsity enabled - perror -- error flag, on return - *perror >= 0 --> factorization failed at front *perror - *perror < 0 --> factorization succeeded + perror_ -- error flag, on return + *perror_ >= 0 --> factorization failed at front *perror_ + *perror_ < 0 --> factorization succeeded cpus[] -- timing array cpus[0] -- initialize fronts cpus[1] -- load original entries @@ -605,7 +605,7 @@ created -- 98mar27, cca modified -- 98mar27, cca - perror added to argument list + perror_ added to argument list ------------------------------------------------------------------- */ Chv * @@ -615,7 +615,7 @@ double tau, double droptol, ChvManager *chvmanager, - int *perror, + int *perror_, double cpus[], int stats[], int msglvl, diff -urN spooles-2.2.orig/I2Ohash/src/util.c spooles-2.2-June_2006/I2Ohash/src/util.c --- spooles-2.2.orig/I2Ohash/src/util.c Sun May 31 00:45:12 1998 +++ spooles-2.2-June_2006/I2Ohash/src/util.c Tue Jun 13 21:10:48 2006 @@ -39,7 +39,7 @@ */ loc1 = (key1 + 1) % hashtable->nlist ; loc2 = (key2 + 1) % hashtable->nlist ; -loc = (loc1*loc2) % hashtable->nlist ; +loc = (int)(((long long)loc1*loc2) % hashtable->nlist) ; #if MYDEBUG > 0 fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; fflush(stdout) ; @@ -158,7 +158,7 @@ #endif loc1 = (key1 + 1) % hashtable->nlist ; loc2 = (key2 + 1) % hashtable->nlist ; -loc = (loc1*loc2) % hashtable->nlist ; +loc = (int)(((long long)loc1*loc2) % hashtable->nlist) ; #if MYDEBUG > 0 fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; fflush(stdout) ; @@ -229,7 +229,7 @@ } loc1 = (key1 + 1) % hashtable->nlist ; loc2 = (key2 + 1) % hashtable->nlist ; -loc = (loc1*loc2) % hashtable->nlist ; +loc = (int)(((long long)loc1*loc2) % hashtable->nlist) ; /* --------------------------------------------------- find the location of the first (key1,key2,*) triple diff -urN spooles-2.2.orig/LinSol/Bridge.h spooles-2.2-June_2006/LinSol/Bridge.h --- spooles-2.2.orig/LinSol/Bridge.h Wed Nov 4 16:21:29 1998 +++ spooles-2.2-June_2006/LinSol/Bridge.h Tue Jun 13 20:42:57 2006 @@ -510,7 +510,7 @@ 0 -- factorization did not complete, see error flag -1 -- bridge is NULL -2 -- mtxA is NULL - -3 -- perror is NULL + -3 -- perror_ is NULL created -- 98sep18, cca -------------------------------------------------------------- @@ -520,7 +520,7 @@ Bridge *bridge, InpMtx *mtxA, int permuteflag, - int *perror + int *perror_ ) ; /*--------------------------------------------------------------------*/ /* diff -urN spooles-2.2.orig/LinSol/BridgeMPI.h spooles-2.2-June_2006/LinSol/BridgeMPI.h --- spooles-2.2.orig/LinSol/BridgeMPI.h Wed Nov 4 22:06:06 1998 +++ spooles-2.2-June_2006/LinSol/BridgeMPI.h Tue Jun 13 20:42:58 2006 @@ -798,7 +798,7 @@ 1 -- normal return, factorization complete 0 -- factorization did not complete, see error flag -1 -- bridge is NULL - -2 -- perror is NULL + -2 -- perror_ is NULL created -- 98sep18, cca -------------------------------------------------------------- @@ -808,7 +808,7 @@ BridgeMPI *bridge, InpMtx *mtxA, int permuteflag, - int *perror + int *perror_ ) ; /*--------------------------------------------------------------------*/ /* diff -urN spooles-2.2.orig/LinSol/BridgeMT.h spooles-2.2-June_2006/LinSol/BridgeMT.h --- spooles-2.2.orig/LinSol/BridgeMT.h Wed Nov 4 16:25:14 1998 +++ spooles-2.2-June_2006/LinSol/BridgeMT.h Tue Jun 13 20:42:57 2006 @@ -638,7 +638,7 @@ 0 -- factorization did not complete, see error flag -1 -- bridge is NULL -2 -- mtxA is NULL - -3 -- perror is NULL + -3 -- perror_ is NULL created -- 98sep18, cca -------------------------------------------------------------- @@ -648,7 +648,7 @@ BridgeMT *bridge, InpMtx *mtxA, int permuteflag, - int *perror + int *perror_ ) ; /*--------------------------------------------------------------------*/ /* diff -urN spooles-2.2.orig/Lock/Lock.h spooles-2.2-June_2006/Lock/Lock.h --- spooles-2.2.orig/Lock/Lock.h Sun May 31 00:45:11 1998 +++ spooles-2.2-June_2006/Lock/Lock.h Tue Jun 13 20:40:50 2006 @@ -6,7 +6,7 @@ #define TT_SOLARIS 1 #define TT_POSIX 2 -#define THREAD_TYPE TT_POSIX +#define THREAD_TYPE 0 #if THREAD_TYPE == TT_SOLARIS #include diff -urN spooles-2.2.orig/MPI/spoolesMPI.h spooles-2.2-June_2006/MPI/spoolesMPI.h --- spooles-2.2.orig/MPI/spoolesMPI.h Sun Sep 27 19:06:15 1998 +++ spooles-2.2-June_2006/MPI/spoolesMPI.h Tue Jun 13 20:42:58 2006 @@ -629,7 +629,7 @@ ChvManager *chvmanager, IV *frontOwnersIV, int lookahead, - int *perror, + int *perror_, double cpus[], int stats[], int msglvl, @@ -700,7 +700,7 @@ ChvManager *chvmanager, IV *frontOwnersIV, int lookahead, - int *perror, + int *perror_, double cpus[], int stats[], int msglvl, diff -urN spooles-2.2.orig/MPI/src/utilities.c spooles-2.2-June_2006/MPI/src/utilities.c --- spooles-2.2.orig/MPI/src/utilities.c Sun Jul 26 23:26:48 1998 +++ spooles-2.2-June_2006/MPI/src/utilities.c Tue Jun 13 20:20:48 2006 @@ -17,7 +17,7 @@ int *iptr, flag, rc, tag_bound ; iptr = &tag_bound ; -rc = MPI_Attr_get(comm, MPI_TAG_UB, (void **) &iptr, &flag) ; +rc = MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (void **) &iptr, &flag) ; if ( flag == 0 ) { tag_bound = -1 ; } else { diff -urN spooles-2.2.orig/MT/spoolesMT.h spooles-2.2-June_2006/MT/spoolesMT.h --- spooles-2.2.orig/MT/spoolesMT.h Thu Aug 27 22:15:20 1998 +++ spooles-2.2-June_2006/MT/spoolesMT.h Tue Jun 13 20:42:58 2006 @@ -33,7 +33,7 @@ ChvManager *chvmanager, IV *ownersIV, int lookahead, - int *perror, + int *perror_, double cpus[], int stats[], int msglvl, @@ -68,7 +68,7 @@ ChvManager *chvmanager, IV *ownersIV, int lookahead, - int *perror, + int *perror_, double cpus[], int stats[], int msglvl, diff -urN spooles-2.2.orig/SubMtx/SubMtx.h spooles-2.2-June_2006/SubMtx/SubMtx.h --- spooles-2.2.orig/SubMtx/SubMtx.h Sat Oct 17 19:23:17 1998 +++ spooles-2.2-June_2006/SubMtx/SubMtx.h Tue Jun 13 20:55:48 2006 @@ -680,7 +680,7 @@ void SubMtx_scale1vec ( SubMtx *mtxA, - double y0[], + double y0_[], double x0[] ) ; /* @@ -693,8 +693,8 @@ void SubMtx_scale2vec ( SubMtx *mtxA, - double y0[], - double y1[], + double y0_[], + double y1_[], double x0[], double x1[] ) ; @@ -708,8 +708,8 @@ void SubMtx_scale3vec ( SubMtx *mtxA, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double x0[], double x1[], diff -urN spooles-2.2.orig/Utilities/CV.h spooles-2.2-June_2006/Utilities/CV.h --- spooles-2.2.orig/Utilities/CV.h Sun May 31 00:45:00 1998 +++ spooles-2.2-June_2006/Utilities/CV.h Tue Jun 13 20:55:46 2006 @@ -153,8 +153,8 @@ void ZVdotU33 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double x0[], double x1[], @@ -173,8 +173,8 @@ void ZVdotU32 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double x0[], double x1[], @@ -192,8 +192,8 @@ void ZVdotU31 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double x0[], double sums[] @@ -210,8 +210,8 @@ void ZVdotU23 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double x0[], double x1[], double x2[], @@ -229,8 +229,8 @@ void ZVdotU22 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double x0[], double x1[], double sums[] @@ -247,8 +247,8 @@ void ZVdotU21 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double x0[], double sums[] ) ; @@ -264,7 +264,7 @@ void ZVdotU13 ( int n, - double y0[], + double y0_[], double x0[], double x1[], double x2[], @@ -282,7 +282,7 @@ void ZVdotU12 ( int n, - double y0[], + double y0_[], double x0[], double x1[], double sums[] @@ -299,7 +299,7 @@ void ZVdotU11 ( int n, - double y0[], + double y0_[], double x0[], double sums[] ) ; @@ -315,8 +315,8 @@ void ZVdotC33 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double x0[], double x1[], @@ -335,8 +335,8 @@ void ZVdotC32 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double x0[], double x1[], @@ -354,8 +354,8 @@ void ZVdotC31 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double x0[], double sums[] @@ -372,8 +372,8 @@ void ZVdotC23 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double x0[], double x1[], double x2[], @@ -391,8 +391,8 @@ void ZVdotC22 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double x0[], double x1[], double sums[] @@ -409,8 +409,8 @@ void ZVdotC21 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double x0[], double sums[] ) ; @@ -426,7 +426,7 @@ void ZVdotC13 ( int n, - double y0[], + double y0_[], double x0[], double x1[], double x2[], @@ -444,7 +444,7 @@ void ZVdotC12 ( int n, - double y0[], + double y0_[], double x0[], double x1[], double sums[] @@ -461,7 +461,7 @@ void ZVdotC11 ( int n, - double y0[], + double y0_[], double x0[], double sums[] ) ; diff -urN spooles-2.2.orig/Utilities/DV.h spooles-2.2-June_2006/Utilities/DV.h --- spooles-2.2.orig/Utilities/DV.h Sun May 31 00:45:00 1998 +++ spooles-2.2-June_2006/Utilities/DV.h Tue Jun 13 21:00:12 2006 @@ -32,7 +32,7 @@ /*--------------------------------------------------------------------*/ /* --------------------------------------------------------------- - purpose -- to compute y[index[*]] := y[index[*]] + alpha * x[*] + purpose -- to compute y[index_[*]] := y[index_[*]] + alpha * x[*] created -- 95sep22, cca --------------------------------------------------------------- @@ -41,7 +41,7 @@ DVaxpyi ( int size, double y[], - int index[], + int index_[], double alpha, double x[] ) ; @@ -62,9 +62,9 @@ /*--------------------------------------------------------------------*/ /* ------------------------------------------------------- - purpose -- given the pair of arrays (x1[],y1[]), + purpose -- given the pair of arrays (x1[],y1_[]), create a pair of arrays (x2[],y2[]) whose - entries are pairwise chosen from (x1[],y1[]) + entries are pairwise chosen from (x1[],y1_[]) and whose distribution is an approximation. return value -- the size of the (x2[],y2[]) arrays @@ -76,7 +76,7 @@ DVcompress ( int size1, double x1[], - double y1[], + double y1_[], int size2, double x2[], double y2[] @@ -100,7 +100,7 @@ ------------------------------------------- purpose -- to perform a indexed dot product - sum = sum_k y[index[k]]*x[k] + sum = sum_k y[index_[k]]*x[k] where y and x are real @@ -111,7 +111,7 @@ DVdoti ( int size, double y[], - int index[], + int index_[], double x[] ) ; /*--------------------------------------------------------------------*/ @@ -173,7 +173,7 @@ /*--------------------------------------------------------------------*/ /* --------------------------------------- - purpose -- to gather y[*] = x[index[*]] + purpose -- to gather y[*] = x[index_[*]] created -- 95sep22, cca --------------------------------------- @@ -183,12 +183,12 @@ int size, double y[], double x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------------------- - purpose -- to gather add y[*] += x[index[*]] and zero x[index[*]] + purpose -- to gather add y[*] += x[index_[*]] and zero x[index_[*]] created -- 95sep22, cca ----------------------------------------------------------------- @@ -198,12 +198,12 @@ int size, double y[], double x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------- - purpose -- to gather y[*] = x[index[*]] and zero x[*] + purpose -- to gather y[*] = x[index_[*]] and zero x[*] created -- 95sep22, cca ----------------------------------------------------- @@ -213,7 +213,7 @@ int size, double y[], double x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -249,7 +249,7 @@ /* ------------------------------ purpose -- to permute a vector - y[index[*]] := y[*] + y[index_[*]] := y[*] created -- 95sep22, cca ------------------------------ @@ -258,7 +258,7 @@ DVinvPerm ( int size, double y[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -324,7 +324,7 @@ /* ------------------------------ purpose -- to permute a vector - y[*] := y[index[*]] + y[*] := y[index_[*]] created -- 95sep22, cca ------------------------------ @@ -333,7 +333,7 @@ DVperm ( int size, double y[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -381,7 +381,7 @@ /*--------------------------------------------------------------------*/ /* ---------------------------------------- - purpose -- to scatter y[index[*]] = x[*] + purpose -- to scatter y[index_[*]] = x[*] created -- 95sep22, cca ---------------------------------------- @@ -390,13 +390,13 @@ DVscatter ( int size, double y[], - int index[], + int index_[], double x[] ) ; /*--------------------------------------------------------------------*/ /* --------------------------------------------- - purpose -- to scatter add y[index[*]] += x[*] + purpose -- to scatter add y[index_[*]] += x[*] created -- 96aug17, cca --------------------------------------------- @@ -405,13 +405,13 @@ DVscatterAdd ( int size, double y[], - int index[], + int index_[], double x[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------------- - purpose -- to scatter add y[index[*]] += x[*] and zero x[*] + purpose -- to scatter add y[index_[*]] += x[*] and zero x[*] created -- 95sep22, cca ----------------------------------------------------------- @@ -420,13 +420,13 @@ DVscatterAddZero ( int size, double y[], - int index[], + int index_[], double x[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------- - purpose -- to scatter y[index[*]] = x[*] and zero x[*] + purpose -- to scatter y[index_[*]] = x[*] and zero x[*] created -- 95sep22, cca ----------------------------------------------------- @@ -435,7 +435,7 @@ DVscatterZero ( int size, double y[], - int index[], + int index_[], double x[] ) ; /*--------------------------------------------------------------------*/ diff -urN spooles-2.2.orig/Utilities/FV.h spooles-2.2-June_2006/Utilities/FV.h --- spooles-2.2.orig/Utilities/FV.h Sun May 31 00:45:00 1998 +++ spooles-2.2-June_2006/Utilities/FV.h Tue Jun 13 21:00:12 2006 @@ -32,7 +32,7 @@ /*--------------------------------------------------------------------*/ /* --------------------------------------------------------------- - purpose -- to compute y[index[*]] := y[index[*]] + alpha * x[*] + purpose -- to compute y[index_[*]] := y[index_[*]] + alpha * x[*] created -- 95sep22, cca --------------------------------------------------------------- @@ -41,7 +41,7 @@ FVaxpyi ( int size, float y[], - int index[], + int index_[], float alpha, float x[] ) ; @@ -62,9 +62,9 @@ /*--------------------------------------------------------------------*/ /* ------------------------------------------------------- - purpose -- given the pair of arrays (x1[],y1[]), + purpose -- given the pair of arrays (x1[],y1_[]), create a pair of arrays (x2[],y2[]) whose - entries are pairwise chosen from (x1[],y1[]) + entries are pairwise chosen from (x1[],y1_[]) and whose distribution is an approximation. return value -- the size of the (x2[],y2[]) arrays @@ -76,7 +76,7 @@ FVcompress ( int size1, float x1[], - float y1[], + float y1_[], int size2, float x2[], float y2[] @@ -154,7 +154,7 @@ /*--------------------------------------------------------------------*/ /* --------------------------------------- - purpose -- to gather y[*] = x[index[*]] + purpose -- to gather y[*] = x[index_[*]] created -- 95sep22, cca --------------------------------------- @@ -164,12 +164,12 @@ int size, float y[], float x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------------------- - purpose -- to gather add y[*] += x[index[*]] and zero x[index[*]] + purpose -- to gather add y[*] += x[index_[*]] and zero x[index_[*]] created -- 95sep22, cca ----------------------------------------------------------------- @@ -179,12 +179,12 @@ int size, float y[], float x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------- - purpose -- to gather y[*] = x[index[*]] and zero x[*] + purpose -- to gather y[*] = x[index_[*]] and zero x[*] created -- 95sep22, cca ----------------------------------------------------- @@ -194,7 +194,7 @@ int size, float y[], float x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -230,7 +230,7 @@ /* ------------------------------ purpose -- to permute a vector - y[index[*]] := y[*] + y[index_[*]] := y[*] created -- 95sep22, cca ------------------------------ @@ -239,7 +239,7 @@ FVinvPerm ( int size, float y[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -305,7 +305,7 @@ /* ------------------------------ purpose -- to permute a vector - y[*] := y[index[*]] + y[*] := y[index_[*]] created -- 95sep22, cca ------------------------------ @@ -314,7 +314,7 @@ FVperm ( int size, float y[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -362,7 +362,7 @@ /*--------------------------------------------------------------------*/ /* ---------------------------------------- - purpose -- to scatter y[index[*]] = x[*] + purpose -- to scatter y[index_[*]] = x[*] created -- 95sep22, cca ---------------------------------------- @@ -371,13 +371,13 @@ FVscatter ( int size, float y[], - int index[], + int index_[], float x[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------------- - purpose -- to scatter add y[index[*]] += x[*] and zero x[*] + purpose -- to scatter add y[index_[*]] += x[*] and zero x[*] created -- 95sep22, cca ----------------------------------------------------------- @@ -386,13 +386,13 @@ FVscatterAddZero ( int size, float y[], - int index[], + int index_[], float x[] ) ; /*--------------------------------------------------------------------*/ /* ----------------------------------------------------- - purpose -- to scatter y[index[*]] = x[*] and zero x[*] + purpose -- to scatter y[index_[*]] = x[*] and zero x[*] created -- 95sep22, cca ----------------------------------------------------- @@ -401,7 +401,7 @@ FVscatterZero ( int size, float y[], - int index[], + int index_[], float x[] ) ; /*--------------------------------------------------------------------*/ diff -urN spooles-2.2.orig/Utilities/IV.h spooles-2.2-June_2006/Utilities/IV.h --- spooles-2.2.orig/Utilities/IV.h Sun May 31 00:45:00 1998 +++ spooles-2.2-June_2006/Utilities/IV.h Tue Jun 13 21:00:10 2006 @@ -3,9 +3,9 @@ /*--------------------------------------------------------------------*/ /* ------------------------------------------------------- - purpose -- given the pair of arrays (x1[],y1[]), + purpose -- given the pair of arrays (x1[],y1_[]), create a pair of arrays (x2[],y2[]) whose - entries are pairwise chosen from (x1[],y1[]) + entries are pairwise chosen from (x1[],y1_[]) and whose distribution is an approximation. return value -- the size of the (x2[],y2[]) arrays @@ -15,7 +15,7 @@ IVcompress ( int size1, int x1[], - int y1[], + int y1_[], int size2, int x2[], int y2[] @@ -112,7 +112,7 @@ /*--------------------------------------------------------------------*/ /* --------------------------------------- - purpose -- to gather y[*] = x[index[*]] + purpose -- to gather y[*] = x[index_[*]] --------------------------------------- */ void @@ -120,7 +120,7 @@ int size, int y[], int x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -170,14 +170,14 @@ /* ------------------------------ purpose -- to permute a vector - y[index[*]] := y[*] + y[index_[*]] := y[*] ------------------------------ */ void IVinvPerm ( int size, int y[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -241,14 +241,14 @@ /* ------------------------------ purpose -- to permute a vector - y[*] := y[index[*]] + y[*] := y[index_[*]] ------------------------------ */ void IVperm ( int size, int y[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* @@ -266,14 +266,14 @@ /*--------------------------------------------------------------------*/ /* ---------------------------------------- - purpose -- to scatter y[index[*]] = x[*] + purpose -- to scatter y[index_[*]] = x[*] ---------------------------------------- */ void IVscatter ( int size, int y[], - int index[], + int index_[], int x[] ) ; /*--------------------------------------------------------------------*/ diff -urN spooles-2.2.orig/Utilities/ZV.h spooles-2.2-June_2006/Utilities/ZV.h --- spooles-2.2.orig/Utilities/ZV.h Sun May 31 00:45:01 1998 +++ spooles-2.2-June_2006/Utilities/ZV.h Tue Jun 13 21:00:12 2006 @@ -127,7 +127,7 @@ --------------------------------------------------- purpose -- to perform a indexed complex dot product - (*prdot,*pidot) = sum_k y[index[k]]*x[k] + (*prdot,*pidot) = sum_k y[index_[k]]*x[k] where y and x are complex @@ -138,7 +138,7 @@ ZVdotiU ( int size, double y[], - int index[], + int index_[], double x[], double *prdot, double *pidot @@ -147,7 +147,7 @@ ------------------------------------------------------------- purpose -- to perform a indexed conjugate complex dot product - (*prdot,*pidot) = sum_k conjugate(y[index[k]])*x[k] + (*prdot,*pidot) = sum_k conjugate(y[index_[k]])*x[k] where y and x are complex @@ -158,7 +158,7 @@ ZVdotiC ( int size, double y[], - int index[], + int index_[], double x[], double *prdot, double *pidot @@ -233,8 +233,8 @@ void ZVscale2 ( int size, - double y0[], - double y1[], + double y0_[], + double y1_[], double d00r, double d00i, double d01r, @@ -314,7 +314,7 @@ /*--------------------------------------------------------------------*/ /* --------------------------------------- - purpose -- to gather y[*] = x[index[*]] + purpose -- to gather y[*] = x[index_[*]] created -- 98apr15, cca --------------------------------------- @@ -324,12 +324,12 @@ int size, double y[], double x[], - int index[] + int index_[] ) ; /*--------------------------------------------------------------------*/ /* ---------------------------------------- - purpose -- to scatter y[index[*]] = x[*] + purpose -- to scatter y[index_[*]] = x[*] created -- 98apr15, cca ---------------------------------------- @@ -338,7 +338,7 @@ ZVscatter ( int size, double y[], - int index[], + int index_[], double x[] ) ; /* diff -urN spooles-2.2.orig/Utilities/axpy.h spooles-2.2-June_2006/Utilities/axpy.h --- spooles-2.2.orig/Utilities/axpy.h Thu Dec 10 23:28:59 1998 +++ spooles-2.2-June_2006/Utilities/axpy.h Tue Jun 13 20:55:47 2006 @@ -2,8 +2,8 @@ /* ----------------------------------------------------------------- - y0[] = y0[] + alpha[0] * x0[] + alpha[1] * x1[] + alpha[2] * x2[] - y1[] = y1[] + alpha[3] * x0[] + alpha[4] * x1[] + alpha[5] * x2[] + y0_[] = y0_[] + alpha[0] * x0[] + alpha[1] * x1[] + alpha[2] * x2[] + y1_[] = y1_[] + alpha[3] * x0[] + alpha[4] * x1[] + alpha[5] * x2[] y2[] = y2[] + alpha[6] * x0[] + alpha[7] * x1[] + alpha[8] * x2[] created -- 98dec10, cca @@ -12,8 +12,8 @@ void DVaxpy33 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double alpha[], double x0[], @@ -22,8 +22,8 @@ ) ; /* ----------------------------------------------- - y0[] = y0[] + alpha[0] * x0[] + alpha[1] * x1[] - y1[] = y1[] + alpha[2] * x0[] + alpha[3] * x1[] + y0_[] = y0_[] + alpha[0] * x0[] + alpha[1] * x1[] + y1_[] = y1_[] + alpha[2] * x0[] + alpha[3] * x1[] y2[] = y2[] + alpha[4] * x0[] + alpha[5] * x1[] created -- 98dec10, cca @@ -32,8 +32,8 @@ void DVaxpy32 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double alpha[], double x0[], @@ -41,8 +41,8 @@ ) ; /* ----------------------------- - y0[] = y0[] + alpha[0] * x0[] - y1[] = y1[] + alpha[1] * x0[] + y0_[] = y0_[] + alpha[0] * x0[] + y1_[] = y1_[] + alpha[1] * x0[] y2[] = y2[] + alpha[2] * x0[] created -- 98dec10, cca @@ -51,16 +51,16 @@ void DVaxpy31 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double alpha[], double x0[] ) ; /* ----------------------------------------------------------------- - y0[] = y0[] + alpha[0] * x0[] + alpha[1] * x1[] + alpha[2] * x2[] - y1[] = y1[] + alpha[3] * x0[] + alpha[4] * x1[] + alpha[5] * x2[] + y0_[] = y0_[] + alpha[0] * x0[] + alpha[1] * x1[] + alpha[2] * x2[] + y1_[] = y1_[] + alpha[3] * x0[] + alpha[4] * x1[] + alpha[5] * x2[] created -- 98dec10, cca ----------------------------------------------------------------- @@ -68,8 +68,8 @@ void DVaxpy23 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double alpha[], double x0[], double x1[], @@ -77,8 +77,8 @@ ) ; /* ----------------------------------------------- - y0[] = y0[] + alpha[0] * x0[] + alpha[1] * x1[] - y1[] = y1[] + alpha[2] * x0[] + alpha[3] * x1[] + y0_[] = y0_[] + alpha[0] * x0[] + alpha[1] * x1[] + y1_[] = y1_[] + alpha[2] * x0[] + alpha[3] * x1[] created -- 98dec10, cca ----------------------------------------------- @@ -86,16 +86,16 @@ void DVaxpy22 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double alpha[], double x0[], double x1[] ) ; /* ----------------------------- - y0[] = y0[] + alpha[0] * x0[] - y1[] = y1[] + alpha[1] * x0[] + y0_[] = y0_[] + alpha[0] * x0[] + y1_[] = y1_[] + alpha[1] * x0[] created -- 98dec10, cca ----------------------------- @@ -103,14 +103,14 @@ void DVaxpy21 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double alpha[], double x0[] ) ; /* ----------------------------------------------------------------- - y0[] = y0[] + alpha[0] * x0[] + alpha[1] * x1[] + alpha[2] * x2[] + y0_[] = y0_[] + alpha[0] * x0[] + alpha[1] * x1[] + alpha[2] * x2[] created -- 98dec10, cca ----------------------------------------------------------------- @@ -118,7 +118,7 @@ void DVaxpy13 ( int n, - double y0[], + double y0_[], double alpha[], double x0[], double x1[], @@ -126,7 +126,7 @@ ) ; /* ----------------------------------------------- - y0[] = y0[] + alpha[0] * x0[] + alpha[1] * x1[] + y0_[] = y0_[] + alpha[0] * x0[] + alpha[1] * x1[] created -- 98dec10, cca ----------------------------------------------- @@ -134,14 +134,14 @@ void DVaxpy12 ( int n, - double y0[], + double y0_[], double alpha[], double x0[], double x1[] ) ; /* ----------------------------- - y0[] = y0[] + alpha[0] * x0[] + y0_[] = y0_[] + alpha[0] * x0[] created -- 98dec10, cca ----------------------------- @@ -149,15 +149,15 @@ void DVaxpy11 ( int n, - double y0[], + double y0_[], double alpha[], double x0[] ) ; /* ----------------------------------------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] + y0_[] = y0_[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] + alpha[4:5] * x2[] - y1[] = y1[] + alpha[6:7] * x0[] + y1_[] = y1_[] + alpha[6:7] * x0[] + alpha[8:9] * x1[] + alpha[10:11] * x2[] y2[] = y2[] + alpha[12:13] * x0[] + alpha[14:15] * x1[] + alpha[16:17] * x2[] @@ -168,8 +168,8 @@ void ZVaxpy33 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double alpha[], double x0[], @@ -178,8 +178,8 @@ ) ; /* ----------------------------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] - y1[] = y1[] + alpha[4:5] * x0[] + alpha[6:7] * x1[] + y0_[] = y0_[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] + y1_[] = y1_[] + alpha[4:5] * x0[] + alpha[6:7] * x1[] y2[] = y2[] + alpha[8:9] * x0[] + alpha[10:11] * x1[] created -- 98dec10, cca @@ -188,8 +188,8 @@ void ZVaxpy32 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double alpha[], double x0[], @@ -197,8 +197,8 @@ ) ; /* ------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] - y1[] = y1[] + alpha[2:3] * x0[] + y0_[] = y0_[] + alpha[0:1] * x0[] + y1_[] = y1_[] + alpha[2:3] * x0[] y2[] = y2[] + alpha[4:5] * x0[] created -- 98dec10, cca @@ -207,17 +207,17 @@ void ZVaxpy31 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double y2[], double alpha[], double x0[] ) ; /* ----------------------------------------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] + y0_[] = y0_[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] + alpha[4:5] * x2[] - y1[] = y1[] + alpha[6:7] * x0[] + y1_[] = y1_[] + alpha[6:7] * x0[] + alpha[8:9] * x1[] + alpha[10:11] * x2[] created -- 98dec10, cca @@ -226,8 +226,8 @@ void ZVaxpy23 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double alpha[], double x0[], double x1[], @@ -235,8 +235,8 @@ ) ; /* ----------------------------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] - y1[] = y1[] + alpha[4:5] * x0[] + alpha[6:7] * x1[] + y0_[] = y0_[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] + y1_[] = y1_[] + alpha[4:5] * x0[] + alpha[6:7] * x1[] created -- 98dec10, cca ----------------------------------------------------- @@ -244,16 +244,16 @@ void ZVaxpy22 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double alpha[], double x0[], double x1[] ) ; /* ------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] - y1[] = y1[] + alpha[2:3] * x0[] + y0_[] = y0_[] + alpha[0:1] * x0[] + y1_[] = y1_[] + alpha[2:3] * x0[] created -- 98dec10, cca ------------------------------- @@ -261,14 +261,14 @@ void ZVaxpy21 ( int n, - double y0[], - double y1[], + double y0_[], + double y1_[], double alpha[], double x0[] ) ; /* --------------------------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] + y0_[] = y0_[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] + alpha[4:5] * x2[] created -- 98dec10, cca @@ -277,7 +277,7 @@ void ZVaxpy13 ( int n, - double y0[], + double y0_[], double alpha[], double x0[], double x1[], @@ -285,7 +285,7 @@ ) ; /* ----------------------------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] + y0_[] = y0_[] + alpha[0:1] * x0[] + alpha[2:3] * x1[] created -- 98dec10, cca ----------------------------------------------------- @@ -293,14 +293,14 @@ void ZVaxpy12 ( int n, - double y0[], + double y0_[], double alpha[], double x0[], double x1[] ) ; /* ------------------------------- - y0[] = y0[] + alpha[0:1] * x0[] + y0_[] = y0_[] + alpha[0:1] * x0[] created -- 98dec10, cca ------------------------------- @@ -308,7 +308,7 @@ void ZVaxpy11 ( int n, - double y0[], + double y0_[], double alpha[], double x0[] ) ; diff -urN spooles-2.2.orig/Utilities/misc.h spooles-2.2-June_2006/Utilities/misc.h --- spooles-2.2.orig/Utilities/misc.h Sun May 31 00:45:01 1998 +++ spooles-2.2-June_2006/Utilities/misc.h Tue Jun 13 21:00:13 2006 @@ -82,7 +82,7 @@ /* ------------------------------------------------------------------ purpose -- to print out a list of entries given by an indexed list - print indices[index[*]] + print indices[index_[*]] input -- @@ -98,7 +98,7 @@ int id, int length, int indices[], - int index[], + int index_[], FILE *fp ) ; /* diff -urN spooles-2.2.orig/makeLib spooles-2.2-June_2006/makeLib --- spooles-2.2.orig/makeLib Wed Dec 16 18:47:58 1998 +++ spooles-2.2-June_2006/makeLib Tue Jun 13 20:24:00 2006 @@ -74,4 +74,5 @@ $(AR) $(ARFLAGS) ../../spooles.a $(OBJ)_*.o rm -f $(OBJ)_*.o $(RANLIB) ../../spooles.a + sleep 1 EOF diff -urN spooles-2.2.orig/makefile spooles-2.2-June_2006/makefile --- spooles-2.2.orig/makefile Mon Jan 25 21:39:39 1999 +++ spooles-2.2-June_2006/makefile Tue Jun 13 20:23:20 2006 @@ -123,7 +123,7 @@ cd Utilities ; make lib cd ZV ; make lib cd misc ; make lib -#cd MPI ; make lib + cd MPI ; make lib #cd MT ; make lib global : diff -urN spooles-2.2.orig/misc/src/orderViaBestOfNDandMS.c spooles-2.2-June_2006/misc/src/orderViaBestOfNDandMS.c --- spooles-2.2.orig/misc/src/orderViaBestOfNDandMS.c Sun Sep 20 00:28:58 1998 +++ spooles-2.2-June_2006/misc/src/orderViaBestOfNDandMS.c Tue Jun 13 20:39:35 2006 @@ -279,8 +279,10 @@ /* ------------------------ transform the front tree + This segment gives error, cut it out -- Hong Zhang, Sept. 2005 ------------------------ */ +/* MARKTIME(t1) ; etree = ETree_transform(etree, graph->vwghts, maxzeros, maxsize, seed); MARKTIME(t2) ; @@ -298,6 +300,7 @@ ETree_nFactorOps(etree, SPOOLES_REAL, SPOOLES_SYMMETRIC)) ; fflush(msgFile) ; } +*/ /* ------------------------------------------------- expand the front tree if the graph was compressed @@ -322,6 +325,7 @@ if ( msglvl >= 1 ) { fprintf(msgFile, "\n\n----------------------------------------" "\n\n Order the graph via best of ND and MS") ; + /* fprintf(msgFile, "\n\n # fronts # indices # entries # ops" "\n nested dissection %7d %10d %12.0f %12.0f" @@ -330,6 +334,7 @@ ndnfront, ndnind, ndnzf, ndops, msnfront, msnind, msnzf, msops, nfront, nind, nzf, ops) ; + */ totalCPU = t3 - t0 ; miscCPU = totalCPU - (eqmapCPU + compressCPU + dstreeCPU + ndCPU + msCPU + transformCPU) ; diff -urN spooles-2.2.orig/timings.h spooles-2.2-June_2006/timings.h --- spooles-2.2.orig/timings.h Tue Jun 2 19:42:14 1998 +++ spooles-2.2-June_2006/timings.h Tue Jun 13 20:38:37 2006 @@ -1,10 +1,9 @@ #ifndef _TIMINGS_ #define _TIMINGS_ #include -static struct timeval TV ; -static struct timezone TZ ; -#define MARKTIME(t) \ +#define MARKTIME(t) { \ + struct timeval TV ; \ + struct timezone TZ ; \ gettimeofday(&TV, &TZ) ; \ - t = (TV.tv_sec + 0.000001*TV.tv_usec) + t = (TV.tv_sec + 0.000001*TV.tv_usec); } #endif -