Changeset 4700
- Timestamp:
- 07/21/10 15:00:15 (15 years ago)
- Location:
- issm/trunk/externalpackages/scotch
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/externalpackages/scotch/Makefile.inc
r3060 r4700 17 17 #LDFLAGS = -lz -lm -lrt -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat 18 18 LDFLAGS = -lz -lm -lrt 19 MFLAGS = -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -D MATLAB -I${MATLAB_DIR}/extern/include -largeArrayDims19 MFLAGS = -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DNOFILEIO -DMATLAB -I${MATLAB_DIR}/extern/include -largeArrayDims 20 20 CP = cp 21 21 LEX = flex -
issm/trunk/externalpackages/scotch/install.sh
r4653 r4700 20 20 21 21 # Apply patches (all at once, since many) 22 # (written by diff -rc src ~/Libs/scotch_5.1 > scotch.patch) 23 patch -R -p0 < scotch.patch 24 #patch -p0 < scotch.patch 25 26 22 # (written by diff -rc old_src new_src > scotch.patch) 23 patch -p0 < scotch.patch 27 24 28 25 # Build scotch … … 33 30 # For stand-alone scotch modules: 34 31 make -j $NUMCPUS scotch 35 #make clean36 # For mexscotch modules:37 #make mexscotch32 make clean 33 # For no-file-io scotch modules: 34 make -j $NUMCPUS nfioscotch 38 35 # Clean up 39 36 make clean … … 56 53 #cp -p gmap.m install/bin 57 54 #cp -p gpart.m install/bin 55 -
issm/trunk/externalpackages/scotch/mex/Gmap.c
r4629 r4700 4 4 /* Gmap structures and prototypes */ 5 5 6 #ifdef MATLAB 7 #include "mat.h" 8 #include "mex.h" 9 #include "matrix.h" 10 11 #define printf mexPrintf 12 #define fprintf(file,...) (file == stdout || file == stderr ? mexPrintf(__VA_ARGS__) : fprintf(file,__VA_ARGS__)) 13 #define malloc mxMalloc 14 #define calloc mxCalloc 15 #define realloc mxRealloc 16 #define free mxFree 17 #define exit(status) mexErrMsgTxt("exit=" #status) 18 #endif 6 #include "mat.h" 7 #include "mex.h" 8 #include "matrix.h" 19 9 20 10 void GmapUsage( void ); … … 260 250 imo++; 261 251 262 if (argvm)263 for (i=argcm-1; i>=0; i--)264 free(argvm[i]);265 252 if (api) free(api); 266 253 if (archtyp) free(archtyp); … … 270 257 if (adjjc) free(adjjc); 271 258 if (adjir) free(adjir); 259 if (argvm) { 260 for (i=argcm-1; i>=0; i--) 261 free(argvm[i]); 262 free(argvm); 263 } 272 264 273 265 return; -
issm/trunk/externalpackages/scotch/mex/Makefile
r4629 r4700 34 34 #includedir = ../../include 35 35 #libdir = ../../lib 36 bindir = ${SCOTCH_DIR}/../src/bin 37 includedir = ${SCOTCH_DIR}/../src/include 38 libdir = ${SCOTCH_DIR}/../src/lib 36 #bindir = ${SCOTCH_DIR}/../src/bin 37 #includedir = ${SCOTCH_DIR}/../src/include 38 #libdir = ${SCOTCH_DIR}/../src/lib 39 bindir = ${SCOTCH_DIR}/bin 40 includedir = ${SCOTCH_DIR}/include 41 libdir = ${SCOTCH_DIR}/lib 39 42 40 43 ## … … 58 61 59 62 mexscotch : clean 60 $(MAKE) CFLAGS="$(CFLAGS) -D MATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch \63 $(MAKE) CFLAGS="$(CFLAGS) -DNOFILEIO" CC="$(CCS)" CCD="$(CCS)" SCOTCHLIB=nfioscotch \ 61 64 Gmapx$(OBJ) 62 $(MAKE) CFLAGS="$(CFLAGS) -D MATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat Gmapx$(OBJ)" SCOTCHLIB=scotch \65 $(MAKE) CFLAGS="$(CFLAGS) -DNOFILEIO -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat Gmapx$(OBJ)" SCOTCHLIB=nfioscotch \ 63 66 Gmap$(MEX) 64 67 … … 82 85 ${SCOTCH_DIR}/../src/src/libscotch/common.h \ 83 86 $(includedir)/scotch.h \ 84 $(libdir)/lib scotch$(LIB) \85 $(libdir)/lib scotcherrexit$(LIB) \87 $(libdir)/libnfioscotch$(LIB) \ 88 $(libdir)/libnfioscotcherrexit$(LIB) \ 86 89 ${SCOTCH_DIR}/../src/src/scotch/gmap.h 87 90 … … 90 93 ${SCOTCH_DIR}/../src/src/libscotch/common.h \ 91 94 $(includedir)/scotch.h \ 92 $(libdir)/lib scotch$(LIB) \93 $(libdir)/lib scotcherrexit$(LIB) \95 $(libdir)/libnfioscotch$(LIB) \ 96 $(libdir)/libnfioscotcherrexit$(LIB) \ 94 97 ${SCOTCH_DIR}/../src/src/scotch/gmap.h 95 98 -
issm/trunk/externalpackages/scotch/scotch.patch
r4655 r4700 1 Only in src: bin 2 Only in src: include 3 Only in src: lib 4 diff -rc src/src/libscotch/arch.c old/src/libscotch/arch.c 5 *** src/src/libscotch/arch.c 2010-07-19 12:08:20.485684277 -0700 6 --- old/src/libscotch/arch.c 2008-09-27 07:48:01.000000000 -0700 7 *************** 8 *** 173,203 **** 9 int 10 archLoad ( 11 Arch * restrict const archptr, 12 ! FILE * const stream 13 ! #ifdef MATLAB 14 ! , 15 ! const char * archtyp, 16 ! const Anum napar, 17 ! const Anum * archpar 18 ! #endif /* MATLAB */ 19 ! ) 20 { 21 const ArchClass * restrict class; /* Pointer to architecture class */ 22 char name[256]; /* Architecture name string */ 23 24 - #ifdef MATLAB 25 - printf("archLoad - stream=%p; archtyp=\"%s\"\n",stream,archtyp); 26 - printf("archLoad - napar=%d,archpar=%p\n",napar,archpar); 27 - #endif /* MATLAB */ 28 - 29 - #ifndef MATLAB 30 if (fscanf (stream, "%255s", name) != 1) { /* Read architecture name */ 31 errorPrint ("archLoad: cannot load architecture type"); 32 return (1); 33 } 34 - #else /* MATLAB */ 35 - strcpy(name,archtyp); 36 - #endif /* MATLAB */ 37 name[255] = '\0'; /* Set end of string */ 38 39 if ((class = archClass (name)) == NULL) { /* Get class from its name */ 40 --- 173,187 ---- 1 Only in new5: bin 2 Only in new5: include 3 Only in new5: lib 4 diff -rc src/src/libscotch/arch.c new5/src/libscotch/arch.c 5 *** src/src/libscotch/arch.c 2008-09-27 07:48:01.000000000 -0700 6 --- new5/src/libscotch/arch.c 2010-07-20 10:07:11.591403732 -0700 7 *************** 8 *** 173,187 **** 41 9 int 42 10 archLoad ( … … 54 22 55 23 if ((class = archClass (name)) == NULL) { /* Get class from its name */ 56 *************** 57 *** 206,216 **** 24 --- 173,203 ---- 25 int 26 archLoad ( 27 Arch * restrict const archptr, 28 ! FILE * const stream 29 ! #ifdef NOFILEIO 30 ! , 31 ! const char * archtyp, 32 ! const Anum napar, 33 ! const Anum * archpar 34 ! #endif /* NOFILEIO */ 35 ! ) 36 { 37 const ArchClass * restrict class; /* Pointer to architecture class */ 38 char name[256]; /* Architecture name string */ 39 40 + #ifdef NOFILEIO 41 + // printf("archLoad - stream=%p; archtyp=\"%s\"\n",stream,archtyp); 42 + // printf("archLoad - napar=%d,archpar=%p\n",napar,archpar); 43 + #endif /* NOFILEIO */ 44 + 45 + #ifndef NOFILEIO 46 if (fscanf (stream, "%255s", name) != 1) { /* Read architecture name */ 47 errorPrint ("archLoad: cannot load architecture type"); 48 return (1); 49 } 50 + #else /* NOFILEIO */ 51 + strcpy(name,archtyp); 52 + #endif /* NOFILEIO */ 53 name[255] = '\0'; /* Set end of string */ 54 55 if ((class = archClass (name)) == NULL) { /* Get class from its name */ 56 *************** 57 *** 190,196 **** 58 --- 206,216 ---- 58 59 } 59 60 60 61 if (class->archLoad != NULL) { /* If class has loading function */ 61 - #ifndef MATLAB 62 + #ifndef NOFILEIO 62 63 if (class->archLoad (&archptr->data, stream) != 0) { /* Load class data */ 63 - #else /* MATLAB*/64 -if (class->archLoad (&archptr->data, stream, napar, archpar) != 0) { /* Load class data */65 - #endif /* MATLAB*/64 + #else /* NOFILEIO */ 65 + if (class->archLoad (&archptr->data, stream, napar, archpar) != 0) { /* Load class data */ 66 + #endif /* NOFILEIO */ 66 67 errorPrint ("archLoad: cannot load architecture data"); 67 68 memset (archptr, 0, sizeof (Arch)); /* Initialize architecture body */ 68 69 return (1); 69 --- 190,196 ---- 70 diff -rc src/src/libscotch/arch_cmplt.c old/src/libscotch/arch_cmplt.c 71 *** src/src/libscotch/arch_cmplt.c 2010-07-19 12:08:20.488684298 -0700 72 --- old/src/libscotch/arch_cmplt.c 2008-05-22 06:44:41.000000000 -0700 73 *************** 74 *** 90,109 **** 75 int 76 archCmpltArchLoad ( 77 ArchCmplt * restrict const archptr, 78 ! FILE * restrict const stream 79 ! #ifdef MATLAB 80 ! , 81 ! const Anum napar, 82 ! const Anum * archpar 83 ! #endif /* MATLAB */ 84 ! ) 85 { 86 long numnbr; 87 88 - #ifdef MATLAB 89 - printf("archCmpltArchLoad - napar=%d,archpar=%p\n",napar,archpar); 90 - #endif /* MATLAB */ 91 - 92 #ifdef SCOTCH_DEBUG_ARCH1 93 if ((sizeof (ArchCmplt) > sizeof (ArchDummy)) || 94 (sizeof (ArchCmpltDom) > sizeof (ArchDomDummy))) { 95 --- 90,99 ---- 70 diff -rc src/src/libscotch/arch_cmplt.c new5/src/libscotch/arch_cmplt.c 71 *** src/src/libscotch/arch_cmplt.c 2008-05-22 06:44:41.000000000 -0700 72 --- new5/src/libscotch/arch_cmplt.c 2010-07-20 10:08:51.983495478 -0700 73 *************** 74 *** 90,99 **** 96 75 int 97 76 archCmpltArchLoad ( … … 104 83 if ((sizeof (ArchCmplt) > sizeof (ArchDummy)) || 105 84 (sizeof (ArchCmpltDom) > sizeof (ArchDomDummy))) { 106 *************** 107 *** 112,124 **** 85 --- 90,109 ---- 86 int 87 archCmpltArchLoad ( 88 ArchCmplt * restrict const archptr, 89 ! FILE * restrict const stream 90 ! #ifdef NOFILEIO 91 ! , 92 ! const Anum napar, 93 ! const Anum * archpar 94 ! #endif /* NOFILEIO */ 95 ! ) 96 { 97 long numnbr; 98 99 + #ifdef NOFILEIO 100 + // printf("archCmpltArchLoad - napar=%d,archpar=%p\n",napar,archpar); 101 + #endif /* NOFILEIO */ 102 + 103 #ifdef SCOTCH_DEBUG_ARCH1 104 if ((sizeof (ArchCmplt) > sizeof (ArchDummy)) || 105 (sizeof (ArchCmpltDom) > sizeof (ArchDomDummy))) { 106 *************** 107 *** 102,109 **** 108 --- 112,124 ---- 108 109 } 109 110 #endif /* SCOTCH_DEBUG_ARCH1 */ 110 111 111 - #ifndef MATLAB 112 + #ifndef NOFILEIO 112 113 if ((fscanf (stream, "%ld", &numnbr) != 1) || 113 114 (numnbr < 1)) { 114 - #else /* MATLAB*/115 -if ((napar < 1) ||116 -((numnbr=(long)archpar[0]) < 1)) {117 - #endif /* MATLAB*/115 + #else /* NOFILEIO */ 116 + if ((napar < 1) || 117 + ((numnbr=(long)archpar[0]) < 1)) { 118 + #endif /* NOFILEIO */ 118 119 errorPrint ("archCmpltArchLoad: bad input"); 119 120 return (1); 120 121 } 121 --- 102,109 ---- 122 diff -rc src/src/libscotch/arch_cmplt.h old/src/libscotch/arch_cmplt.h 123 *** src/src/libscotch/arch_cmplt.h 2010-07-19 12:08:20.490684312-0700124 --- old/src/libscotch/arch_cmplt.h 2008-05-22 06:44:41.000000000 -0700 125 *** ************126 *** 87,97 **** 122 diff -rc src/src/libscotch/arch_cmplt.h new5/src/libscotch/arch_cmplt.h 123 *** src/src/libscotch/arch_cmplt.h 2008-05-22 06:44:41.000000000 -0700 124 --- new5/src/libscotch/arch_cmplt.h 2010-07-19 14:57:40.109618053 -0700 125 *************** 126 *** 87,93 **** 127 --- 87,97 ---- 127 128 #define static 128 129 #endif 129 130 130 - #ifndef MATLAB 131 + #ifndef NOFILEIO 131 132 int archCmpltArchLoad (ArchCmplt * restrict const, FILE * restrict const); 132 - #else /* MATLAB*/133 -int archCmpltArchLoad (ArchCmplt * restrict const, FILE * restrict const, const Anum, const Anum *);134 - #endif /* MATLAB*/133 + #else /* NOFILEIO */ 134 + int archCmpltArchLoad (ArchCmplt * restrict const, FILE * restrict const, const Anum, const Anum *); 135 + #endif /* NOFILEIO */ 135 136 int archCmpltArchSave (const ArchCmplt * const, FILE * restrict const); 136 137 #define archCmpltArchFree NULL 137 138 ArchDomNum archCmpltDomNum (const ArchCmplt * const, const ArchCmpltDom * const); 138 --- 87,93 ---- 139 diff -rc src/src/libscotch/arch_cmpltw.c old/src/libscotch/arch_cmpltw.c 140 *** src/src/libscotch/arch_cmpltw.c 2010-07-19 12:08:20.493684332 -0700 141 --- old/src/libscotch/arch_cmpltw.c 2008-08-27 14:22:22.000000000 -0700 142 *************** 143 *** 200,221 **** 144 int 145 archCmpltwArchLoad ( 146 ArchCmpltw * restrict const archptr, 147 ! FILE * restrict const stream 148 ! #ifdef MATLAB 149 ! , 150 ! const Anum napar, 151 ! const Anum * archpar 152 ! #endif /* MATLAB */ 153 ! ) 154 { 155 long vertnbr; 156 Gnum velosum; 157 Anum vertnum; 158 159 - #ifdef MATLAB 160 - printf("archCmpltwArchLoad - napar=%d,archpar=%p\n",napar,archpar); 161 - #endif /* MATLAB */ 162 - 163 #ifdef SCOTCH_DEBUG_ARCH1 164 if ((sizeof (ArchCmpltw) > sizeof (ArchDummy)) || 165 (sizeof (ArchCmpltwDom) > sizeof (ArchDomDummy))) { 166 --- 200,211 ---- 139 diff -rc src/src/libscotch/arch_cmpltw.c new5/src/libscotch/arch_cmpltw.c 140 *** src/src/libscotch/arch_cmpltw.c 2008-08-27 14:22:22.000000000 -0700 141 --- new5/src/libscotch/arch_cmpltw.c 2010-07-20 10:09:00.028502844 -0700 142 *************** 143 *** 200,211 **** 167 144 int 168 145 archCmpltwArchLoad ( … … 177 154 if ((sizeof (ArchCmpltw) > sizeof (ArchDummy)) || 178 155 (sizeof (ArchCmpltwDom) > sizeof (ArchDomDummy))) { 179 *************** 180 *** 224,236 **** 156 --- 200,221 ---- 157 int 158 archCmpltwArchLoad ( 159 ArchCmpltw * restrict const archptr, 160 ! FILE * restrict const stream 161 ! #ifdef NOFILEIO 162 ! , 163 ! const Anum napar, 164 ! const Anum * archpar 165 ! #endif /* NOFILEIO */ 166 ! ) 167 { 168 long vertnbr; 169 Gnum velosum; 170 Anum vertnum; 171 172 + #ifdef NOFILEIO 173 + // printf("archCmpltwArchLoad - napar=%d,archpar=%p\n",napar,archpar); 174 + #endif /* NOFILEIO */ 175 + 176 #ifdef SCOTCH_DEBUG_ARCH1 177 if ((sizeof (ArchCmpltw) > sizeof (ArchDummy)) || 178 (sizeof (ArchCmpltwDom) > sizeof (ArchDomDummy))) { 179 *************** 180 *** 214,221 **** 181 --- 224,236 ---- 181 182 } 182 183 #endif /* SCOTCH_DEBUG_ARCH1 */ 183 184 184 - #ifndef MATLAB 185 + #ifndef NOFILEIO 185 186 if ((fscanf (stream, "%ld", &vertnbr) != 1) || 186 187 (vertnbr < 1)) { 187 - #else /* MATLAB*/188 -if ((napar < 1) ||189 -((vertnbr=(long)archpar[0]) < 1)) {190 - #endif /* MATLAB*/188 + #else /* NOFILEIO */ 189 + if ((napar < 1) || 190 + ((vertnbr=(long)archpar[0]) < 1)) { 191 + #endif /* NOFILEIO */ 191 192 errorPrint ("archCmpltwArchLoad: bad input (1)"); 192 193 return (1); 193 194 } 194 --- 214,221 ---- 195 *** ************196 *** 245,257 **** 195 *************** 196 *** 230,237 **** 197 --- 245,257 ---- 197 198 long veloval; 198 199 Gnum velotmp; 199 200 200 - #ifndef MATLAB 201 + #ifndef NOFILEIO 201 202 if ((fscanf (stream, "%ld", &veloval) != 1) || 202 203 (veloval < 1)) { 203 - #else /* MATLAB*/204 -if ((napar < 1+(vertnum+1)) ||205 -((veloval=(long)archpar[1+(vertnum+1)]) < 1)) {206 - #endif /* MATLAB*/204 + #else /* NOFILEIO */ 205 + if ((napar < 1+(vertnum+1)) || 206 + ((veloval=(long)archpar[1+(vertnum+1)]) < 1)) { 207 + #endif /* NOFILEIO */ 207 208 errorPrint ("archCmpltwArchLoad: bad input (2)"); 208 209 return (1); 209 210 } 210 --- 230,237 ---- 211 diff -rc src/src/libscotch/arch_cmpltw.h old/src/libscotch/arch_cmpltw.h 212 *** src/src/libscotch/arch_cmpltw.h 2010-07-19 12:08:20.496684353-0700213 --- old/src/libscotch/arch_cmpltw.h 2008-05-22 06:44:41.000000000 -0700 214 *** ************215 *** 86,96 **** 211 diff -rc src/src/libscotch/arch_cmpltw.h new5/src/libscotch/arch_cmpltw.h 212 *** src/src/libscotch/arch_cmpltw.h 2008-05-22 06:44:41.000000000 -0700 213 --- new5/src/libscotch/arch_cmpltw.h 2010-07-19 14:57:58.393634859 -0700 214 *************** 215 *** 86,92 **** 216 --- 86,96 ---- 216 217 #endif 217 218 218 219 int archCmpltwArchBuild (ArchCmpltw * restrict const archptr, const Gnum, const Gnum * restrict const); 219 - #ifndef MATLAB 220 + #ifndef NOFILEIO 220 221 int archCmpltwArchLoad (ArchCmpltw * restrict const, FILE * restrict const); 221 - #else /* MATLAB*/222 -int archCmpltwArchLoad (ArchCmpltw * restrict const, FILE * restrict const, const Anum, const Anum *);223 - #endif /* MATLAB*/222 + #else /* NOFILEIO */ 223 + int archCmpltwArchLoad (ArchCmpltw * restrict const, FILE * restrict const, const Anum, const Anum *); 224 + #endif /* NOFILEIO */ 224 225 int archCmpltwArchSave (const ArchCmpltw * const, FILE * restrict const); 225 226 int archCmpltwArchFree (ArchCmpltw * restrict const); 226 227 ArchDomNum archCmpltwDomNum (const ArchCmpltw * const, const ArchCmpltwDom * const); 227 --- 86,92 ---- 228 diff -rc src/src/libscotch/arch_deco.c old/src/libscotch/arch_deco.c 229 *** src/src/libscotch/arch_deco.c 2010-07-19 12:08:20.498684367 -0700 230 --- old/src/libscotch/arch_deco.c 2008-09-28 06:35:27.000000000 -0700 231 *************** 232 *** 211,223 **** 233 int 234 archDecoArchLoad ( 235 ArchDeco * restrict const archptr, 236 ! FILE * restrict const stream 237 ! #ifdef MATLAB 238 ! , 239 ! const Anum napar, 240 ! const Anum * archpar 241 ! #endif /* MATLAB */ 242 ! ) 243 { 244 INT decotype; /* Type of decomposition */ 245 INT termdomnbr; /* Number of terminal domains (ie processors) */ 246 --- 211,217 ---- 228 diff -rc src/src/libscotch/arch_deco.c new5/src/libscotch/arch_deco.c 229 *** src/src/libscotch/arch_deco.c 2008-09-28 06:35:27.000000000 -0700 230 --- new5/src/libscotch/arch_deco.c 2010-07-20 10:09:13.608515282 -0700 231 *************** 232 *** 211,217 **** 247 233 int 248 234 archDecoArchLoad ( … … 252 238 INT decotype; /* Type of decomposition */ 253 239 INT termdomnbr; /* Number of terminal domains (ie processors) */ 254 *************** 255 *** 226,237 **** 240 --- 211,223 ---- 241 int 242 archDecoArchLoad ( 243 ArchDeco * restrict const archptr, 244 ! FILE * restrict const stream 245 ! #ifdef NOFILEIO 246 ! , 247 ! const Anum napar, 248 ! const Anum * archpar 249 ! #endif /* NOFILEIO */ 250 ! ) 251 { 252 INT decotype; /* Type of decomposition */ 253 INT termdomnbr; /* Number of terminal domains (ie processors) */ 254 *************** 255 *** 220,225 **** 256 --- 226,237 ---- 256 257 Anum * restrict termdisttab; /* Table of terminal-to-terminal distances */ 257 258 INT i, j; 258 259 259 - #ifdef MATLAB 260 -printf("archDecoArchLoad - napar=%d,archpar=%p\n",napar,archpar);261 -errorPrint ("archDecoArchLoad - not yet converted to matlab matrices");262 -return (1);263 - #endif /* MATLAB*/264 -260 + #ifdef NOFILEIO 261 + // printf("archDecoArchLoad - napar=%d,archpar=%p\n",napar,archpar); 262 + errorPrint ("archDecoArchLoad - not yet converted to matlab matrices"); 263 + return (1); 264 + #endif /* NOFILEIO */ 265 + 265 266 #ifdef SCOTCH_DEBUG_ARCH1 266 267 if ((sizeof (ArchDeco) > sizeof (ArchDummy)) || 267 268 (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) { 268 --- 220,225 ---- 269 diff -rc src/src/libscotch/arch_deco.h old/src/libscotch/arch_deco.h 270 *** src/src/libscotch/arch_deco.h 2010-07-19 12:08:20.501684388-0700271 --- old/src/libscotch/arch_deco.h 2008-09-27 07:49:46.000000000 -0700 272 *** ************273 *** 113,123 **** 269 diff -rc src/src/libscotch/arch_deco.h new5/src/libscotch/arch_deco.h 270 *** src/src/libscotch/arch_deco.h 2008-09-27 07:49:46.000000000 -0700 271 --- new5/src/libscotch/arch_deco.h 2010-07-19 14:58:09.531645102 -0700 272 *************** 273 *** 113,119 **** 274 --- 113,123 ---- 274 275 #endif 275 276 276 277 int archDecoArchBuild (ArchDeco * const, const Anum, const Anum, const ArchDecoTermVert * const, const Anum * const); 277 - #ifndef MATLAB 278 + #ifndef NOFILEIO 278 279 int archDecoArchLoad (ArchDeco * const, FILE * restrict const); 279 - #else /* MATLAB*/280 -int archDecoArchLoad (ArchDeco * const, FILE * restrict const, const Anum, const Anum *);281 - #endif /* MATLAB*/280 + #else /* NOFILEIO */ 281 + int archDecoArchLoad (ArchDeco * const, FILE * restrict const, const Anum, const Anum *); 282 + #endif /* NOFILEIO */ 282 283 int archDecoArchSave (const ArchDeco * const, FILE * restrict const); 283 284 int archDecoArchFree (ArchDeco * const); 284 285 Anum archDecoArchSize (ArchDeco * const, const Anum); 285 --- 113,119 ---- 286 diff -rc src/src/libscotch/arch.h old/src/libscotch/arch.h 287 *** src/src/libscotch/arch.h 2010-07-19 12:08:20.503684402 -0700288 --- old/src/libscotch/arch.h 2009-04-28 08:11:27.000000000 -0700 289 *** ************290 *** 175,185 **** 286 diff -rc src/src/libscotch/arch.h new5/src/libscotch/arch.h 287 *** src/src/libscotch/arch.h 2009-04-28 08:11:27.000000000 -0700 288 --- new5/src/libscotch/arch.h 2010-07-19 14:58:14.368649552 -0700 289 *************** 290 *** 175,181 **** 291 --- 175,185 ---- 291 292 int archInit (Arch * restrict const); 292 293 int archExit (Arch * restrict const); 293 294 int archFree (Arch * restrict const); 294 - #ifndef MATLAB 295 + #ifndef NOFILEIO 295 296 int archLoad (Arch * restrict const, FILE * const); 296 - #else /* MATLAB*/297 -int archLoad (Arch * restrict const, FILE * const, const char *, const Anum, const Anum *);298 - #endif /* MATLAB*/297 + #else /* NOFILEIO */ 298 + int archLoad (Arch * restrict const, FILE * const, const char *, const Anum, const Anum *); 299 + #endif /* NOFILEIO */ 299 300 int archSave (const Arch * const, FILE * const); 300 301 char * archName (const Arch * const); 301 302 const ArchClass * archClass (const char * const); 302 --- 175,181 ---- 303 diff -rc src/src/libscotch/arch_hcub.c old/src/libscotch/arch_hcub.c 304 *** src/src/libscotch/arch_hcub.c 2010-07-19 12:08:20.506684423 -0700 305 --- old/src/libscotch/arch_hcub.c 2008-05-22 06:44:41.000000000 -0700 306 *************** 307 *** 88,105 **** 308 int 309 archHcubArchLoad ( 310 ArchHcub * restrict const archptr, 311 ! FILE * restrict const stream 312 ! #ifdef MATLAB 313 ! , 314 ! const Anum napar, 315 ! const Anum * archpar 316 ! #endif /* MATLAB */ 317 ! ) 318 ! { 319 ! #ifdef MATLAB 320 ! printf("archHcubArchLoad - napar=%d,archpar=%p\n",napar,archpar); 321 ! #endif /* MATLAB */ 322 ! 323 #ifdef SCOTCH_DEBUG_ARCH1 324 if ((sizeof (ArchHcub) > sizeof (ArchDummy)) || 325 (sizeof (ArchHcubDom) > sizeof (ArchDomDummy))) { 326 --- 88,95 ---- 303 diff -rc src/src/libscotch/arch_hcub.c new5/src/libscotch/arch_hcub.c 304 *** src/src/libscotch/arch_hcub.c 2008-05-22 06:44:41.000000000 -0700 305 --- new5/src/libscotch/arch_hcub.c 2010-07-20 10:09:19.956521099 -0700 306 *************** 307 *** 88,95 **** 327 308 int 328 309 archHcubArchLoad ( … … 333 314 if ((sizeof (ArchHcub) > sizeof (ArchDummy)) || 334 315 (sizeof (ArchHcubDom) > sizeof (ArchDomDummy))) { 335 *************** 336 *** 108,120 **** 316 --- 88,105 ---- 317 int 318 archHcubArchLoad ( 319 ArchHcub * restrict const archptr, 320 ! FILE * restrict const stream 321 ! #ifdef NOFILEIO 322 ! , 323 ! const Anum napar, 324 ! const Anum * archpar 325 ! #endif /* NOFILEIO */ 326 ! ) 327 ! { 328 ! #ifdef NOFILEIO 329 ! // printf("archHcubArchLoad - napar=%d,archpar=%p\n",napar,archpar); 330 ! #endif /* NOFILEIO */ 331 ! 332 #ifdef SCOTCH_DEBUG_ARCH1 333 if ((sizeof (ArchHcub) > sizeof (ArchDummy)) || 334 (sizeof (ArchHcubDom) > sizeof (ArchDomDummy))) { 335 *************** 336 *** 98,105 **** 337 --- 108,120 ---- 337 338 } 338 339 #endif /* SCOTCH_DEBUG_ARCH1 */ 339 340 340 - #ifndef MATLAB 341 + #ifndef NOFILEIO 341 342 if ((intLoad (stream, &archptr->dimmax) != 1) || 342 343 (archptr->dimmax < 1) || 343 - #else /* MATLAB*/344 -if ((napar < 1) ||345 -((archptr->dimmax=archpar[0]) < 1) ||346 - #endif /* MATLAB*/344 + #else /* NOFILEIO */ 345 + if ((napar < 1) || 346 + ((archptr->dimmax=archpar[0]) < 1) || 347 + #endif /* NOFILEIO */ 347 348 (archptr->dimmax > (sizeof (archptr->dimmax) << 3))) { 348 349 errorPrint ("archHcubArchLoad: bad input"); 349 350 return (1); 350 --- 98,105 ---- 351 diff -rc src/src/libscotch/arch_hcub.h old/src/libscotch/arch_hcub.h 352 *** src/src/libscotch/arch_hcub.h 2010-07-19 12:08:20.508684437-0700353 --- old/src/libscotch/arch_hcub.h 2008-05-22 06:44:41.000000000 -0700 354 *** ************355 *** 85,95 **** 351 diff -rc src/src/libscotch/arch_hcub.h new5/src/libscotch/arch_hcub.h 352 *** src/src/libscotch/arch_hcub.h 2008-05-22 06:44:41.000000000 -0700 353 --- new5/src/libscotch/arch_hcub.h 2010-07-19 14:58:27.010661184 -0700 354 *************** 355 *** 85,91 **** 356 --- 85,95 ---- 356 357 #define static 357 358 #endif 358 359 359 - #ifndef MATLAB 360 + #ifndef NOFILEIO 360 361 int archHcubArchLoad (ArchHcub * restrict const, FILE * restrict const); 361 - #else /* MATLAB*/362 -int archHcubArchLoad (ArchHcub * restrict const, FILE * restrict const, const Anum, const Anum *);363 - #endif /* MATLAB*/362 + #else /* NOFILEIO */ 363 + int archHcubArchLoad (ArchHcub * restrict const, FILE * restrict const, const Anum, const Anum *); 364 + #endif /* NOFILEIO */ 364 365 int archHcubArchSave (const ArchHcub * const, FILE * restrict const); 365 366 #define archHcubArchFree NULL 366 367 ArchDomNum archHcubDomNum (const ArchHcub * const, const ArchHcubDom * const); 367 --- 85,91 ---- 368 diff -rc src/src/libscotch/arch_mesh.c old/src/libscotch/arch_mesh.c 369 *** src/src/libscotch/arch_mesh.c 2010-07-19 12:08:20.511684458 -0700 370 --- old/src/libscotch/arch_mesh.c 2008-05-22 06:44:41.000000000 -0700 371 *************** 372 *** 96,113 **** 373 int 374 archMesh2ArchLoad ( 375 ArchMesh2 * restrict const archptr, 376 ! FILE * restrict const stream 377 ! #ifdef MATLAB 378 ! , 379 ! const Anum napar, 380 ! const Anum * archpar 381 ! #endif /* MATLAB */ 382 ! ) 383 ! { 384 ! #ifdef MATLAB 385 ! printf("archMesh2ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 386 ! #endif /* MATLAB */ 387 ! 388 #ifdef SCOTCH_DEBUG_ARCH1 389 if ((sizeof (ArchMesh2) > sizeof (ArchDummy)) || 390 (sizeof (ArchMesh2Dom) > sizeof (ArchDomDummy))) { 391 --- 96,103 ---- 368 diff -rc src/src/libscotch/arch_mesh.c new5/src/libscotch/arch_mesh.c 369 *** src/src/libscotch/arch_mesh.c 2008-05-22 06:44:41.000000000 -0700 370 --- new5/src/libscotch/arch_mesh.c 2010-07-20 10:09:26.031526666 -0700 371 *************** 372 *** 96,103 **** 392 373 int 393 374 archMesh2ArchLoad ( … … 398 379 if ((sizeof (ArchMesh2) > sizeof (ArchDummy)) || 399 380 (sizeof (ArchMesh2Dom) > sizeof (ArchDomDummy))) { 400 *************** 401 *** 116,130 **** 381 --- 96,113 ---- 382 int 383 archMesh2ArchLoad ( 384 ArchMesh2 * restrict const archptr, 385 ! FILE * restrict const stream 386 ! #ifdef NOFILEIO 387 ! , 388 ! const Anum napar, 389 ! const Anum * archpar 390 ! #endif /* NOFILEIO */ 391 ! ) 392 ! { 393 ! #ifdef NOFILEIO 394 ! // printf("archMesh2ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 395 ! #endif /* NOFILEIO */ 396 ! 397 #ifdef SCOTCH_DEBUG_ARCH1 398 if ((sizeof (ArchMesh2) > sizeof (ArchDummy)) || 399 (sizeof (ArchMesh2Dom) > sizeof (ArchDomDummy))) { 400 *************** 401 *** 106,114 **** 402 --- 116,130 ---- 402 403 } 403 404 #endif /* SCOTCH_DEBUG_ARCH1 */ 404 405 405 - #ifndef MATLAB 406 + #ifndef NOFILEIO 406 407 if ((intLoad (stream, &archptr->c[0]) != 1) || 407 408 (intLoad (stream, &archptr->c[1]) != 1) || 408 409 (archptr->c[0] < 1) || (archptr->c[1] < 1)) { 409 - #else /* MATLAB*/410 -if ((napar < 2) ||411 -((archptr->c[0]=archpar[0]) < 1) ||412 -((archptr->c[1]=archpar[1]) < 1)) {413 - #endif /* MATLAB*/410 + #else /* NOFILEIO */ 411 + if ((napar < 2) || 412 + ((archptr->c[0]=archpar[0]) < 1) || 413 + ((archptr->c[1]=archpar[1]) < 1)) { 414 + #endif /* NOFILEIO */ 414 415 errorPrint ("archMesh2ArchLoad: bad input"); 415 416 return (1); 416 417 } 417 --- 106,114 ---- 418 *************** 419 *** 437,454 **** 420 int 421 archMesh3ArchLoad ( 422 ArchMesh3 * restrict const archptr, 423 ! FILE * restrict const stream 424 ! #ifdef MATLAB 425 ! , 426 ! const Anum napar, 427 ! const Anum * archpar 428 ! #endif /* MATLAB */ 429 ! ) 430 ! { 431 ! #ifdef MATLAB 432 ! printf("archMesh3ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 433 ! #endif /* MATLAB */ 434 ! 435 #ifdef SCOTCH_DEBUG_ARCH1 436 if ((sizeof (ArchMesh3) > sizeof (ArchDummy)) || 437 (sizeof (ArchMesh3Dom) > sizeof (ArchDomDummy))) { 438 --- 421,428 ---- 418 *************** 419 *** 421,428 **** 439 420 int 440 421 archMesh3ArchLoad ( … … 445 426 if ((sizeof (ArchMesh3) > sizeof (ArchDummy)) || 446 427 (sizeof (ArchMesh3Dom) > sizeof (ArchDomDummy))) { 447 *************** 448 *** 457,473 **** 428 --- 437,454 ---- 429 int 430 archMesh3ArchLoad ( 431 ArchMesh3 * restrict const archptr, 432 ! FILE * restrict const stream 433 ! #ifdef NOFILEIO 434 ! , 435 ! const Anum napar, 436 ! const Anum * archpar 437 ! #endif /* NOFILEIO */ 438 ! ) 439 ! { 440 ! #ifdef NOFILEIO 441 ! // printf("archMesh3ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 442 ! #endif /* NOFILEIO */ 443 ! 444 #ifdef SCOTCH_DEBUG_ARCH1 445 if ((sizeof (ArchMesh3) > sizeof (ArchDummy)) || 446 (sizeof (ArchMesh3Dom) > sizeof (ArchDomDummy))) { 447 *************** 448 *** 431,440 **** 449 --- 457,473 ---- 449 450 } 450 451 #endif /* SCOTCH_DEBUG_ARCH1 */ 451 452 452 - #ifndef MATLAB 453 + #ifndef NOFILEIO 453 454 if ((intLoad (stream, &archptr->c[0]) != 1) || 454 455 (intLoad (stream, &archptr->c[1]) != 1) || 455 456 (intLoad (stream, &archptr->c[2]) != 1) || 456 457 (archptr->c[0] < 1) || (archptr->c[1] < 1) || (archptr->c[2] < 1)) { 457 - #else /* MATLAB*/458 -if ((napar < 3) ||459 -((archptr->c[0]=archpar[0]) < 1) ||460 -((archptr->c[1]=archpar[1]) < 1) ||461 -((archptr->c[2]=archpar[2]) < 1)) {462 - #endif /* MATLAB*/458 + #else /* NOFILEIO */ 459 + if ((napar < 3) || 460 + ((archptr->c[0]=archpar[0]) < 1) || 461 + ((archptr->c[1]=archpar[1]) < 1) || 462 + ((archptr->c[2]=archpar[2]) < 1)) { 463 + #endif /* NOFILEIO */ 463 464 errorPrint ("archMesh3ArchLoad: bad input"); 464 465 return (1); 465 466 } 466 --- 431,440 ---- 467 diff -rc src/src/libscotch/arch_mesh.h old/src/libscotch/arch_mesh.h 468 *** src/src/libscotch/arch_mesh.h 2010-07-19 12:08:20.514684479 -0700469 --- old/src/libscotch/arch_mesh.h 2008-05-22 06:44:41.000000000 -0700 470 *** ************471 *** 96,106 **** 467 diff -rc src/src/libscotch/arch_mesh.h new5/src/libscotch/arch_mesh.h 468 *** src/src/libscotch/arch_mesh.h 2008-05-22 06:44:41.000000000 -0700 469 --- new5/src/libscotch/arch_mesh.h 2010-07-19 14:58:58.560698969 -0700 470 *************** 471 *** 96,102 **** 472 --- 96,106 ---- 472 473 #define static 473 474 #endif 474 475 475 - #ifndef MATLAB 476 + #ifndef NOFILEIO 476 477 int archMesh2ArchLoad (ArchMesh2 * restrict const, FILE * restrict const); 477 - #else /* MATLAB*/478 -int archMesh2ArchLoad (ArchMesh2 * restrict const, FILE * restrict const, const Anum, const Anum *);479 - #endif /* MATLAB*/478 + #else /* NOFILEIO */ 479 + int archMesh2ArchLoad (ArchMesh2 * restrict const, FILE * restrict const, const Anum, const Anum *); 480 + #endif /* NOFILEIO */ 480 481 int archMesh2ArchSave (const ArchMesh2 * const, FILE * restrict const); 481 482 #define archMesh2ArchFree NULL 482 483 ArchDomNum archMesh2DomNum (const ArchMesh2 * const, const ArchMesh2Dom * const); 483 --- 96,102 ---- 484 *** ************485 *** 118,128 **** 484 *************** 485 *** 114,120 **** 486 --- 118,128 ---- 486 487 int archMesh2DomMpiType (const ArchMesh2 * const, MPI_Datatype * const); 487 488 #endif /* SCOTCH_PTSCOTCH */ 488 489 489 - #ifndef MATLAB 490 + #ifndef NOFILEIO 490 491 int archMesh3ArchLoad (ArchMesh3 * restrict const, FILE * restrict const); 491 - #else /* MATLAB*/492 -int archMesh3ArchLoad (ArchMesh3 * restrict const, FILE * restrict const, const Anum, const Anum *);493 - #endif /* MATLAB*/492 + #else /* NOFILEIO */ 493 + int archMesh3ArchLoad (ArchMesh3 * restrict const, FILE * restrict const, const Anum, const Anum *); 494 + #endif /* NOFILEIO */ 494 495 int archMesh3ArchSave (const ArchMesh3 * const, FILE * restrict const); 495 496 #define archMesh3ArchFree NULL 496 497 ArchDomNum archMesh3DomNum (const ArchMesh3 * const, const ArchMesh3Dom * const); 497 --- 114,120 ---- 498 diff -rc src/src/libscotch/arch_tleaf.c old/src/libscotch/arch_tleaf.c 499 *** src/src/libscotch/arch_tleaf.c 2010-07-19 12:08:20.517684499 -0700 500 --- old/src/libscotch/arch_tleaf.c 2008-05-22 06:44:41.000000000 -0700 501 *************** 502 *** 92,109 **** 503 int 504 archTleafArchLoad ( 505 ArchTleaf * restrict const archptr, 506 ! FILE * restrict const stream 507 ! #ifdef MATLAB 508 ! , 509 ! const Anum napar, 510 ! const Anum * archpar 511 ! #endif /* MATLAB */ 512 ! ) 513 ! { 514 ! #ifdef MATLAB 515 ! printf("archTleafArchLoad - napar=%d,archpar=%p\n",napar,archpar); 516 ! #endif /* MATLAB */ 517 ! 518 #ifdef SCOTCH_DEBUG_ARCH1 519 if ((sizeof (ArchTleaf) > sizeof (ArchDummy)) || 520 (sizeof (ArchTleafDom) > sizeof (ArchDomDummy))) { 521 --- 92,99 ---- 498 diff -rc src/src/libscotch/arch_tleaf.c new5/src/libscotch/arch_tleaf.c 499 *** src/src/libscotch/arch_tleaf.c 2008-05-22 06:44:41.000000000 -0700 500 --- new5/src/libscotch/arch_tleaf.c 2010-07-20 10:09:30.666530915 -0700 501 *************** 502 *** 92,99 **** 522 503 int 523 504 archTleafArchLoad ( … … 528 509 if ((sizeof (ArchTleaf) > sizeof (ArchDummy)) || 529 510 (sizeof (ArchTleafDom) > sizeof (ArchDomDummy))) { 530 *************** 531 *** 112,118 **** 511 --- 92,109 ---- 512 int 513 archTleafArchLoad ( 514 ArchTleaf * restrict const archptr, 515 ! FILE * restrict const stream 516 ! #ifdef NOFILEIO 517 ! , 518 ! const Anum napar, 519 ! const Anum * archpar 520 ! #endif /* NOFILEIO */ 521 ! ) 522 ! { 523 ! #ifdef NOFILEIO 524 ! // printf("archTleafArchLoad - napar=%d,archpar=%p\n",napar,archpar); 525 ! #endif /* NOFILEIO */ 526 ! 527 #ifdef SCOTCH_DEBUG_ARCH1 528 if ((sizeof (ArchTleaf) > sizeof (ArchDummy)) || 529 (sizeof (ArchTleafDom) > sizeof (ArchDomDummy))) { 530 *************** 531 *** 102,107 **** 532 --- 112,118 ---- 532 533 } 533 534 #endif /* SCOTCH_DEBUG_ARCH1 */ 534 535 535 - #ifndef MATLAB 536 + #ifndef NOFILEIO 536 537 if ((intLoad (stream, &archptr->leafdep) != 1) || 537 538 (intLoad (stream, &archptr->clusdep) != 1) || 538 539 (intLoad (stream, &archptr->linkval) != 1) || 539 --- 102,107 ---- 540 *** ************541 *** 120,132 **** 540 *************** 541 *** 109,114 **** 542 --- 120,132 ---- 542 543 (archptr->clusdep < 0) || 543 544 (archptr->clusdep > archptr->leafdep) || 544 545 (archptr->linkval < 1)) { 545 - #else /* MATLAB*/546 -if ((napar < 3) ||547 -((archptr->leafdep=archpar[0]) < 1) ||548 -((archptr->clusdep=archpar[1]) < 0) ||549 -( archptr->clusdep > archptr->leafdep) ||550 -((archptr->linkval=archpar[2]) < 1)) {551 - #endif /* MATLAB*/546 + #else /* NOFILEIO */ 547 + if ((napar < 3) || 548 + ((archptr->leafdep=archpar[0]) < 1) || 549 + ((archptr->clusdep=archpar[1]) < 0) || 550 + ( archptr->clusdep > archptr->leafdep) || 551 + ((archptr->linkval=archpar[2]) < 1)) { 552 + #endif /* NOFILEIO */ 552 553 errorPrint ("archTleafArchLoad: bad input"); 553 554 return (1); 554 555 } 555 --- 109,114 ---- 556 diff -rc src/src/libscotch/arch_tleaf.h old/src/libscotch/arch_tleaf.h 557 *** src/src/libscotch/arch_tleaf.h 2010-07-19 12:08:20.519684513-0700558 --- old/src/libscotch/arch_tleaf.h 2008-05-22 06:44:41.000000000 -0700 559 *** ************560 *** 89,99 **** 556 diff -rc src/src/libscotch/arch_tleaf.h new5/src/libscotch/arch_tleaf.h 557 *** src/src/libscotch/arch_tleaf.h 2008-05-22 06:44:41.000000000 -0700 558 --- new5/src/libscotch/arch_tleaf.h 2010-07-19 14:59:12.907720214 -0700 559 *************** 560 *** 89,95 **** 561 --- 89,99 ---- 561 562 #define static 562 563 #endif 563 564 564 - #ifndef MATLAB 565 + #ifndef NOFILEIO 565 566 int archTleafArchLoad (ArchTleaf * restrict const, FILE * restrict const); 566 - #else /* MATLAB*/567 -int archTleafArchLoad (ArchTleaf * restrict const, FILE * restrict const, const Anum, const Anum *);568 - #endif /* MATLAB*/567 + #else /* NOFILEIO */ 568 + int archTleafArchLoad (ArchTleaf * restrict const, FILE * restrict const, const Anum, const Anum *); 569 + #endif /* NOFILEIO */ 569 570 int archTleafArchSave (const ArchTleaf * const, FILE * restrict const); 570 571 #define archTleafArchFree NULL 571 572 ArchDomNum archTleafDomNum (const ArchTleaf * const, const ArchTleafDom * const); 572 --- 89,95 ---- 573 diff -rc src/src/libscotch/arch_torus.c old/src/libscotch/arch_torus.c 574 *** src/src/libscotch/arch_torus.c 2010-07-19 12:08:20.522684534 -0700 575 --- old/src/libscotch/arch_torus.c 2008-05-22 06:44:41.000000000 -0700 576 *************** 577 *** 90,107 **** 578 int 579 archTorus2ArchLoad ( 580 ArchTorus2 * restrict const archptr, 581 ! FILE * restrict const stream 582 ! #ifdef MATLAB 583 ! , 584 ! const Anum napar, 585 ! const Anum * archpar 586 ! #endif /* MATLAB */ 587 ! ) 588 ! { 589 ! #ifdef MATLAB 590 ! printf("archTorus2ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 591 ! #endif /* MATLAB */ 592 ! 593 #ifdef SCOTCH_DEBUG_ARCH1 594 if ((sizeof (ArchTorus2) > sizeof (ArchDummy)) || 595 (sizeof (ArchTorus2Dom) > sizeof (ArchDomDummy))) { 596 --- 90,97 ---- 573 diff -rc src/src/libscotch/arch_torus.c new5/src/libscotch/arch_torus.c 574 *** src/src/libscotch/arch_torus.c 2008-05-22 06:44:41.000000000 -0700 575 --- new5/src/libscotch/arch_torus.c 2010-07-20 10:09:36.887536618 -0700 576 *************** 577 *** 90,97 **** 597 578 int 598 579 archTorus2ArchLoad ( … … 603 584 if ((sizeof (ArchTorus2) > sizeof (ArchDummy)) || 604 585 (sizeof (ArchTorus2Dom) > sizeof (ArchDomDummy))) { 605 *************** 606 *** 110,124 **** 586 --- 90,107 ---- 587 int 588 archTorus2ArchLoad ( 589 ArchTorus2 * restrict const archptr, 590 ! FILE * restrict const stream 591 ! #ifdef NOFILEIO 592 ! , 593 ! const Anum napar, 594 ! const Anum * archpar 595 ! #endif /* NOFILEIO */ 596 ! ) 597 ! { 598 ! #ifdef NOFILEIO 599 ! // printf("archTorus2ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 600 ! #endif /* NOFILEIO */ 601 ! 602 #ifdef SCOTCH_DEBUG_ARCH1 603 if ((sizeof (ArchTorus2) > sizeof (ArchDummy)) || 604 (sizeof (ArchTorus2Dom) > sizeof (ArchDomDummy))) { 605 *************** 606 *** 100,108 **** 607 --- 110,124 ---- 607 608 } 608 609 #endif /* SCOTCH_DEBUG_ARCH1 */ 609 610 610 - #ifndef MATLAB 611 + #ifndef NOFILEIO 611 612 if ((intLoad (stream, &archptr->c[0]) != 1) || 612 613 (intLoad (stream, &archptr->c[1]) != 1) || 613 614 (archptr->c[0] < 1) || (archptr->c[1] < 1)) { 614 - #else /* MATLAB*/615 -if ((napar < 2) ||616 -((archptr->c[0]=archpar[0]) < 1) ||617 -((archptr->c[1]=archpar[1]) < 1)) {618 - #endif /* MATLAB*/615 + #else /* NOFILEIO */ 616 + if ((napar < 2) || 617 + ((archptr->c[0]=archpar[0]) < 1) || 618 + ((archptr->c[1]=archpar[1]) < 1)) { 619 + #endif /* NOFILEIO */ 619 620 errorPrint ("archTorus2ArchLoad: bad input"); 620 621 return (1); 621 622 } 622 --- 100,108 ---- 623 *************** 624 *** 379,396 **** 625 int 626 archTorus3ArchLoad ( 627 ArchTorus3 * restrict const archptr, 628 ! FILE * restrict const stream 629 ! #ifdef MATLAB 630 ! , 631 ! const Anum napar, 632 ! const Anum * archpar 633 ! #endif /* MATLAB */ 634 ! ) 635 ! { 636 ! #ifdef MATLAB 637 ! printf("archTorus3ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 638 ! #endif /* MATLAB */ 639 ! 640 #ifdef SCOTCH_DEBUG_ARCH1 641 if ((sizeof (ArchTorus3) > sizeof (ArchDummy)) || 642 (sizeof (ArchTorus3Dom) > sizeof (ArchDomDummy))) { 643 --- 363,370 ---- 623 *************** 624 *** 363,370 **** 644 625 int 645 626 archTorus3ArchLoad ( … … 650 631 if ((sizeof (ArchTorus3) > sizeof (ArchDummy)) || 651 632 (sizeof (ArchTorus3Dom) > sizeof (ArchDomDummy))) { 652 *************** 653 *** 399,415 **** 633 --- 379,396 ---- 634 int 635 archTorus3ArchLoad ( 636 ArchTorus3 * restrict const archptr, 637 ! FILE * restrict const stream 638 ! #ifdef NOFILEIO 639 ! , 640 ! const Anum napar, 641 ! const Anum * archpar 642 ! #endif /* NOFILEIO */ 643 ! ) 644 ! { 645 ! #ifdef NOFILEIO 646 ! // printf("archTorus3ArchLoad - napar=%d,archpar=%p\n",napar,archpar); 647 ! #endif /* NOFILEIO */ 648 ! 649 #ifdef SCOTCH_DEBUG_ARCH1 650 if ((sizeof (ArchTorus3) > sizeof (ArchDummy)) || 651 (sizeof (ArchTorus3Dom) > sizeof (ArchDomDummy))) { 652 *************** 653 *** 373,382 **** 654 --- 399,415 ---- 654 655 } 655 656 #endif /* SCOTCH_DEBUG_ARCH1 */ 656 657 657 - #ifndef MATLAB 658 + #ifndef NOFILEIO 658 659 if ((intLoad (stream, &archptr->c[0]) != 1) || 659 660 (intLoad (stream, &archptr->c[1]) != 1) || 660 661 (intLoad (stream, &archptr->c[2]) != 1) || 661 662 (archptr->c[0] < 1) || (archptr->c[1] < 1) || (archptr->c[2] < 1)) { 662 - #else /* MATLAB*/663 -if ((napar < 3) ||664 -((archptr->c[0]=archpar[0]) < 1) ||665 -((archptr->c[1]=archpar[1]) < 1) ||666 -((archptr->c[2]=archpar[2]) < 1)) {667 - #endif /* MATLAB*/663 + #else /* NOFILEIO */ 664 + if ((napar < 3) || 665 + ((archptr->c[0]=archpar[0]) < 1) || 666 + ((archptr->c[1]=archpar[1]) < 1) || 667 + ((archptr->c[2]=archpar[2]) < 1)) { 668 + #endif /* NOFILEIO */ 668 669 errorPrint ("archTorus3ArchLoad: bad input"); 669 670 return (1); 670 671 } 671 --- 373,382 ---- 672 diff -rc src/src/libscotch/arch_torus.h old/src/libscotch/arch_torus.h 673 *** src/src/libscotch/arch_torus.h 2010-07-19 12:08:20.524684548 -0700674 --- old/src/libscotch/arch_torus.h 2008-05-22 06:44:41.000000000 -0700 675 *** ************676 *** 96,106 **** 672 diff -rc src/src/libscotch/arch_torus.h new5/src/libscotch/arch_torus.h 673 *** src/src/libscotch/arch_torus.h 2008-05-22 06:44:41.000000000 -0700 674 --- new5/src/libscotch/arch_torus.h 2010-07-19 14:59:34.966752838 -0700 675 *************** 676 *** 96,102 **** 677 --- 96,106 ---- 677 678 #define static 678 679 #endif 679 680 680 - #ifndef MATLAB 681 + #ifndef NOFILEIO 681 682 int archTorus2ArchLoad (ArchTorus2 * restrict const, FILE * restrict const); 682 - #else /* MATLAB*/683 -int archTorus2ArchLoad (ArchTorus2 * restrict const, FILE * restrict const, const Anum, const Anum *);684 - #endif /* MATLAB*/683 + #else /* NOFILEIO */ 684 + int archTorus2ArchLoad (ArchTorus2 * restrict const, FILE * restrict const, const Anum, const Anum *); 685 + #endif /* NOFILEIO */ 685 686 int archTorus2ArchSave (const ArchTorus2 * const, FILE * restrict const); 686 687 #define archTorus2ArchFree NULL 687 688 ArchDomNum archTorus2DomNum (const ArchTorus2 * const, const ArchTorus2Dom * const); 688 --- 96,102 ---- 689 *** ************690 *** 118,128 **** 689 *************** 690 *** 114,120 **** 691 --- 118,128 ---- 691 692 int archTorus2DomMpiType (const ArchTorus2 * const, MPI_Datatype * const); 692 693 #endif /* SCOTCH_PTSCOTCH */ 693 694 694 - #ifndef MATLAB 695 + #ifndef NOFILEIO 695 696 int archTorus3ArchLoad (ArchTorus3 * restrict const, FILE * restrict const); 696 - #else /* MATLAB*/697 -int archTorus3ArchLoad (ArchTorus3 * restrict const, FILE * restrict const, const Anum, const Anum *);698 - #endif /* MATLAB*/697 + #else /* NOFILEIO */ 698 + int archTorus3ArchLoad (ArchTorus3 * restrict const, FILE * restrict const, const Anum, const Anum *); 699 + #endif /* NOFILEIO */ 699 700 int archTorus3ArchSave (const ArchTorus3 * const, FILE * restrict const); 700 701 #define archTorus3ArchFree NULL 701 702 ArchDomNum archTorus3DomNum (const ArchTorus3 * const, const ArchTorus3Dom * const); 702 --- 114,120 ---- 703 diff -rc src/src/libscotch/common.c old/src/libscotch/common.c 704 *** src/src/libscotch/common.c 2010-07-19 12:08:20.527684569-0700705 --- old/src/libscotch/common.c 2008-05-22 06:44:41.000000000 -0700 706 *** ************707 *** 100,112 **** 703 diff -rc src/src/libscotch/common.c new5/src/libscotch/common.c 704 *** src/src/libscotch/common.c 2008-05-22 06:44:41.000000000 -0700 705 --- new5/src/libscotch/common.c 2010-07-15 15:09:01.721095620 -0700 706 *************** 707 *** 100,106 **** 708 --- 100,112 ---- 708 709 { 709 710 const char ** cptr; 710 711 711 -#ifndef MATLAB712 + #ifndef MATLAB 712 713 fprintf (stream, "Usage is:\n"); 713 714 for (cptr = data; *cptr != NULL; cptr ++) 714 715 fprintf (stream, " %s\n", *cptr); 715 -#else /* MATLAB */716 -mexPrintf ("Usage is:\n");717 -for (cptr = data; *cptr != NULL; cptr ++)718 -mexPrintf (" %s\n", *cptr);719 -#endif /* MATLAB */716 + #else /* MATLAB */ 717 + mexPrintf ("Usage is:\n"); 718 + for (cptr = data; *cptr != NULL; cptr ++) 719 + mexPrintf (" %s\n", *cptr); 720 + #endif /* MATLAB */ 720 721 } 721 --- 100,106 ---- 722 diff -rc src/src/libscotch/common.h old/src/libscotch/common.h 723 *** src/src/libscotch/common.h 2010-07-19 12:08:20.529684583-0700724 --- old/src/libscotch/common.h 2009-02-06 14:20:55.000000000 -0800 725 *** ************726 *** 1,5 **** 727 -#ifndef _SCOTCH_COMMON_H_728 -#define _SCOTCH_COMMON_H_722 diff -rc src/src/libscotch/common.h new5/src/libscotch/common.h 723 *** src/src/libscotch/common.h 2009-02-06 14:20:55.000000000 -0800 724 --- new5/src/libscotch/common.h 2010-07-21 14:16:02.178336967 -0700 725 *************** 726 *** 1,3 **** 727 --- 1,5 ---- 728 + #ifndef _SCOTCH_COMMON_H_ 729 + #define _SCOTCH_COMMON_H_ 729 730 /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS 730 731 ** 731 732 ** This file is part of the Scotch software package for static mapping, 732 --- 1,3 ---- 733 *** ************734 *** 81,87 **** 733 *************** 734 *** 79,84 **** 735 --- 81,87 ---- 735 736 #include <sys/resource.h> 736 737 #endif /* COMMON_TIMING_OLD */ 737 738 #include <unistd.h> 738 -#include <sys/param.h>739 + #include <sys/param.h> 739 740 740 741 #ifdef SCOTCH_PTSCOTCH 741 742 #include <mpi.h> 742 --- 79,84 ---- 743 *************** 744 *** 109,114 **** 745 --- 106,113 ---- 743 *************** 744 *** 106,113 **** 746 745 #define memCpy(dst,src,siz) memcpy((dst),(src),(siz)) 747 746 #define memMov(dst,src,siz) memmove((dst),(src),(siz)) 748 747 749 +#define MIN(x,y) (((x) < (y)) ? (x) : (y))750 +#define MAX(x,y) (((x) < (y)) ? (y) : (x))748 - #define MIN(x,y) (((x) < (y)) ? (x) : (y)) 749 - #define MAX(x,y) (((x) < (y)) ? (y) : (x)) 751 750 #define ABS(x) MAX ((x), -(x)) 752 751 #define SIGN(x) (((x) < 0) ? -1 : 1) 753 752 754 *************** 755 *** 202,219 **** 753 --- 109,114 ---- 754 *************** 755 *** 201,214 **** 756 --- 202,224 ---- 756 757 int fileUncompressType (const char * const); 757 758 int fileNameDistExpand (char ** const, const int, const int, const int); 758 759 759 -#ifdef __cplusplus760 -extern "C" {761 -#endif /* __cplusplus */762 -760 + #ifdef __cplusplus 761 + extern "C" { 762 + #endif /* __cplusplus */ 763 + 763 764 void errorProg (const char * const); 764 765 void errorPrint (const char * const, ...); 765 766 void errorPrintW (const char * const, ...); 766 767 767 -#ifdef __cplusplus768 -}769 -#endif /* __cplusplus */770 -768 + #ifdef __cplusplus 769 + } 770 + #endif /* __cplusplus */ 771 + 771 772 int intLoad (FILE * const, INT * const); 772 773 int intSave (FILE * const, const INT); 773 774 void intAscn (INT * const, const INT, const INT); 774 --- 201,210 ---- 775 *************** 776 *** 258,262 **** 775 void intPerm (INT * const, const INT); 776 + void intRandResetStatic (void); 777 void intRandReset (void); 778 void intRandInit (void); 779 INT intRandVal (INT); 780 *************** 781 *** 249,251 **** 782 --- 259,263 ---- 777 783 void nl##__ pl \ 778 784 { nu pc; } \ 779 785 void nu pl 780 -781 -#endif //#ifndef _SCOTCH_COMMON_H_782 --- 249,251 ---- 783 diff -rc src/src/libscotch/common_integer.c old/src/libscotch/common_integer.c 784 *** src/src/libscotch/common_integer.c 2010-07-19 12:11:35.015039059 -0700785 --- old/src/libscotch/common_integer.c 2009-01-21 01:32:32.000000000 -0800 786 *** ************787 *** 191,205 **** 786 + 787 + #endif //#ifndef _SCOTCH_COMMON_H_ 788 diff -rc src/src/libscotch/common_integer.c new5/src/libscotch/common_integer.c 789 *** src/src/libscotch/common_integer.c 2009-01-21 01:32:32.000000000 -0800 790 --- new5/src/libscotch/common_integer.c 2010-07-20 10:11:29.029639629 -0700 791 *************** 792 *** 191,196 **** 793 --- 191,209 ---- 788 794 static volatile int intrandflag = 0; /*+ Flag set if generator already initialized +*/ 789 795 static unsigned int intrandseed = 1; /*+ Random seed +*/ 790 796 791 - void 792 - intRandResetStatic (void) 793 - { 794 - printf("intRandResetStatic begin -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 795 - intrandflag = 0; /*+ Flag set if generator already initialized +*/ 796 - intrandseed = 1; /*+ Random seed +*/ 797 - printf("intRandResetStatic end -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 798 - } 799 - 797 + void 798 + intRandResetStatic (void) 799 + { 800 + #ifdef MATLAB 801 + // printf("intRandResetStatic begin - intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 802 + #endif /* MATLAB */ 803 + intrandflag = 0; /*+ Flag set if generator already initialized +*/ 804 + intrandseed = 1; /*+ Random seed +*/ 805 + #ifdef MATLAB 806 + // printf("intRandResetStatic end - intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 807 + #endif /* MATLAB */ 808 + } 809 + 800 810 /* This routine initializes the pseudo-random 801 811 ** generator if necessary. In order for multi-sequential 802 812 ** programs to have exactly the same behavior on any 803 --- 191,196 ---- 804 *** ************805 *** 214,220 **** 813 *************** 814 *** 205,210 **** 815 --- 218,226 ---- 806 816 void 807 817 intRandInit (void) 808 818 { 809 - printf("intRandInit begin -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 819 + #ifdef MATLAB 820 + // printf("intRandInit begin - intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 821 + #endif /* MATLAB */ 810 822 if (intrandflag == 0) { /* If generator not yet initialized */ 811 823 #if ! ((defined COMMON_DEBUG) || (defined COMMON_RANDOM_FIXED_SEED) || (defined SCOTCH_DETERMINISTIC)) 812 824 intrandseed = time (NULL); /* Set random seed if needed */ 813 --- 205,210 ---- 814 *** ************815 *** 226,232 **** 825 *************** 826 *** 216,221 **** 827 --- 232,240 ---- 816 828 #endif /* COMMON_RANDOM_RAND */ 817 829 intrandflag = 1; /* Generator has been initialized */ 818 830 } 819 - printf("intRandInit end -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 831 + #ifdef MATLAB 832 + // printf("intRandInit end - intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 833 + #endif /* MATLAB */ 820 834 } 821 835 822 836 /* This routine reinitializes the pseudo-random 823 --- 216,221 ---- 824 *** ************825 *** 239,245 **** 837 *************** 838 *** 228,233 **** 839 --- 247,255 ---- 826 840 void 827 841 intRandReset (void) 828 842 { 829 - printf("intRandReset begin -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 843 + #ifdef MATLAB 844 + // printf("intRandReset begin - intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 845 + #endif /* MATLAB */ 830 846 if (intrandflag != 0) { /* Keep seed computed during first initialization */ 831 847 #ifdef COMMON_RANDOM_RAND 832 848 srand (intrandseed); 833 --- 228,233 ---- 834 *** ************835 *** 249,255 **** 849 *************** 850 *** 237,242 **** 851 --- 259,267 ---- 836 852 } 837 853 else 838 854 intRandInit (); 839 - printf("intRandReset end -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 855 + #ifdef MATLAB 856 + // printf("intRandReset end - intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed); 857 + #endif /* MATLAB */ 840 858 } 841 859 842 860 /*********************/ 843 --- 237,242 ---- 844 diff -rc src/src/libscotch/common_memory.c old/src/libscotch/common_memory.c 845 *** src/src/libscotch/common_memory.c 2010-07-19 12:08:20.535684625-0700846 --- old/src/libscotch/common_memory.c 2009-01-03 02:16:11.000000000 -0800 847 *** ************848 *** 87,95 **** 861 diff -rc src/src/libscotch/common_memory.c new5/src/libscotch/common_memory.c 862 *** src/src/libscotch/common_memory.c 2009-01-03 02:16:11.000000000 -0800 863 --- new5/src/libscotch/common_memory.c 2010-07-15 15:09:01.740095640 -0700 864 *************** 865 *** 87,93 **** 866 --- 87,95 ---- 849 867 size_t newadd; 850 868 byte * newptr; 851 869 852 -printf("memAllocRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);870 + printf("memAllocRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 853 871 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 854 -printf("memAllocRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);872 + printf("memAllocRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 855 873 if (muteflag != 0) { /* Unsafe code with respect to race conditions but should work as first allocs are sequential */ 856 874 muteflag = 0; 857 875 pthread_mutex_init (&mutelocdat, NULL); /* Initialize local mutex */ 858 --- 87,93 ---- 859 *** ************860 *** 111,120 **** 876 *************** 877 *** 109,116 **** 878 --- 111,120 ---- 861 879 862 880 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 863 881 pthread_mutex_unlock (&mutelocdat); /* Unlock local mutex */ 864 -printf("memAllocRecord end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);882 + printf("memAllocRecord end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 865 883 #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */ 866 884 867 -printf("memAllocRecord end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);885 + printf("memAllocRecord end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 868 886 return ((void *) newptr); /* Return skewed pointer or NULL */ 869 887 } 870 888 871 --- 109,116 ---- 872 *** ************873 *** 128,139 **** 889 *************** 890 *** 124,133 **** 891 --- 128,139 ---- 874 892 size_t oldsiz; 875 893 size_t newadd; 876 894 877 -printf("memReallocRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);895 + printf("memReallocRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 878 896 tmpptr = ((byte *) oldptr) - COMMON_MEMORY_SKEW; 879 897 oldsiz = *((size_t *) tmpptr); 880 898 881 899 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 882 -printf("memReallocRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);900 + printf("memReallocRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 883 901 pthread_mutex_lock (&mutelocdat); /* Lock local mutex */ 884 902 #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */ 885 903 886 --- 124,133 ---- 887 *** ************888 *** 151,160 **** 904 *************** 905 *** 145,152 **** 906 --- 151,160 ---- 889 907 890 908 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 891 909 pthread_mutex_unlock (&mutelocdat); /* Unlock local mutex */ 892 -printf("memReallocRecord end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);910 + printf("memReallocRecord end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 893 911 #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */ 894 912 895 -printf("memReallocRecord end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);913 + printf("memReallocRecord end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 896 914 return ((void *) newptr); /* Return skewed pointer or NULL */ 897 915 } 898 916 899 --- 145,152 ---- 900 *** ************901 *** 165,176 **** 917 *************** 918 *** 157,166 **** 919 --- 165,176 ---- 902 920 byte * tmpptr; 903 921 size_t oldsiz; 904 922 905 -printf("memFreeRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);923 + printf("memFreeRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 906 924 tmpptr = ((byte *) oldptr) - COMMON_MEMORY_SKEW; 907 925 oldsiz = *((size_t *) tmpptr); 908 926 909 927 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 910 -printf("memFreeRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);928 + printf("memFreeRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 911 929 pthread_mutex_lock (&mutelocdat); /* Lock local mutex */ 912 930 #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */ 913 931 914 --- 157,166 ---- 915 *** ************916 *** 179,187 **** 932 *************** 933 *** 169,175 **** 934 --- 179,187 ---- 917 935 918 936 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 919 937 pthread_mutex_unlock (&mutelocdat); /* Unlock local mutex */ 920 -printf("memFreeRecord end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);938 + printf("memFreeRecord end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 921 939 #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */ 922 -printf("memFreeRecord end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);940 + printf("memFreeRecord end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 923 941 } 924 942 925 943 size_t 926 --- 169,175 ---- 927 *** ************928 *** 189,197 **** 944 *************** 945 *** 177,183 **** 946 --- 189,197 ---- 929 947 { 930 948 size_t curmax; 931 949 932 -printf("memMax begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);950 + printf("memMax begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 933 951 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 934 -printf("memMax begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);952 + printf("memMax begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 935 953 pthread_mutex_lock (&mutelocdat); /* Lock local mutex */ 936 954 #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */ 937 955 938 --- 177,183 ---- 939 *** ************940 *** 199,208 **** 956 *************** 957 *** 185,192 **** 958 --- 199,208 ---- 941 959 942 960 #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) 943 961 pthread_mutex_unlock (&mutelocdat); /* Unlock local mutex */ 944 -printf("memMax end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);962 + printf("memMax end -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat); 945 963 #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */ 946 964 947 -printf("memMax end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);965 + printf("memMax end -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax); 948 966 return (curmax); 949 967 } 950 968 #endif /* COMMON_MEMORY_TRACE */ 951 --- 185,192 ---- 952 diff -rc src/src/libscotch/dummysizes.c old/src/libscotch/dummysizes.c 953 *** src/src/libscotch/dummysizes.c 2010-07-19 12:08:20.538684646-0700954 --- old/src/libscotch/dummysizes.c 2009-05-09 16:08:02.000000000 -0700 955 *** ************956 *** 267,273 **** 969 diff -rc src/src/libscotch/dummysizes.c new5/src/libscotch/dummysizes.c 970 *** src/src/libscotch/dummysizes.c 2009-05-09 16:08:02.000000000 -0700 971 --- new5/src/libscotch/dummysizes.c 2010-07-15 15:09:01.746095647 -0700 972 *************** 973 *** 267,271 **** 974 --- 267,273 ---- 957 975 } 958 976 #endif /* SCOTCH_DEBUG_MAIN1 */ 959 977 960 -#ifndef MATLAB978 + #ifndef MATLAB 961 979 exit (0); 962 -#endif /* MATLAB */980 + #endif /* MATLAB */ 963 981 } 964 --- 267,271 ---- 965 diff -rc src/src/libscotch/graph.c old/src/libscotch/graph.c 966 *** src/src/libscotch/graph.c 2010-07-19 12:08:20.540684660 -0700 967 --- old/src/libscotch/graph.c 2008-05-22 06:44:42.000000000 -0700 968 *************** 969 *** 135,144 **** 982 diff -rc src/src/libscotch/graph.c new5/src/libscotch/graph.c 983 *** src/src/libscotch/graph.c 2008-05-22 06:44:42.000000000 -0700 984 --- new5/src/libscotch/graph.c 2010-07-15 15:09:01.752095654 -0700 985 *************** 986 *** 135,141 **** 987 if ((grafptr->velotax != NULL) && /* Free graph tables */ 988 ((grafptr->flagval & GRAPHVERTGROUP) == 0)) 989 memFree (grafptr->velotax + grafptr->baseval); 990 ! if (grafptr->vlbltax != NULL) 991 memFree (grafptr->vlbltax + grafptr->baseval); 992 if ((grafptr->edlotax != NULL) && 993 ((grafptr->flagval & GRAPHEDGEGROUP) == 0)) 994 --- 135,144 ---- 970 995 if ((grafptr->velotax != NULL) && /* Free graph tables */ 971 996 ((grafptr->flagval & GRAPHVERTGROUP) == 0)) … … 978 1003 if ((grafptr->edlotax != NULL) && 979 1004 ((grafptr->flagval & GRAPHEDGEGROUP) == 0)) 980 --- 135,141 ---- 981 if ((grafptr->velotax != NULL) && /* Free graph tables */ 982 ((grafptr->flagval & GRAPHVERTGROUP) == 0)) 983 memFree (grafptr->velotax + grafptr->baseval); 984 ! if (grafptr->vlbltax != NULL) 985 memFree (grafptr->vlbltax + grafptr->baseval); 986 if ((grafptr->edlotax != NULL) && 987 ((grafptr->flagval & GRAPHEDGEGROUP) == 0)) 988 diff -rc src/src/libscotch/graph.h old/src/libscotch/graph.h 989 *** src/src/libscotch/graph.h 2010-07-19 12:08:20.543684680 -0700 990 --- old/src/libscotch/graph.h 2008-06-01 02:49:11.000000000 -0700 991 *************** 992 *** 159,169 **** 1005 diff -rc src/src/libscotch/graph.h new5/src/libscotch/graph.h 1006 *** src/src/libscotch/graph.h 2008-06-01 02:49:11.000000000 -0700 1007 --- new5/src/libscotch/graph.h 2010-07-19 15:00:58.693876214 -0700 1008 *************** 1009 *** 159,165 **** 1010 --- 159,169 ---- 993 1011 int graphInit (Graph * const); 994 1012 void graphExit (Graph * const); 995 1013 void graphFree (Graph * const); 996 - #ifndef MATLAB 1014 + #ifndef NOFILEIO 997 1015 int graphLoad (Graph * const, FILE * const, const Gnum, const GraphFlag); 998 - #else /* MATLAB*/999 -int graphLoad (Graph * const, FILE * const, const Gnum, const GraphFlag, const Gnum, const Gnum, const Gnum*, const Gnum*, const Gnum*, const Gnum*, const Gnum*);1000 - #endif /* MATLAB*/1016 + #else /* NOFILEIO */ 1017 + int graphLoad (Graph * const, FILE * const, const Gnum, const GraphFlag, const Gnum, const Gnum, const Gnum*, const Gnum*, const Gnum*, const Gnum*, const Gnum*); 1018 + #endif /* NOFILEIO */ 1001 1019 int graphLoad2 (const Gnum, const Gnum, const Gnum * const, const Gnum * const, Gnum * restrict const, const Gnum, const Gnum * const); 1002 1020 int graphSave (const Graph * const, FILE * const); 1003 1021 Gnum graphBase (Graph * const, const Gnum); 1004 --- 159,165 ---- 1005 diff -rc src/src/libscotch/graph_io.c old/src/libscotch/graph_io.c 1006 *** src/src/libscotch/graph_io.c 2010-07-19 12:08:20.546684701 -0700 1007 --- old/src/libscotch/graph_io.c 2008-05-22 06:44:42.000000000 -0700 1008 *************** 1009 *** 86,103 **** 1022 diff -rc src/src/libscotch/graph_io.c new5/src/libscotch/graph_io.c 1023 *** src/src/libscotch/graph_io.c 2008-05-22 06:44:42.000000000 -0700 1024 --- new5/src/libscotch/graph_io.c 2010-07-20 10:06:59.951393115 -0700 1025 *************** 1026 *** 86,92 **** 1027 Graph * restrict const grafptr, /* Graph structure to fill */ 1028 FILE * const stream, /* Stream from which to read graph data */ 1029 const Gnum baseval, /* Base value (-1 means keep file base) */ 1030 ! const GraphFlag flagval) /* Graph loading flags */ 1031 { 1032 Gnum edgenum; /* Number of edges really allocated */ 1033 Gnum edgennd; 1034 --- 86,103 ---- 1010 1035 Graph * restrict const grafptr, /* Graph structure to fill */ 1011 1036 FILE * const stream, /* Stream from which to read graph data */ 1012 1037 const Gnum baseval, /* Base value (-1 means keep file base) */ 1013 1038 ! const GraphFlag flagval /* Graph loading flags */ 1014 ! #ifdef MATLAB1039 ! #ifdef NOFILEIO 1015 1040 ! , 1016 1041 ! const Gnum nvert, … … 1021 1046 ! const Gnum* vertwgt, 1022 1047 ! const Gnum* edgewgt 1023 ! #endif /* MATLAB*/1048 ! #endif /* NOFILEIO */ 1024 1049 ! ) 1025 1050 { 1026 1051 Gnum edgenum; /* Number of edges really allocated */ 1027 1052 Gnum edgennd; 1028 --- 86,92 ---- 1029 Graph * restrict const grafptr, /* Graph structure to fill */ 1030 FILE * const stream, /* Stream from which to read graph data */ 1031 const Gnum baseval, /* Base value (-1 means keep file base) */ 1032 ! const GraphFlag flagval) /* Graph loading flags */ 1033 { 1034 Gnum edgenum; /* Number of edges really allocated */ 1035 Gnum edgennd; 1036 *************** 1037 *** 115,141 **** 1053 *************** 1054 *** 104,120 **** 1055 --- 115,141 ---- 1038 1056 char proptab[4]; 1039 1057 Gnum vertnum; 1040 1058 1041 - #ifdef MATLAB 1042 -printf("graphLoad - stream=%p; nvert=%d,nedge2=%d\n",stream,nvert,nedge2);1043 -printf("graphLoad - adjir=%p,adjjc=%p,vertlab=%p,vertwgt=%p,edgewgt=%p\n",1044 -adjir,adjjc,vertlab,vertwgt,edgewgt);1045 - #endif /* MATLAB*/1059 + #ifdef NOFILEIO 1060 + // printf("graphLoad - stream=%p; nvert=%d,nedge2=%d\n",stream,nvert,nedge2); 1061 + // printf("graphLoad - adjir=%p,adjjc=%p,vertlab=%p,vertwgt=%p,edgewgt=%p\n", 1062 + // adjir,adjjc,vertlab,vertwgt,edgewgt); 1063 + #endif /* NOFILEIO */ 1046 1064 memSet (grafptr, 0, sizeof (Graph)); 1047 1065 1048 - #ifndef MATLAB 1066 + #ifndef NOFILEIO 1049 1067 if (intLoad (stream, &versval) != 1) { /* Read version number */ 1050 1068 errorPrint ("graphLoad: bad input (1)"); 1051 1069 return (1); 1052 1070 } 1053 - #else /* MATLAB*/1054 -versval=0;1055 - #endif /* MATLAB*/1071 + #else /* NOFILEIO */ 1072 + versval=0; 1073 + #endif /* NOFILEIO */ 1056 1074 if (versval != 0) { /* If version not zero */ 1057 1075 errorPrint ("graphLoad: old-style graph format no longer supported"); … … 1059 1077 } 1060 1078 1061 - #ifndef MATLAB 1079 + #ifndef NOFILEIO 1062 1080 if ((intLoad (stream, &grafptr->vertnbr) != 1) || /* Read rest of header */ 1063 1081 (intLoad (stream, &grafptr->edgenbr) != 1) || 1064 1082 (intLoad (stream, &baseadj) != 1) || 1065 --- 104,120 ---- 1066 *** ************1067 *** 145,159 **** 1083 *************** 1084 *** 124,129 **** 1085 --- 145,159 ---- 1068 1086 errorPrint ("graphLoad: bad input (2)"); 1069 1087 return (1); 1070 1088 } 1071 - #else /* MATLAB*/1072 -grafptr->vertnbr=nvert;1073 -grafptr->edgenbr=nedge2;1074 -baseadj=1;1075 -propval=0;1076 -if (vertlab) propval+=100;1077 -if (edgewgt) propval+= 10;1078 -if (vertwgt) propval+= 1;1079 - #endif /* MATLAB*/1089 + #else /* NOFILEIO */ 1090 + grafptr->vertnbr=nvert; 1091 + grafptr->edgenbr=nedge2; 1092 + baseadj=1; 1093 + propval=0; 1094 + if (vertlab) propval+=100; 1095 + if (edgewgt) propval+= 10; 1096 + if (vertwgt) propval+= 1; 1097 + #endif /* NOFILEIO */ 1080 1098 sprintf (proptab, "%3.3d", (int) propval); /* Compute file properties */ 1081 1099 proptab[0] -= '0'; /* Vertex labels flag */ 1082 1100 proptab[1] -= '0'; /* Edge weights flag */ 1083 --- 124,129 ---- 1084 *** ************1085 *** 170,179 **** 1101 *************** 1102 *** 140,145 **** 1103 --- 170,179 ---- 1086 1104 } 1087 1105 if (proptab[0] != 0) /* If vertex labels, no base adjust */ 1088 1106 baseadj = 0; 1089 - #ifdef MATLAB 1090 -printf("graphLoad - baseadj=%d,baseval=%d,grafptr->baseval=%d\n",1091 -baseadj,baseval,grafptr->baseval);1092 - #endif /* MATLAB*/1107 + #ifdef NOFILEIO 1108 + // printf("graphLoad - baseadj=%d,baseval=%d,grafptr->baseval=%d\n", 1109 + // baseadj,baseval,grafptr->baseval); 1110 + #endif /* NOFILEIO */ 1093 1111 1094 1112 velonbr = ((proptab[2] != 0) && ((flagval & GRAPHIONOLOADVERT) == 0)) ? grafptr->vertnbr : 0; 1095 1113 vlblnbr = (proptab[0] != 0) ? grafptr->vertnbr : 0; 1096 --- 140,145 ---- 1097 *** ************1098 *** 212,226 **** 1114 *************** 1115 *** 178,188 **** 1116 --- 212,226 ---- 1099 1117 if (grafptr->vlbltax != NULL) { /* If must read label */ 1100 1118 Gnum vlblval; /* Value where to read vertex label */ 1101 1119 1102 - #ifndef MATLAB 1120 + #ifndef NOFILEIO 1103 1121 if (intLoad (stream, &vlblval) != 1) { /* Read label data */ 1104 1122 errorPrint ("graphLoad: bad input (3)"); … … 1106 1124 return (1); 1107 1125 } 1108 - #else /* MATLAB*/1109 -vlblval=vertlab[vertnum-grafptr->baseval];1110 - #endif /* MATLAB*/1126 + #else /* NOFILEIO */ 1127 + vlblval=vertlab[vertnum-grafptr->baseval]; 1128 + #endif /* NOFILEIO */ 1111 1129 grafptr->vlbltax[vertnum] = vlblval; 1112 1130 if (grafptr->vlbltax[vertnum] > vlblmax) /* Get maximum vertex label */ 1113 1131 vlblmax = grafptr->vlbltax[vertnum]; 1114 --- 178,188 ---- 1115 *** ************1116 *** 228,257 **** 1132 *************** 1133 *** 190,209 **** 1134 --- 228,257 ---- 1117 1135 if (proptab[2] != 0) { /* If must read vertex load */ 1118 1136 Gnum veloval; /* Value where to read vertex load */ 1119 1137 1120 - #ifndef MATLAB 1138 + #ifndef NOFILEIO 1121 1139 if (intLoad (stream, &veloval) != 1) { /* Read vertex load data */ 1122 1140 errorPrint ("graphLoad: bad input (4)"); … … 1124 1142 return (1); 1125 1143 } 1126 - #else /* MATLAB*/1127 -veloval=vertwgt[vertnum-grafptr->baseval];1128 - #endif /* MATLAB*/1144 + #else /* NOFILEIO */ 1145 + veloval=vertwgt[vertnum-grafptr->baseval]; 1146 + #endif /* NOFILEIO */ 1129 1147 if (grafptr->velotax != NULL) 1130 1148 velosum += 1131 1149 grafptr->velotax[vertnum] = veloval; 1132 1150 } 1133 - #ifndef MATLAB 1151 + #ifndef NOFILEIO 1134 1152 if (intLoad (stream, °rval) != 1) { /* Read vertex degree */ 1135 1153 errorPrint ("graphLoad: bad input (5)"); … … 1137 1155 return (1); 1138 1156 } 1139 - #else /* MATLAB*/1140 -// printf("old degrval=%d; new degrval=%d\n",1141 -// degrval,adjjc[vertnum-grafptr->baseval+1]-adjjc[vertnum-grafptr->baseval]);1142 -degrval=adjjc[vertnum-grafptr->baseval+1]-adjjc[vertnum-grafptr->baseval];1143 - #endif /* MATLAB*/1157 + #else /* NOFILEIO */ 1158 + // printf("old degrval=%d; new degrval=%d\n", 1159 + // degrval,adjjc[vertnum-grafptr->baseval+1]-adjjc[vertnum-grafptr->baseval]); 1160 + degrval=adjjc[vertnum-grafptr->baseval+1]-adjjc[vertnum-grafptr->baseval]; 1161 + #endif /* NOFILEIO */ 1144 1162 if (degrmax < degrval) /* Set maximum degree */ 1145 1163 degrmax = degrval; 1146 1164 1147 --- 190,209 ---- 1148 *** ************1149 *** 267,301 **** 1165 *************** 1166 *** 219,238 **** 1167 --- 267,301 ---- 1150 1168 if (proptab[1] != 0) { /* If must read edge load */ 1151 1169 Gnum edloval; /* Value where to read edge load */ 1152 1170 1153 - #ifndef MATLAB 1171 + #ifndef NOFILEIO 1154 1172 if (intLoad (stream, &edloval) != 1) { /* Read edge load data */ 1155 1173 errorPrint ("graphLoad: bad input (6)"); … … 1157 1175 return (1); 1158 1176 } 1159 - #else /* MATLAB*/1160 -edloval=edgewgt[edgenum-grafptr->baseval];1161 - #endif /* MATLAB*/1177 + #else /* NOFILEIO */ 1178 + edloval=edgewgt[edgenum-grafptr->baseval]; 1179 + #endif /* NOFILEIO */ 1162 1180 if (grafptr->edlotax != NULL) 1163 1181 edlosum += 1164 1182 grafptr->edlotax[edgenum] = (Gnum) edloval; 1165 1183 } 1166 - #ifndef MATLAB 1184 + #ifndef NOFILEIO 1167 1185 if (intLoad (stream, &edgeval) != 1) { /* Read edge data */ 1168 1186 errorPrint ("graphLoad: bad input (7)"); … … 1170 1188 return (1); 1171 1189 } 1172 - #else /* MATLAB*/1173 -// printf("edgenum=%d: old edgeval=%d; new edgeval[%d]=%d\n",1174 -// edgenum,edgeval,edgenum-grafptr->baseval,adjir[edgenum-grafptr->baseval]+1);1175 -/* if vertex labels are supplied, they must be referenced (jes, 1/05/10) */1176 -// edgeval=adjir[edgenum-grafptr->baseval]+1;1177 -if (vertlab)1178 -edgeval=vertlab[adjir[edgenum-grafptr->baseval] ];1179 -else1180 -edgeval= adjir[edgenum-grafptr->baseval]+1;1181 - #endif /* MATLAB*/1190 + #else /* NOFILEIO */ 1191 + // printf("edgenum=%d: old edgeval=%d; new edgeval[%d]=%d\n", 1192 + // edgenum,edgeval,edgenum-grafptr->baseval,adjir[edgenum-grafptr->baseval]+1); 1193 + /* if vertex labels are supplied, they must be referenced (jes, 1/05/10) */ 1194 + // edgeval=adjir[edgenum-grafptr->baseval]+1; 1195 + if (vertlab) 1196 + edgeval=vertlab[adjir[edgenum-grafptr->baseval] ]; 1197 + else 1198 + edgeval= adjir[edgenum-grafptr->baseval]+1; 1199 + #endif /* NOFILEIO */ 1182 1200 grafptr->edgetax[edgenum] = edgeval + baseadj; 1183 1201 } 1184 1202 } 1185 --- 219,238 ---- 1186 *** ************1187 *** 342,351 **** 1203 *************** 1204 *** 279,284 **** 1205 --- 342,351 ---- 1188 1206 Gnum vertnum; /* Number of current vertex */ 1189 1207 Gnum * restrict indxtab; /* Vertex label/number index table */ 1190 1208 1191 - #ifdef MATLAB 1192 -printf("graphLoad2 - baseval=%d,vertnnd=%d,vlblmax=%d\n",1193 -baseval,vertnnd,vlblmax);1194 - #endif /* MATLAB*/1209 + #ifdef NOFILEIO 1210 + printf("graphLoad2 - baseval=%d,vertnnd=%d,vlblmax=%d\n", 1211 + baseval,vertnnd,vlblmax); 1212 + #endif /* NOFILEIO */ 1195 1213 if ((indxtab = (Gnum *) memAlloc ((vlblmax + 1) * sizeof (Gnum))) == NULL) { 1196 1214 errorPrint ("graphLoad2: out of memory"); 1197 1215 return (1); 1198 --- 279,284 ---- 1199 *** ************1200 *** 353,362 **** 1216 *************** 1217 *** 286,291 **** 1218 --- 353,362 ---- 1201 1219 1202 1220 memSet (indxtab, ~0, (vlblmax + 1) * sizeof (Gnum)); /* Assume labels not used */ 1203 1221 for (vertnum = baseval; vertnum < vertnnd; vertnum ++) { 1204 - #ifdef MATLAB 1205 -// printf("graphLoad2 - vertnum=%d; vlbltax=%d,indxtab=%d\n",1206 -// vertnum,vlbltax[vertnum],indxtab[vlbltax[vertnum]]);1207 - #endif /* MATLAB*/1222 + #ifdef NOFILEIO 1223 + // printf("graphLoad2 - vertnum=%d; vlbltax=%d,indxtab=%d\n", 1224 + // vertnum,vlbltax[vertnum],indxtab[vlbltax[vertnum]]); 1225 + #endif /* NOFILEIO */ 1208 1226 if (indxtab[vlbltax[vertnum]] != ~0) { /* If vertex label already used */ 1209 1227 errorPrint ("graphLoad2: duplicate vertex label"); 1210 1228 memFree (indxtab); 1211 --- 286,291 ---- 1212 *** ************1213 *** 365,374 **** 1229 *************** 1230 *** 294,299 **** 1231 --- 365,374 ---- 1214 1232 indxtab[vlbltax[vertnum]] = vertnum; /* Set vertex number index */ 1215 1233 } 1216 1234 for (vertnum = baseval; vertnum < vertnnd; vertnum ++) { 1217 - #ifdef MATLAB 1218 -// printf("graphLoad2 - vertnum=%d; vlbltax=%d,indxtab=%d\n",1219 -// vertnum,vlbltax[vertnum],indxtab[vlbltax[vertnum]]);1220 - #endif /* MATLAB*/1235 + #ifdef NOFILEIO 1236 + // printf("graphLoad2 - vertnum=%d; vlbltax=%d,indxtab=%d\n", 1237 + // vertnum,vlbltax[vertnum],indxtab[vlbltax[vertnum]]); 1238 + #endif /* NOFILEIO */ 1221 1239 Gnum edgenum; /* Number of current edge */ 1222 1240 1223 1241 for (edgenum = verttax[vertnum]; edgenum < vendtax[vertnum]; edgenum ++) { 1224 --- 294,299 ---- 1225 *** ************1226 *** 382,396 **** 1242 *************** 1243 *** 307,313 **** 1244 --- 382,396 ---- 1227 1245 memFree (indxtab); 1228 1246 return (1); 1229 1247 } 1230 - #ifdef MATLAB 1231 -// printf("graphLoad2 - edgenum=%d; old edgetax=%d,",1232 -// edgenum,edgetax[edgenum]);1233 - #endif /* MATLAB*/1248 + #ifdef NOFILEIO 1249 + // printf("graphLoad2 - edgenum=%d; old edgetax=%d,", 1250 + // edgenum,edgetax[edgenum]); 1251 + #endif /* NOFILEIO */ 1234 1252 edgetax[edgenum] = indxtab[edgetax[edgenum]]; /* Replace label by number */ 1235 - #ifdef MATLAB 1236 -// printf("new edgetax=%d\n",1237 -// edgetax[edgenum]);1238 - #endif /* MATLAB*/1253 + #ifdef NOFILEIO 1254 + // printf("new edgetax=%d\n", 1255 + // edgetax[edgenum]); 1256 + #endif /* NOFILEIO */ 1239 1257 } 1240 1258 } 1241 1259 1242 --- 307,313 ---- 1243 diff -rc src/src/libscotch/graph_io_scot.c old/src/libscotch/graph_io_scot.c 1244 *** src/src/libscotch/graph_io_scot.c 2010-07-19 12:08:20.549684722-07001245 --- old/src/libscotch/graph_io_scot.c 2008-05-22 06:44:42.000000000 -0700 1246 *** ************1247 *** 89,99 **** 1260 diff -rc src/src/libscotch/graph_io_scot.c new5/src/libscotch/graph_io_scot.c 1261 *** src/src/libscotch/graph_io_scot.c 2008-05-22 06:44:42.000000000 -0700 1262 --- new5/src/libscotch/graph_io_scot.c 2010-07-19 15:02:03.105970631 -0700 1263 *************** 1264 *** 89,95 **** 1265 --- 89,99 ---- 1248 1266 int o; 1249 1267 1250 1268 if (filesrcptr != NULL) { 1251 - #ifndef MATLAB 1269 + #ifndef NOFILEIO 1252 1270 if (graphLoad (grafptr, filesrcptr, -1, 0) != 0) 1253 - #else /* MATLAB*/1254 -if (graphLoad (grafptr, filesrcptr, -1, 0, 0, 0, NULL, NULL, NULL, NULL, NULL) != 0)1255 - #endif /* MATLAB*/1271 + #else /* NOFILEIO */ 1272 + if (graphLoad (grafptr, filesrcptr, -1, 0, 0, 0, NULL, NULL, NULL, NULL, NULL) != 0) 1273 + #endif /* NOFILEIO */ 1256 1274 return (1); 1257 1275 } 1258 1276 1259 --- 89,95 ---- 1260 diff -rc src/src/libscotch/library_arch.c old/src/libscotch/library_arch.c 1261 *** src/src/libscotch/library_arch.c 2010-07-19 12:08:20.550684729 -0700 1262 --- old/src/libscotch/library_arch.c 2008-05-22 06:44:42.000000000 -0700 1263 *************** 1264 *** 120,139 **** 1265 int 1266 SCOTCH_archLoad ( 1267 SCOTCH_Arch * const archptr, 1268 ! FILE * const stream 1269 ! #ifdef MATLAB 1270 ! , 1271 ! const char * archtyp, 1272 ! const SCOTCH_Num napar, 1273 ! const SCOTCH_Num * archpar 1274 ! #endif /* MATLAB */ 1275 ! ) 1276 { 1277 - #ifndef MATLAB 1278 return (archLoad ((Arch *) archptr, stream)); 1279 - #else /* MATLAB */ 1280 - return (archLoad ((Arch *) archptr, stream, archtyp, napar, archpar)); 1281 - #endif /* MATLAB */ 1282 } 1283 1284 /*+ This routine saves the given opaque 1285 --- 120,128 ---- 1277 diff -rc src/src/libscotch/library_arch.c new5/src/libscotch/library_arch.c 1278 *** src/src/libscotch/library_arch.c 2008-05-22 06:44:42.000000000 -0700 1279 --- new5/src/libscotch/library_arch.c 2010-07-19 15:02:10.011980730 -0700 1280 *************** 1281 *** 120,128 **** 1286 1282 int 1287 1283 SCOTCH_archLoad ( … … 1293 1289 1294 1290 /*+ This routine saves the given opaque 1295 diff -rc src/src/libscotch/library_arch_f.c old/src/libscotch/library_arch_f.c 1296 *** src/src/libscotch/library_arch_f.c 2010-07-19 12:08:20.552684743 -0700 1297 --- old/src/libscotch/library_arch_f.c 2008-05-22 06:44:42.000000000 -0700 1298 *************** 1299 *** 121,131 **** 1291 --- 120,139 ---- 1292 int 1293 SCOTCH_archLoad ( 1294 SCOTCH_Arch * const archptr, 1295 ! FILE * const stream 1296 ! #ifdef NOFILEIO 1297 ! , 1298 ! const char * archtyp, 1299 ! const SCOTCH_Num napar, 1300 ! const SCOTCH_Num * archpar 1301 ! #endif /* NOFILEIO */ 1302 ! ) 1303 { 1304 + #ifndef NOFILEIO 1305 return (archLoad ((Arch *) archptr, stream)); 1306 + #else /* NOFILEIO */ 1307 + return (archLoad ((Arch *) archptr, stream, archtyp, napar, archpar)); 1308 + #endif /* NOFILEIO */ 1309 } 1310 1311 /*+ This routine saves the given opaque 1312 diff -rc src/src/libscotch/library_arch_f.c new5/src/libscotch/library_arch_f.c 1313 *** src/src/libscotch/library_arch_f.c 2008-05-22 06:44:42.000000000 -0700 1314 --- new5/src/libscotch/library_arch_f.c 2010-07-19 15:02:16.632990408 -0700 1315 *************** 1316 *** 121,127 **** 1317 --- 121,131 ---- 1300 1318 } 1301 1319 setbuf (stream, NULL); /* Do not buffer on input */ 1302 1320 1303 - #ifndef MATLAB 1321 + #ifndef NOFILEIO 1304 1322 o = SCOTCH_archLoad (archptr, stream); 1305 - #else /* MATLAB*/1306 -o = SCOTCH_archLoad (archptr, stream, "", 0, NULL);1307 - #endif /* MATLAB*/1323 + #else /* NOFILEIO */ 1324 + o = SCOTCH_archLoad (archptr, stream, "", 0, NULL); 1325 + #endif /* NOFILEIO */ 1308 1326 1309 1327 fclose (stream); /* This closes filenum too */ 1310 1328 1311 --- 121,127 ---- 1312 diff -rc src/src/libscotch/library_error_exit.c old/src/libscotch/library_error_exit.c 1313 *** src/src/libscotch/library_error_exit.c 2010-07-19 12:08:20.556684771-07001314 --- old/src/libscotch/library_error_exit.c 2009-01-20 00:36:33.000000000 -0800 1315 *** ************1316 *** 114,120 **** 1329 diff -rc src/src/libscotch/library_error_exit.c new5/src/libscotch/library_error_exit.c 1330 *** src/src/libscotch/library_error_exit.c 2009-01-20 00:36:33.000000000 -0800 1331 --- new5/src/libscotch/library_error_exit.c 2010-07-15 15:09:01.789095694 -0700 1332 *************** 1333 *** 114,119 **** 1334 --- 114,120 ---- 1317 1335 int proclocnum; 1318 1336 #endif /* SCOTCH_PTSCOTCH */ 1319 1337 1320 -#ifndef MATLAB1338 + #ifndef MATLAB 1321 1339 fprintf (stderr, "%s", _SCOTCHerrorProgName); 1322 1340 #ifdef SCOTCH_PTSCOTCH 1323 1341 if ((MPI_Initialized (&proclocnum) == MPI_SUCCESS) && 1324 --- 114,119 ---- 1325 *** ************1326 *** 132,155 **** 1342 *************** 1343 *** 131,136 **** 1344 --- 132,155 ---- 1327 1345 fprintf (stderr, "\n"); 1328 1346 fflush (stderr); /* In case it has been set to buffered mode */ 1329 1347 1330 -#else /* MATLAB */1331 -mexPrintf ("%s", _SCOTCHerrorProgName);1332 -#ifdef SCOTCH_PTSCOTCH1333 -if ((MPI_Initialized (&proclocnum) == MPI_SUCCESS) &&1334 -(proclocnum != 0) &&1335 -(MPI_Comm_rank (MPI_COMM_WORLD, &proclocnum) == MPI_SUCCESS))1336 -mexPrintf ("(%d): ", proclocnum);1337 -#else /* SCOTCH_PTSCOTCH */1338 -if (_SCOTCHerrorProgName[0] != '\0')1339 -mexPrintf (": ");1340 -#endif /* SCOTCH_PTSCOTCH */1341 -mexPrintf ("ERROR: ");1342 -va_start (errlist, errstr);1343 -mexPrintf (errstr, errlist); /* Print arguments */1344 -va_end (errlist);1345 -mexPrintf ("\n");1346 -#endif /* MATLAB */1347 -1348 + #else /* MATLAB */ 1349 + mexPrintf ("%s", _SCOTCHerrorProgName); 1350 + #ifdef SCOTCH_PTSCOTCH 1351 + if ((MPI_Initialized (&proclocnum) == MPI_SUCCESS) && 1352 + (proclocnum != 0) && 1353 + (MPI_Comm_rank (MPI_COMM_WORLD, &proclocnum) == MPI_SUCCESS)) 1354 + mexPrintf ("(%d): ", proclocnum); 1355 + #else /* SCOTCH_PTSCOTCH */ 1356 + if (_SCOTCHerrorProgName[0] != '\0') 1357 + mexPrintf (": "); 1358 + #endif /* SCOTCH_PTSCOTCH */ 1359 + mexPrintf ("ERROR: "); 1360 + va_start (errlist, errstr); 1361 + mexPrintf (errstr, errlist); /* Print arguments */ 1362 + va_end (errlist); 1363 + mexPrintf ("\n"); 1364 + #endif /* MATLAB */ 1365 + 1348 1366 #ifdef SCOTCH_ERROR_SLEEP 1349 1367 sleep (SCOTCH_ERROR_SLEEP); /* Wait for messages to be propagated */ 1350 1368 #endif /* SCOTCH_ERROR_SLEEP */ 1351 --- 131,136 ---- 1352 *** ************1353 *** 174,180 **** 1369 *************** 1370 *** 155,160 **** 1371 --- 174,180 ---- 1354 1372 int proclocnum; 1355 1373 #endif /* SCOTCH_PTSCOTCH */ 1356 1374 1357 -#ifndef MATLAB1375 + #ifndef MATLAB 1358 1376 fprintf (stderr, "%s", _SCOTCHerrorProgName); 1359 1377 #ifdef SCOTCH_PTSCOTCH 1360 1378 if ((MPI_Initialized (&proclocnum) == MPI_SUCCESS) && 1361 --- 155,160 ---- 1362 *** ************1363 *** 191,212 **** 1379 *************** 1380 *** 171,174 **** 1381 --- 191,212 ---- 1364 1382 va_end (errlist); 1365 1383 fprintf (stderr, "\n"); 1366 1384 fflush (stderr); /* In case it has been set to buffered mode */ 1367 -1368 -#else /* MATLAB */1369 -mexPrintf ("%s", _SCOTCHerrorProgName);1370 -#ifdef SCOTCH_PTSCOTCH1371 -if ((MPI_Initialized (&proclocnum) == MPI_SUCCESS) &&1372 -(proclocnum != 0) &&1373 -(MPI_Comm_rank (MPI_COMM_WORLD, &proclocnum) == MPI_SUCCESS))1374 -mexPrintf ("(%d): ", proclocnum);1375 -#else /* SCOTCH_PTSCOTCH */1376 -if (_SCOTCHerrorProgName[0] != '\0')1377 -mexPrintf (": ");1378 -#endif /* SCOTCH_PTSCOTCH */1379 -mexPrintf ("WARNING: ");1380 -va_start (errlist, errstr);1381 -mexPrintf (errstr, errlist); /* Print arguments */1382 -va_end (errlist);1383 -mexPrintf ("\n");1384 -#endif /* MATLAB */1385 + 1386 + #else /* MATLAB */ 1387 + mexPrintf ("%s", _SCOTCHerrorProgName); 1388 + #ifdef SCOTCH_PTSCOTCH 1389 + if ((MPI_Initialized (&proclocnum) == MPI_SUCCESS) && 1390 + (proclocnum != 0) && 1391 + (MPI_Comm_rank (MPI_COMM_WORLD, &proclocnum) == MPI_SUCCESS)) 1392 + mexPrintf ("(%d): ", proclocnum); 1393 + #else /* SCOTCH_PTSCOTCH */ 1394 + if (_SCOTCHerrorProgName[0] != '\0') 1395 + mexPrintf (": "); 1396 + #endif /* SCOTCH_PTSCOTCH */ 1397 + mexPrintf ("WARNING: "); 1398 + va_start (errlist, errstr); 1399 + mexPrintf (errstr, errlist); /* Print arguments */ 1400 + va_end (errlist); 1401 + mexPrintf ("\n"); 1402 + #endif /* MATLAB */ 1385 1403 } 1386 --- 171,174 ---- 1387 diff -rc src/src/libscotch/library_graph.c old/src/libscotch/library_graph.c 1388 *** src/src/libscotch/library_graph.c 2010-07-19 12:08:20.559684792 -0700 1389 --- old/src/libscotch/library_graph.c 2008-05-22 07:28:12.000000000 -0700 1390 *************** 1391 *** 137,154 **** 1404 diff -rc src/src/libscotch/library_graph.c new5/src/libscotch/library_graph.c 1405 *** src/src/libscotch/library_graph.c 2008-05-22 07:28:12.000000000 -0700 1406 --- new5/src/libscotch/library_graph.c 2010-07-19 15:03:08.833066562 -0700 1407 *************** 1408 *** 137,143 **** 1409 SCOTCH_Graph * const grafptr, 1410 FILE * const stream, 1411 const SCOTCH_Num baseval, 1412 ! const SCOTCH_Num flagval) 1413 { 1414 GraphFlag srcgrafflag; /* Graph flags */ 1415 1416 --- 137,154 ---- 1392 1417 SCOTCH_Graph * const grafptr, 1393 1418 FILE * const stream, 1394 1419 const SCOTCH_Num baseval, 1395 1420 ! const SCOTCH_Num flagval 1396 ! #ifdef MATLAB1421 ! #ifdef NOFILEIO 1397 1422 ! , 1398 1423 ! const SCOTCH_Num nvert, … … 1403 1428 ! const SCOTCH_Num* vertwgt, 1404 1429 ! const SCOTCH_Num* edgewgt 1405 ! #endif /* MATLAB*/1430 ! #endif /* NOFILEIO */ 1406 1431 ! ) 1407 1432 { 1408 1433 GraphFlag srcgrafflag; /* Graph flags */ 1409 1434 1410 --- 137,143 ---- 1411 SCOTCH_Graph * const grafptr, 1412 FILE * const stream, 1413 const SCOTCH_Num baseval, 1414 ! const SCOTCH_Num flagval) 1415 { 1416 GraphFlag srcgrafflag; /* Graph flags */ 1417 1418 *************** 1419 *** 164,174 **** 1435 *************** 1436 *** 153,159 **** 1437 --- 164,174 ---- 1420 1438 srcgrafflag = (((flagval & 1) != 0) ? GRAPHIONOLOADVERT : 0) + 1421 1439 (((flagval & 2) != 0) ? GRAPHIONOLOADEDGE : 0); 1422 1440 1423 - #ifndef MATLAB 1441 + #ifndef NOFILEIO 1424 1442 return (graphLoad ((Graph * const) grafptr, stream, (Gnum) baseval, srcgrafflag)); 1425 - #else /* MATLAB*/1426 -return (graphLoad ((Graph * const) grafptr, stream, (Gnum) baseval, srcgrafflag, (const Gnum) nvert, (const Gnum) nedge2, (const Gnum *) adjir, (const Gnum *) adjjc, (const Gnum *) vertlab, (const Gnum *) vertwgt, (const Gnum *) edgewgt));1427 - #endif /* MATLAB*/1443 + #else /* NOFILEIO */ 1444 + return (graphLoad ((Graph * const) grafptr, stream, (Gnum) baseval, srcgrafflag, (const Gnum) nvert, (const Gnum) nedge2, (const Gnum *) adjir, (const Gnum *) adjjc, (const Gnum *) vertlab, (const Gnum *) vertwgt, (const Gnum *) edgewgt)); 1445 + #endif /* NOFILEIO */ 1428 1446 } 1429 1447 1430 1448 /*+ This routine saves the contents of the given 1431 --- 153,159 ---- 1432 diff -rc src/src/libscotch/library_graph_f.c old/src/libscotch/library_graph_f.c 1433 *** src/src/libscotch/library_graph_f.c 2010-07-19 12:08:20.561684806-07001434 --- old/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700 1435 *** ************1436 *** 136,146 **** 1449 diff -rc src/src/libscotch/library_graph_f.c new5/src/libscotch/library_graph_f.c 1450 *** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700 1451 --- new5/src/libscotch/library_graph_f.c 2010-07-19 15:03:14.148074301 -0700 1452 *************** 1453 *** 136,142 **** 1454 --- 136,146 ---- 1437 1455 } 1438 1456 setbuf (stream, NULL); /* Do not buffer on input */ 1439 1457 1440 - #ifndef MATLAB 1458 + #ifndef NOFILEIO 1441 1459 o = SCOTCH_graphLoad (grafptr, stream, *baseptr, *flagptr); 1442 - #else /* MATLAB*/1443 -o = SCOTCH_graphLoad (grafptr, stream, *baseptr, *flagptr, 0, 0, NULL, NULL, NULL, NULL, NULL);1444 - #endif /* MATLAB*/1460 + #else /* NOFILEIO */ 1461 + o = SCOTCH_graphLoad (grafptr, stream, *baseptr, *flagptr, 0, 0, NULL, NULL, NULL, NULL, NULL); 1462 + #endif /* NOFILEIO */ 1445 1463 1446 1464 fclose (stream); /* This closes filenum too */ 1447 1465 1448 --- 136,142 ---- 1449 diff -rc src/src/libscotch/library_graph_map.c old/src/libscotch/library_graph_map.c 1450 *** src/src/libscotch/library_graph_map.c 2010-07-19 12:08:20.563684820-07001451 --- old/src/libscotch/library_graph_map.c 2008-09-28 04:04:05.000000000 -0700 1452 *** ************1453 *** 182,200 **** 1466 diff -rc src/src/libscotch/library_graph_map.c new5/src/libscotch/library_graph_map.c 1467 *** src/src/libscotch/library_graph_map.c 2008-09-28 04:04:05.000000000 -0700 1468 --- new5/src/libscotch/library_graph_map.c 2010-07-19 15:03:29.338096404 -0700 1469 *************** 1470 *** 182,192 **** 1471 --- 182,200 ---- 1454 1472 1455 1473 int 1456 1474 SCOTCH_graphMapSave ( 1457 - #ifdef MATLAB 1458 -Gnum *pnvert,1459 -Gnum (**pmaptab)[2],1460 - #endif /* MATLAB*/1475 + #ifdef NOFILEIO 1476 + Gnum *pnvert, 1477 + Gnum (**pmaptab)[2], 1478 + #endif /* NOFILEIO */ 1461 1479 const SCOTCH_Graph * const grafptr, /*+ Graph to order +*/ 1462 1480 const SCOTCH_Mapping * const mappptr, /*+ Mapping to save +*/ 1463 1481 FILE * const stream) /*+ Output stream +*/ 1464 1482 { 1465 - #ifndef MATLAB 1483 + #ifndef NOFILEIO 1466 1484 return (mapSave (&((LibMapping *) mappptr)->m, ((Graph *) grafptr)->vlbltax, stream)); 1467 - #else /* MATLAB*/1468 -return (mapSave (pnvert, pmaptab, &((LibMapping *) mappptr)->m, ((Graph *) grafptr)->vlbltax, stream));1469 - #endif /* MATLAB*/1485 + #else /* NOFILEIO */ 1486 + return (mapSave (pnvert, pmaptab, &((LibMapping *) mappptr)->m, ((Graph *) grafptr)->vlbltax, stream)); 1487 + #endif /* NOFILEIO */ 1470 1488 } 1471 1489 1472 1490 /*+ This routine computes a mapping 1473 --- 182,192 ---- 1474 diff -rc src/src/libscotch/library_graph_map_f.c old/src/libscotch/library_graph_map_f.c 1475 *** src/src/libscotch/library_graph_map_f.c 2010-07-19 12:08:20.565684834-07001476 --- old/src/libscotch/library_graph_map_f.c 2008-06-28 03:44:26.000000000 -0700 1477 *** ************1478 *** 183,193 **** 1491 diff -rc src/src/libscotch/library_graph_map_f.c new5/src/libscotch/library_graph_map_f.c 1492 *** src/src/libscotch/library_graph_map_f.c 2008-06-28 03:44:26.000000000 -0700 1493 --- new5/src/libscotch/library_graph_map_f.c 2010-07-19 15:03:34.344103682 -0700 1494 *************** 1495 *** 183,189 **** 1496 --- 183,193 ---- 1479 1497 return; 1480 1498 } 1481 1499 1482 - #ifndef MATLAB 1500 + #ifndef NOFILEIO 1483 1501 o = SCOTCH_graphMapSave (grafptr, mapptr, stream); 1484 - #else /* MATLAB*/1485 -o = SCOTCH_graphMapSave (NULL, NULL, grafptr, mapptr, stream);1486 - #endif /* MATLAB*/1502 + #else /* NOFILEIO */ 1503 + o = SCOTCH_graphMapSave (NULL, NULL, grafptr, mapptr, stream); 1504 + #endif /* NOFILEIO */ 1487 1505 1488 1506 fclose (stream); /* This closes filenum too */ 1489 1507 1490 --- 183,189 ---- 1491 diff -rc src/src/libscotch/library.h old/src/libscotch/library.h 1492 *** src/src/libscotch/library.h 2010-07-19 12:08:20.568684854-07001493 --- old/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700 1494 *** ************1495 *** 1,5 **** 1496 -#ifndef _SCOTCH_H_1497 -#define _SCOTCH_H_1508 diff -rc src/src/libscotch/library.h new5/src/libscotch/library.h 1509 *** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700 1510 --- new5/src/libscotch/library.h 2010-07-21 11:55:39.022504459 -0700 1511 *************** 1512 *** 1,3 **** 1513 --- 1,5 ---- 1514 + #ifndef _SCOTCH_H_ 1515 + #define _SCOTCH_H_ 1498 1516 /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS 1499 1517 ** 1500 1518 ** This file is part of the Scotch software package for static mapping, 1501 --- 1,3 ---- 1502 *************** 1503 *** 280,284 **** 1519 *************** 1520 *** 134,140 **** 1521 --- 136,146 ---- 1522 1523 int SCOTCH_archInit (SCOTCH_Arch * const); 1524 void SCOTCH_archExit (SCOTCH_Arch * const); 1525 + #ifndef NOFILEIO 1526 int SCOTCH_archLoad (SCOTCH_Arch * const, FILE * const); 1527 + #else /* NOFILEIO */ 1528 + int SCOTCH_archLoad (SCOTCH_Arch * const, FILE * const, const char *, const SCOTCH_Num, const SCOTCH_Num *); 1529 + #endif /* NOFILEIO */ 1530 int SCOTCH_archSave (const SCOTCH_Arch * const, FILE * const); 1531 int SCOTCH_archBuild (SCOTCH_Arch * const, const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num * const, const SCOTCH_Strat * const); 1532 int SCOTCH_archCmplt (SCOTCH_Arch * const, const SCOTCH_Num); 1533 *************** 1534 *** 191,197 **** 1535 --- 197,207 ---- 1536 int SCOTCH_graphInit (SCOTCH_Graph * const); 1537 void SCOTCH_graphExit (SCOTCH_Graph * const); 1538 void SCOTCH_graphFree (SCOTCH_Graph * const); 1539 + #ifndef NOFILEIO 1540 int SCOTCH_graphLoad (SCOTCH_Graph * const, FILE * const, const SCOTCH_Num, const SCOTCH_Num); 1541 + #else /* NOFILEIO */ 1542 + int SCOTCH_graphLoad (SCOTCH_Graph * const, FILE * const, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num *, const SCOTCH_Num *, const SCOTCH_Num *, const SCOTCH_Num *, const SCOTCH_Num *); 1543 + #endif /* NOFILEIO */ 1544 int SCOTCH_graphSave (const SCOTCH_Graph * const, FILE * const); 1545 int SCOTCH_graphBuild (SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num, const SCOTCH_Num * const, const SCOTCH_Num * const); 1546 SCOTCH_Num SCOTCH_graphBase (SCOTCH_Graph * const, const SCOTCH_Num baseval); 1547 *************** 1548 *** 210,216 **** 1549 --- 220,230 ---- 1550 int SCOTCH_graphMapInit (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Arch * const, SCOTCH_Num * const); 1551 void SCOTCH_graphMapExit (const SCOTCH_Graph * const, SCOTCH_Mapping * const); 1552 int SCOTCH_graphMapLoad (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const); 1553 + #ifndef NOFILEIO 1554 int SCOTCH_graphMapSave (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const); 1555 + #else /* NOFILEIO */ 1556 + int SCOTCH_graphMapSave (SCOTCH_Num *, SCOTCH_Num (**)[2], const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const); 1557 + #endif /* NOFILEIO */ 1558 int SCOTCH_graphMapView (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const); 1559 int SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const); 1560 int SCOTCH_graphMap (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const); 1561 *************** 1562 *** 278,280 **** 1563 --- 292,296 ---- 1504 1564 #ifdef __cplusplus 1505 1565 } 1506 1566 #endif /* __cplusplus */ 1507 - 1508 - #endif //#ifndef _SCOTCH_H_ 1509 --- 278,280 ---- 1510 diff -rc src/src/libscotch/Makefile old/src/libscotch/Makefile 1511 *** src/src/libscotch/Makefile 2010-07-19 12:08:20.573684889 -0700 1512 --- old/src/libscotch/Makefile 2009-05-09 16:08:04.000000000 -0700 1567 + 1568 + #endif //#ifndef _SCOTCH_H_ 1569 diff -rc src/src/libscotch/Makefile new5/src/libscotch/Makefile 1570 *** src/src/libscotch/Makefile 2009-05-09 16:08:04.000000000 -0700 1571 --- new5/src/libscotch/Makefile 2010-07-19 16:00:02.225745769 -0700 1513 1572 *************** 1514 1573 *** 49,55 **** … … 1516 1575 ## 1517 1576 1518 ! .PHONY : ptscotch scotch mexscotchptinstall install clean realclean1577 ! .PHONY : ptscotch scotch ptinstall install clean realclean 1519 1578 1520 1579 scotch : clean … … 1524 1583 ## 1525 1584 1526 ! .PHONY : ptscotch scotch ptinstallinstall clean realclean1585 ! .PHONY : ptscotch scotch nfioscotch mexscotch ptinstall install nfioinstall mexinstall clean realclean 1527 1586 1528 1587 scotch : clean 1529 1588 $(MAKE) CC="$(CCS)" CCD="$(CCS)" SCOTCHLIB=scotch \ 1530 1589 *************** 1531 *** 68,83 **** 1590 *** 68,73 **** 1591 --- 68,93 ---- 1532 1592 libptscotcherr$(LIB) \ 1533 1593 libptscotcherrexit$(LIB) 1534 1594 1535 - mexscotch : clean 1536 - $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS)" SCOTCHLIB=scotch \ 1537 - dummysizes$(EXE) 1538 - $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch \ 1539 - scotch.h \ 1540 - scotchf.h \ 1541 - libmexscotch$(LIB) \ 1542 - libmexscotcherr$(LIB) \ 1543 - libmexscotcherrexit$(LIB) 1544 - 1595 + nfioscotch : clean 1596 + $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS)" SCOTCHLIB=scotch \ 1597 + dummysizes$(EXE) 1598 + $(MAKE) CFLAGS="$(CFLAGS) -DNOFILEIO" CC="$(CCS)" CCD="$(CCS)" SCOTCHLIB=nfioscotch \ 1599 + scotch.h \ 1600 + scotchf.h \ 1601 + libnfioscotch$(LIB) \ 1602 + libnfioscotcherr$(LIB) \ 1603 + libnfioscotcherrexit$(LIB) 1604 + 1605 + mexscotch : clean 1606 + $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS)" SCOTCHLIB=scotch \ 1607 + dummysizes$(EXE) 1608 + $(MAKE) CFLAGS="$(CFLAGS) -DNOFILEIO -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=mexscotch \ 1609 + scotch.h \ 1610 + scotchf.h \ 1611 + libmexscotch$(LIB) \ 1612 + libmexscotcherr$(LIB) \ 1613 + libmexscotcherrexit$(LIB) 1614 + 1545 1615 install : 1546 1616 -$(CP) scotch.h scotchf.h $(includedir) 1547 1617 -$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir) 1548 --- 68,73 ---- 1549 *** ************1550 *** 87,96 **** 1618 *************** 1619 *** 77,82 **** 1620 --- 97,110 ---- 1551 1621 -$(CP) scotchf.h $(includedir)/ptscotchf.h 1552 1622 -$(CP) libptscotch*$(LIB) $(libdir) 1553 1623 1554 - mexinstall : 1555 - -$(CP) scotch.h scotchf.h $(includedir) 1556 - -$(CP) libmexscotch$(LIB) libmexscotcherr*$(LIB) $(libdir) 1557 - 1624 + nfioinstall : 1625 + -$(CP) scotch.h scotchf.h $(includedir) 1626 + -$(CP) libnfioscotch$(LIB) libnfioscotcherr*$(LIB) $(libdir) 1627 + 1628 + mexinstall : 1629 + -$(CP) scotch.h scotchf.h $(includedir) 1630 + -$(CP) libmexscotch$(LIB) libmexscotcherr*$(LIB) $(libdir) 1631 + 1558 1632 clean : 1559 1633 -$(RM) *~ *$(OBJ) lib*$(LIB) common2* parser_yy.c parser_ly.h parser_ll.c *scotch.h *scotchf.h y.output dummysizes$(EXE) 1560 1634 1561 --- 77,82 ---- 1562 *** ************1563 *** 2466,2632 **** 1635 *************** 1636 *** 2452,2457 **** 1637 --- 2480,2807 ---- 1564 1638 $(AR) $(ARFLAGS) lib$(SCOTCHLIB)$(LIB) $(?) 1565 1639 -$(RANLIB) lib$(SCOTCHLIB)$(LIB) 1566 1640 1567 - libmexscotch$(LIB) : arch$(OBJ) \ 1568 - arch_build$(OBJ) \ 1569 - arch_cmplt$(OBJ) \ 1570 - arch_cmpltw$(OBJ) \ 1571 - arch_deco$(OBJ) \ 1572 - arch_hcub$(OBJ) \ 1573 - arch_mesh$(OBJ) \ 1574 - arch_tleaf$(OBJ) \ 1575 - arch_torus$(OBJ) \ 1576 - arch_vcmplt$(OBJ) \ 1577 - arch_vhcub$(OBJ) \ 1578 - bgraph$(OBJ) \ 1579 - bgraph_bipart_bd$(OBJ) \ 1580 - bgraph_bipart_df$(OBJ) \ 1581 - bgraph_bipart_ex$(OBJ) \ 1582 - bgraph_bipart_fm$(OBJ) \ 1583 - bgraph_bipart_gg$(OBJ) \ 1584 - bgraph_bipart_gp$(OBJ) \ 1585 - bgraph_bipart_ml$(OBJ) \ 1586 - bgraph_bipart_st$(OBJ) \ 1587 - bgraph_bipart_zr$(OBJ) \ 1588 - bgraph_check$(OBJ) \ 1589 - bgraph_store$(OBJ) \ 1590 - common$(OBJ) \ 1591 - common_file$(OBJ) \ 1592 - common_file_compress$(OBJ) \ 1593 - common_file_uncompress$(OBJ) \ 1594 - common_integer$(OBJ) \ 1595 - common_memory$(OBJ) \ 1596 - common_stub$(OBJ) \ 1597 - gain$(OBJ) \ 1598 - geom$(OBJ) \ 1599 - graph$(OBJ) \ 1600 - graph_base$(OBJ) \ 1601 - graph_check$(OBJ) \ 1602 - graph_coarsen$(OBJ) \ 1603 - graph_induce$(OBJ) \ 1604 - graph_io$(OBJ) \ 1605 - graph_io_chac$(OBJ) \ 1606 - graph_io_habo$(OBJ) \ 1607 - graph_io_mmkt$(OBJ) \ 1608 - graph_io_scot$(OBJ) \ 1609 - graph_list$(OBJ) \ 1610 - hall_order_hd$(OBJ) \ 1611 - hall_order_hf$(OBJ) \ 1612 - hall_order_hx$(OBJ) \ 1613 - hgraph$(OBJ) \ 1614 - hgraph_check$(OBJ) \ 1615 - hgraph_induce$(OBJ) \ 1616 - hgraph_order_bl$(OBJ) \ 1617 - hgraph_order_cp$(OBJ) \ 1618 - hgraph_order_gp$(OBJ) \ 1619 - hgraph_order_hd$(OBJ) \ 1620 - hgraph_order_hf$(OBJ) \ 1621 - hgraph_order_hx$(OBJ) \ 1622 - hgraph_order_nd$(OBJ) \ 1623 - hgraph_order_si$(OBJ) \ 1624 - hgraph_order_st$(OBJ) \ 1625 - hmesh$(OBJ) \ 1626 - hmesh_check$(OBJ) \ 1627 - hmesh_hgraph$(OBJ) \ 1628 - hmesh_induce$(OBJ) \ 1629 - hmesh_mesh$(OBJ) \ 1630 - hmesh_order_bl$(OBJ) \ 1631 - hmesh_order_cp$(OBJ) \ 1632 - hmesh_order_gr$(OBJ) \ 1633 - hmesh_order_gp$(OBJ) \ 1634 - hmesh_order_hd$(OBJ) \ 1635 - hmesh_order_hf$(OBJ) \ 1636 - hmesh_order_hx$(OBJ) \ 1637 - hmesh_order_nd$(OBJ) \ 1638 - hmesh_order_si$(OBJ) \ 1639 - hmesh_order_st$(OBJ) \ 1640 - kgraph$(OBJ) \ 1641 - kgraph_map_rb$(OBJ) \ 1642 - kgraph_map_rb_map$(OBJ) \ 1643 - kgraph_map_rb_part$(OBJ) \ 1644 - kgraph_map_st$(OBJ) \ 1645 - library_arch$(OBJ) \ 1646 - library_arch_f$(OBJ) \ 1647 - library_arch_build$(OBJ) \ 1648 - library_arch_build_f$(OBJ) \ 1649 - library_arch_cmpltw$(OBJ) \ 1650 - library_arch_cmpltw_f$(OBJ) \ 1651 - library_geom$(OBJ) \ 1652 - library_geom_f$(OBJ) \ 1653 - library_graph$(OBJ) \ 1654 - library_graph_f$(OBJ) \ 1655 - library_graph_base$(OBJ) \ 1656 - library_graph_base_f$(OBJ) \ 1657 - library_graph_check$(OBJ) \ 1658 - library_graph_check_f$(OBJ) \ 1659 - library_graph_io_chac$(OBJ) \ 1660 - library_graph_io_chac_f$(OBJ) \ 1661 - library_graph_io_habo$(OBJ) \ 1662 - library_graph_io_habo_f$(OBJ) \ 1663 - library_graph_io_mmkt$(OBJ) \ 1664 - library_graph_io_mmkt_f$(OBJ) \ 1665 - library_graph_io_scot$(OBJ) \ 1666 - library_graph_io_scot_f$(OBJ) \ 1667 - library_graph_map$(OBJ) \ 1668 - library_graph_map_f$(OBJ) \ 1669 - library_graph_map_view$(OBJ) \ 1670 - library_graph_map_view_f$(OBJ) \ 1671 - library_graph_order$(OBJ) \ 1672 - library_graph_order_f$(OBJ) \ 1673 - library_mesh$(OBJ) \ 1674 - library_mesh_f$(OBJ) \ 1675 - library_mesh_graph$(OBJ) \ 1676 - library_mesh_graph_f$(OBJ) \ 1677 - library_mesh_io_habo$(OBJ) \ 1678 - library_mesh_io_habo_f$(OBJ) \ 1679 - library_mesh_io_scot$(OBJ) \ 1680 - library_mesh_io_scot_f$(OBJ) \ 1681 - library_mesh_order$(OBJ) \ 1682 - library_mesh_order_f$(OBJ) \ 1683 - library_parser$(OBJ) \ 1684 - library_parser_f$(OBJ) \ 1685 - library_random$(OBJ) \ 1686 - library_random_f$(OBJ) \ 1687 - mapping$(OBJ) \ 1688 - mapping_io$(OBJ) \ 1689 - mesh$(OBJ) \ 1690 - mesh_check$(OBJ) \ 1691 - mesh_coarsen$(OBJ) \ 1692 - mesh_graph$(OBJ) \ 1693 - mesh_induce_sepa$(OBJ) \ 1694 - mesh_io$(OBJ) \ 1695 - mesh_io_habo$(OBJ) \ 1696 - mesh_io_scot$(OBJ) \ 1697 - order$(OBJ) \ 1698 - order_check$(OBJ) \ 1699 - order_io$(OBJ) \ 1700 - parser$(OBJ) \ 1701 - parser_ll$(OBJ) \ 1702 - parser_yy$(OBJ) \ 1703 - vgraph$(OBJ) \ 1704 - vgraph_check$(OBJ) \ 1705 - vgraph_separate_bd$(OBJ) \ 1706 - vgraph_separate_es$(OBJ) \ 1707 - vgraph_separate_fm$(OBJ) \ 1708 - vgraph_separate_gg$(OBJ) \ 1709 - vgraph_separate_gp$(OBJ) \ 1710 - vgraph_separate_ml$(OBJ) \ 1711 - vgraph_separate_st$(OBJ) \ 1712 - vgraph_separate_th$(OBJ) \ 1713 - vgraph_separate_vw$(OBJ) \ 1714 - vgraph_separate_zr$(OBJ) \ 1715 - vgraph_store$(OBJ) \ 1716 - vmesh$(OBJ) \ 1717 - vmesh_check$(OBJ) \ 1718 - vmesh_separate_fm$(OBJ) \ 1719 - vmesh_separate_gg$(OBJ) \ 1720 - vmesh_separate_gr$(OBJ) \ 1721 - vmesh_separate_ml$(OBJ) \ 1722 - vmesh_separate_zr$(OBJ) \ 1723 - vmesh_separate_st$(OBJ) \ 1724 - vmesh_store$(OBJ) 1725 - $(AR) $(ARFLAGS) $(@) $(?) 1726 - -$(RANLIB) $(@) 1727 - 1641 + libnfioscotch$(LIB) : arch$(OBJ) \ 1642 + arch_build$(OBJ) \ 1643 + arch_cmplt$(OBJ) \ 1644 + arch_cmpltw$(OBJ) \ 1645 + arch_deco$(OBJ) \ 1646 + arch_hcub$(OBJ) \ 1647 + arch_mesh$(OBJ) \ 1648 + arch_tleaf$(OBJ) \ 1649 + arch_torus$(OBJ) \ 1650 + arch_vcmplt$(OBJ) \ 1651 + arch_vhcub$(OBJ) \ 1652 + bgraph$(OBJ) \ 1653 + bgraph_bipart_bd$(OBJ) \ 1654 + bgraph_bipart_df$(OBJ) \ 1655 + bgraph_bipart_ex$(OBJ) \ 1656 + bgraph_bipart_fm$(OBJ) \ 1657 + bgraph_bipart_gg$(OBJ) \ 1658 + bgraph_bipart_gp$(OBJ) \ 1659 + bgraph_bipart_ml$(OBJ) \ 1660 + bgraph_bipart_st$(OBJ) \ 1661 + bgraph_bipart_zr$(OBJ) \ 1662 + bgraph_check$(OBJ) \ 1663 + bgraph_store$(OBJ) \ 1664 + common$(OBJ) \ 1665 + common_file$(OBJ) \ 1666 + common_file_compress$(OBJ) \ 1667 + common_file_uncompress$(OBJ) \ 1668 + common_integer$(OBJ) \ 1669 + common_memory$(OBJ) \ 1670 + common_stub$(OBJ) \ 1671 + gain$(OBJ) \ 1672 + geom$(OBJ) \ 1673 + graph$(OBJ) \ 1674 + graph_base$(OBJ) \ 1675 + graph_check$(OBJ) \ 1676 + graph_coarsen$(OBJ) \ 1677 + graph_induce$(OBJ) \ 1678 + graph_io$(OBJ) \ 1679 + graph_io_chac$(OBJ) \ 1680 + graph_io_habo$(OBJ) \ 1681 + graph_io_mmkt$(OBJ) \ 1682 + graph_io_scot$(OBJ) \ 1683 + graph_list$(OBJ) \ 1684 + hall_order_hd$(OBJ) \ 1685 + hall_order_hf$(OBJ) \ 1686 + hall_order_hx$(OBJ) \ 1687 + hgraph$(OBJ) \ 1688 + hgraph_check$(OBJ) \ 1689 + hgraph_induce$(OBJ) \ 1690 + hgraph_order_bl$(OBJ) \ 1691 + hgraph_order_cp$(OBJ) \ 1692 + hgraph_order_gp$(OBJ) \ 1693 + hgraph_order_hd$(OBJ) \ 1694 + hgraph_order_hf$(OBJ) \ 1695 + hgraph_order_hx$(OBJ) \ 1696 + hgraph_order_nd$(OBJ) \ 1697 + hgraph_order_si$(OBJ) \ 1698 + hgraph_order_st$(OBJ) \ 1699 + hmesh$(OBJ) \ 1700 + hmesh_check$(OBJ) \ 1701 + hmesh_hgraph$(OBJ) \ 1702 + hmesh_induce$(OBJ) \ 1703 + hmesh_mesh$(OBJ) \ 1704 + hmesh_order_bl$(OBJ) \ 1705 + hmesh_order_cp$(OBJ) \ 1706 + hmesh_order_gr$(OBJ) \ 1707 + hmesh_order_gp$(OBJ) \ 1708 + hmesh_order_hd$(OBJ) \ 1709 + hmesh_order_hf$(OBJ) \ 1710 + hmesh_order_hx$(OBJ) \ 1711 + hmesh_order_nd$(OBJ) \ 1712 + hmesh_order_si$(OBJ) \ 1713 + hmesh_order_st$(OBJ) \ 1714 + kgraph$(OBJ) \ 1715 + kgraph_map_rb$(OBJ) \ 1716 + kgraph_map_rb_map$(OBJ) \ 1717 + kgraph_map_rb_part$(OBJ) \ 1718 + kgraph_map_st$(OBJ) \ 1719 + library_arch$(OBJ) \ 1720 + library_arch_f$(OBJ) \ 1721 + library_arch_build$(OBJ) \ 1722 + library_arch_build_f$(OBJ) \ 1723 + library_arch_cmpltw$(OBJ) \ 1724 + library_arch_cmpltw_f$(OBJ) \ 1725 + library_geom$(OBJ) \ 1726 + library_geom_f$(OBJ) \ 1727 + library_graph$(OBJ) \ 1728 + library_graph_f$(OBJ) \ 1729 + library_graph_base$(OBJ) \ 1730 + library_graph_base_f$(OBJ) \ 1731 + library_graph_check$(OBJ) \ 1732 + library_graph_check_f$(OBJ) \ 1733 + library_graph_io_chac$(OBJ) \ 1734 + library_graph_io_chac_f$(OBJ) \ 1735 + library_graph_io_habo$(OBJ) \ 1736 + library_graph_io_habo_f$(OBJ) \ 1737 + library_graph_io_mmkt$(OBJ) \ 1738 + library_graph_io_mmkt_f$(OBJ) \ 1739 + library_graph_io_scot$(OBJ) \ 1740 + library_graph_io_scot_f$(OBJ) \ 1741 + library_graph_map$(OBJ) \ 1742 + library_graph_map_f$(OBJ) \ 1743 + library_graph_map_view$(OBJ) \ 1744 + library_graph_map_view_f$(OBJ) \ 1745 + library_graph_order$(OBJ) \ 1746 + library_graph_order_f$(OBJ) \ 1747 + library_mesh$(OBJ) \ 1748 + library_mesh_f$(OBJ) \ 1749 + library_mesh_graph$(OBJ) \ 1750 + library_mesh_graph_f$(OBJ) \ 1751 + library_mesh_io_habo$(OBJ) \ 1752 + library_mesh_io_habo_f$(OBJ) \ 1753 + library_mesh_io_scot$(OBJ) \ 1754 + library_mesh_io_scot_f$(OBJ) \ 1755 + library_mesh_order$(OBJ) \ 1756 + library_mesh_order_f$(OBJ) \ 1757 + library_parser$(OBJ) \ 1758 + library_parser_f$(OBJ) \ 1759 + library_random$(OBJ) \ 1760 + library_random_f$(OBJ) \ 1761 + mapping$(OBJ) \ 1762 + mapping_io$(OBJ) \ 1763 + mesh$(OBJ) \ 1764 + mesh_check$(OBJ) \ 1765 + mesh_coarsen$(OBJ) \ 1766 + mesh_graph$(OBJ) \ 1767 + mesh_induce_sepa$(OBJ) \ 1768 + mesh_io$(OBJ) \ 1769 + mesh_io_habo$(OBJ) \ 1770 + mesh_io_scot$(OBJ) \ 1771 + order$(OBJ) \ 1772 + order_check$(OBJ) \ 1773 + order_io$(OBJ) \ 1774 + parser$(OBJ) \ 1775 + parser_ll$(OBJ) \ 1776 + parser_yy$(OBJ) \ 1777 + vgraph$(OBJ) \ 1778 + vgraph_check$(OBJ) \ 1779 + vgraph_separate_bd$(OBJ) \ 1780 + vgraph_separate_es$(OBJ) \ 1781 + vgraph_separate_fm$(OBJ) \ 1782 + vgraph_separate_gg$(OBJ) \ 1783 + vgraph_separate_gp$(OBJ) \ 1784 + vgraph_separate_ml$(OBJ) \ 1785 + vgraph_separate_st$(OBJ) \ 1786 + vgraph_separate_th$(OBJ) \ 1787 + vgraph_separate_vw$(OBJ) \ 1788 + vgraph_separate_zr$(OBJ) \ 1789 + vgraph_store$(OBJ) \ 1790 + vmesh$(OBJ) \ 1791 + vmesh_check$(OBJ) \ 1792 + vmesh_separate_fm$(OBJ) \ 1793 + vmesh_separate_gg$(OBJ) \ 1794 + vmesh_separate_gr$(OBJ) \ 1795 + vmesh_separate_ml$(OBJ) \ 1796 + vmesh_separate_zr$(OBJ) \ 1797 + vmesh_separate_st$(OBJ) \ 1798 + vmesh_store$(OBJ) 1799 + $(AR) $(ARFLAGS) lib$(SCOTCHLIB)$(LIB) $(?) 1800 + -$(RANLIB) lib$(SCOTCHLIB)$(LIB) 1801 + 1802 + libmexscotch$(LIB) : arch$(OBJ) \ 1803 + arch_build$(OBJ) \ 1804 + arch_cmplt$(OBJ) \ 1805 + arch_cmpltw$(OBJ) \ 1806 + arch_deco$(OBJ) \ 1807 + arch_hcub$(OBJ) \ 1808 + arch_mesh$(OBJ) \ 1809 + arch_tleaf$(OBJ) \ 1810 + arch_torus$(OBJ) \ 1811 + arch_vcmplt$(OBJ) \ 1812 + arch_vhcub$(OBJ) \ 1813 + bgraph$(OBJ) \ 1814 + bgraph_bipart_bd$(OBJ) \ 1815 + bgraph_bipart_df$(OBJ) \ 1816 + bgraph_bipart_ex$(OBJ) \ 1817 + bgraph_bipart_fm$(OBJ) \ 1818 + bgraph_bipart_gg$(OBJ) \ 1819 + bgraph_bipart_gp$(OBJ) \ 1820 + bgraph_bipart_ml$(OBJ) \ 1821 + bgraph_bipart_st$(OBJ) \ 1822 + bgraph_bipart_zr$(OBJ) \ 1823 + bgraph_check$(OBJ) \ 1824 + bgraph_store$(OBJ) \ 1825 + common$(OBJ) \ 1826 + common_file$(OBJ) \ 1827 + common_file_compress$(OBJ) \ 1828 + common_file_uncompress$(OBJ) \ 1829 + common_integer$(OBJ) \ 1830 + common_memory$(OBJ) \ 1831 + common_stub$(OBJ) \ 1832 + gain$(OBJ) \ 1833 + geom$(OBJ) \ 1834 + graph$(OBJ) \ 1835 + graph_base$(OBJ) \ 1836 + graph_check$(OBJ) \ 1837 + graph_coarsen$(OBJ) \ 1838 + graph_induce$(OBJ) \ 1839 + graph_io$(OBJ) \ 1840 + graph_io_chac$(OBJ) \ 1841 + graph_io_habo$(OBJ) \ 1842 + graph_io_mmkt$(OBJ) \ 1843 + graph_io_scot$(OBJ) \ 1844 + graph_list$(OBJ) \ 1845 + hall_order_hd$(OBJ) \ 1846 + hall_order_hf$(OBJ) \ 1847 + hall_order_hx$(OBJ) \ 1848 + hgraph$(OBJ) \ 1849 + hgraph_check$(OBJ) \ 1850 + hgraph_induce$(OBJ) \ 1851 + hgraph_order_bl$(OBJ) \ 1852 + hgraph_order_cp$(OBJ) \ 1853 + hgraph_order_gp$(OBJ) \ 1854 + hgraph_order_hd$(OBJ) \ 1855 + hgraph_order_hf$(OBJ) \ 1856 + hgraph_order_hx$(OBJ) \ 1857 + hgraph_order_nd$(OBJ) \ 1858 + hgraph_order_si$(OBJ) \ 1859 + hgraph_order_st$(OBJ) \ 1860 + hmesh$(OBJ) \ 1861 + hmesh_check$(OBJ) \ 1862 + hmesh_hgraph$(OBJ) \ 1863 + hmesh_induce$(OBJ) \ 1864 + hmesh_mesh$(OBJ) \ 1865 + hmesh_order_bl$(OBJ) \ 1866 + hmesh_order_cp$(OBJ) \ 1867 + hmesh_order_gr$(OBJ) \ 1868 + hmesh_order_gp$(OBJ) \ 1869 + hmesh_order_hd$(OBJ) \ 1870 + hmesh_order_hf$(OBJ) \ 1871 + hmesh_order_hx$(OBJ) \ 1872 + hmesh_order_nd$(OBJ) \ 1873 + hmesh_order_si$(OBJ) \ 1874 + hmesh_order_st$(OBJ) \ 1875 + kgraph$(OBJ) \ 1876 + kgraph_map_rb$(OBJ) \ 1877 + kgraph_map_rb_map$(OBJ) \ 1878 + kgraph_map_rb_part$(OBJ) \ 1879 + kgraph_map_st$(OBJ) \ 1880 + library_arch$(OBJ) \ 1881 + library_arch_f$(OBJ) \ 1882 + library_arch_build$(OBJ) \ 1883 + library_arch_build_f$(OBJ) \ 1884 + library_arch_cmpltw$(OBJ) \ 1885 + library_arch_cmpltw_f$(OBJ) \ 1886 + library_geom$(OBJ) \ 1887 + library_geom_f$(OBJ) \ 1888 + library_graph$(OBJ) \ 1889 + library_graph_f$(OBJ) \ 1890 + library_graph_base$(OBJ) \ 1891 + library_graph_base_f$(OBJ) \ 1892 + library_graph_check$(OBJ) \ 1893 + library_graph_check_f$(OBJ) \ 1894 + library_graph_io_chac$(OBJ) \ 1895 + library_graph_io_chac_f$(OBJ) \ 1896 + library_graph_io_habo$(OBJ) \ 1897 + library_graph_io_habo_f$(OBJ) \ 1898 + library_graph_io_mmkt$(OBJ) \ 1899 + library_graph_io_mmkt_f$(OBJ) \ 1900 + library_graph_io_scot$(OBJ) \ 1901 + library_graph_io_scot_f$(OBJ) \ 1902 + library_graph_map$(OBJ) \ 1903 + library_graph_map_f$(OBJ) \ 1904 + library_graph_map_view$(OBJ) \ 1905 + library_graph_map_view_f$(OBJ) \ 1906 + library_graph_order$(OBJ) \ 1907 + library_graph_order_f$(OBJ) \ 1908 + library_mesh$(OBJ) \ 1909 + library_mesh_f$(OBJ) \ 1910 + library_mesh_graph$(OBJ) \ 1911 + library_mesh_graph_f$(OBJ) \ 1912 + library_mesh_io_habo$(OBJ) \ 1913 + library_mesh_io_habo_f$(OBJ) \ 1914 + library_mesh_io_scot$(OBJ) \ 1915 + library_mesh_io_scot_f$(OBJ) \ 1916 + library_mesh_order$(OBJ) \ 1917 + library_mesh_order_f$(OBJ) \ 1918 + library_parser$(OBJ) \ 1919 + library_parser_f$(OBJ) \ 1920 + library_random$(OBJ) \ 1921 + library_random_f$(OBJ) \ 1922 + mapping$(OBJ) \ 1923 + mapping_io$(OBJ) \ 1924 + mesh$(OBJ) \ 1925 + mesh_check$(OBJ) \ 1926 + mesh_coarsen$(OBJ) \ 1927 + mesh_graph$(OBJ) \ 1928 + mesh_induce_sepa$(OBJ) \ 1929 + mesh_io$(OBJ) \ 1930 + mesh_io_habo$(OBJ) \ 1931 + mesh_io_scot$(OBJ) \ 1932 + order$(OBJ) \ 1933 + order_check$(OBJ) \ 1934 + order_io$(OBJ) \ 1935 + parser$(OBJ) \ 1936 + parser_ll$(OBJ) \ 1937 + parser_yy$(OBJ) \ 1938 + vgraph$(OBJ) \ 1939 + vgraph_check$(OBJ) \ 1940 + vgraph_separate_bd$(OBJ) \ 1941 + vgraph_separate_es$(OBJ) \ 1942 + vgraph_separate_fm$(OBJ) \ 1943 + vgraph_separate_gg$(OBJ) \ 1944 + vgraph_separate_gp$(OBJ) \ 1945 + vgraph_separate_ml$(OBJ) \ 1946 + vgraph_separate_st$(OBJ) \ 1947 + vgraph_separate_th$(OBJ) \ 1948 + vgraph_separate_vw$(OBJ) \ 1949 + vgraph_separate_zr$(OBJ) \ 1950 + vgraph_store$(OBJ) \ 1951 + vmesh$(OBJ) \ 1952 + vmesh_check$(OBJ) \ 1953 + vmesh_separate_fm$(OBJ) \ 1954 + vmesh_separate_gg$(OBJ) \ 1955 + vmesh_separate_gr$(OBJ) \ 1956 + vmesh_separate_ml$(OBJ) \ 1957 + vmesh_separate_zr$(OBJ) \ 1958 + vmesh_separate_st$(OBJ) \ 1959 + vmesh_store$(OBJ) 1960 + $(AR) $(ARFLAGS) lib$(SCOTCHLIB)$(LIB) $(?) 1961 + -$(RANLIB) lib$(SCOTCHLIB)$(LIB) 1962 + 1728 1963 libptscotcherr$(LIB) : library_error$(OBJ) 1729 1964 $(AR) $(ARFLAGS) $(@) $(?) 1730 1965 -$(RANLIB) $(@) 1731 --- 2452,2457 ---- 1732 *** ************1733 *** 2642,2651 **** 1966 *************** 1967 *** 2467,2469 **** 1968 --- 2817,2835 ---- 1734 1969 libscotcherrexit$(LIB) : library_error_exit$(OBJ) 1735 1970 $(AR) $(ARFLAGS) $(@) $(?) 1736 1971 -$(RANLIB) $(@) 1737 - libmexscotcherr$(LIB) : library_error$(OBJ) 1738 - $(AR) $(ARFLAGS) $(@) $(?) 1739 - -$(RANLIB) $(@) 1740 - 1741 - libmexscotcherrexit$(LIB) : library_error_exit$(OBJ) 1742 - $(AR) $(ARFLAGS) $(@) $(?) 1743 - -$(RANLIB) $(@) 1744 --- 2467,2469 ---- 1745 diff -rc src/src/libscotch/mapping.h old/src/libscotch/mapping.h 1746 *** src/src/libscotch/mapping.h 2010-07-19 12:08:20.575684903 -0700 1747 --- old/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700 1748 *************** 1749 *** 106,116 **** 1972 + 1973 + libnfioscotcherr$(LIB) : library_error$(OBJ) 1974 + $(AR) $(ARFLAGS) $(@) $(?) 1975 + -$(RANLIB) $(@) 1976 + 1977 + libnfioscotcherrexit$(LIB) : library_error_exit$(OBJ) 1978 + $(AR) $(ARFLAGS) $(@) $(?) 1979 + -$(RANLIB) $(@) 1980 + 1981 + libmexscotcherr$(LIB) : library_error$(OBJ) 1982 + $(AR) $(ARFLAGS) $(@) $(?) 1983 + -$(RANLIB) $(@) 1984 + 1985 + libmexscotcherrexit$(LIB) : library_error_exit$(OBJ) 1986 + $(AR) $(ARFLAGS) $(@) $(?) 1987 + -$(RANLIB) $(@) 1988 diff -rc src/src/libscotch/mapping.h new5/src/libscotch/mapping.h 1989 *** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700 1990 --- new5/src/libscotch/mapping.h 2010-07-19 15:03:48.720124571 -0700 1991 *************** 1992 *** 106,112 **** 1993 --- 106,116 ---- 1750 1994 int mapInit2 (Mapping * restrict const, const Gnum, const Gnum, const Arch * restrict const, const ArchDom * restrict const); 1751 1995 void mapExit (Mapping * const); 1752 1996 int mapLoad (Mapping * restrict const, const Gnum * restrict const, FILE * restrict const); 1753 - #ifndef MATLAB 1997 + #ifndef NOFILEIO 1754 1998 int mapSave (const Mapping * restrict const, const Gnum * restrict const, FILE * restrict const); 1755 - #else /* MATLAB*/1756 -int mapSave (Gnum *, Gnum (**)[2], const Mapping * restrict const, const Gnum * restrict const, FILE * restrict const);1757 - #endif /* MATLAB*/1999 + #else /* NOFILEIO */ 2000 + int mapSave (Gnum *, Gnum (**)[2], const Mapping * restrict const, const Gnum * restrict const, FILE * restrict const); 2001 + #endif /* NOFILEIO */ 1758 2002 int mapView (const Mapping * restrict const, const Graph * restrict const, FILE * const); 1759 2003 1760 2004 #undef static 1761 --- 106,112 ---- 1762 diff -rc src/src/libscotch/mapping_io.c old/src/libscotch/mapping_io.c 1763 *** src/src/libscotch/mapping_io.c 2010-07-19 12:08:20.578684924-07001764 --- old/src/libscotch/mapping_io.c 2008-05-22 06:44:43.000000000 -0700 1765 *** ************1766 *** 199,208 **** 2005 diff -rc src/src/libscotch/mapping_io.c new5/src/libscotch/mapping_io.c 2006 *** src/src/libscotch/mapping_io.c 2008-05-22 06:44:43.000000000 -0700 2007 --- new5/src/libscotch/mapping_io.c 2010-07-20 10:07:35.070425160 -0700 2008 *************** 2009 *** 199,204 **** 2010 --- 199,208 ---- 1767 2011 1768 2012 int 1769 2013 mapSave ( 1770 - #ifdef MATLAB 1771 -Gnum *pnvert,1772 -Gnum (**pmaptab)[2],1773 - #endif /* MATLAB*/2014 + #ifdef NOFILEIO 2015 + Gnum *pnvert, 2016 + Gnum (**pmaptab)[2], 2017 + #endif /* NOFILEIO */ 1774 2018 const Mapping * restrict const mappptr, 1775 2019 const Gnum * restrict const vlbltab, 1776 2020 FILE * restrict const stream) 1777 --- 199,204 ---- 1778 *************** 1779 *** 210,258 **** 2021 *************** 2022 *** 206,226 **** 1780 2023 const Gnum * restrict vlbltax; 1781 2024 Gnum vertnum; 1782 2025 1783 - #ifdef MATLAB1784 - printf("mapSave - stream=%p\n",stream);1785 - #endif /* MATLAB */1786 2026 vlbltax = (vlbltab != NULL) ? (vlbltab - mappptr->baseval) : NULL; 1787 2027 1788 - #ifndef MATLAB1789 2028 if (fprintf (stream, "%ld\n", (long) mappptr->vertnbr) == EOF) { 1790 2029 errorPrint ("mapSave: bad output (1)"); 1791 2030 return (1); 1792 2031 } 1793 - #else /* MATLAB */ 1794 - if (pnvert) { 1795 - *pnvert=mappptr->vertnbr; 1796 - printf("mapSave - nvert=%d\n",*pnvert); 1797 - } 1798 - if (pmaptab) { 1799 - *pmaptab = (Gnum (*)[2]) malloc(mappptr->vertnbr*2*sizeof(Gnum)); 1800 - printf("mapSave - maptab=%p\n",*pmaptab); 1801 - } 1802 - #endif /* MATLAB */ 1803 1804 - #ifndef MATLAB 2032 2033 for (vertnum = mappptr->baseval; vertnum < (mappptr->vertnbr + mappptr->baseval); vertnum ++) { 2034 if (fprintf (stream, "%ld\t%ld\n", 2035 ! (long) ((vlbltax != NULL) ? vlbltax[vertnum] : vertnum), 2036 (long) archDomNum (&mappptr->archdat, &mappptr->domntab[mappptr->parttax[vertnum]])) == EOF) { 2037 errorPrint ("mapSave: bad output (2)"); 2038 return (1); 2039 } 2040 } 2041 2042 return (0); 2043 } 2044 --- 210,258 ---- 2045 const Gnum * restrict vlbltax; 2046 Gnum vertnum; 2047 2048 + #ifdef NOFILEIO 2049 + // printf("mapSave - stream=%p\n",stream); 2050 + #endif /* NOFILEIO */ 2051 vlbltax = (vlbltab != NULL) ? (vlbltab - mappptr->baseval) : NULL; 2052 2053 + #ifndef NOFILEIO 2054 if (fprintf (stream, "%ld\n", (long) mappptr->vertnbr) == EOF) { 2055 errorPrint ("mapSave: bad output (1)"); 2056 return (1); 2057 } 2058 + #else /* NOFILEIO */ 2059 + if (pnvert) { 2060 + *pnvert=mappptr->vertnbr; 2061 + // printf("mapSave - nvert=%d\n",*pnvert); 2062 + } 2063 + if (pmaptab) { 2064 + *pmaptab = (Gnum (*)[2]) malloc(mappptr->vertnbr*2*sizeof(Gnum)); 2065 + // printf("mapSave - maptab=%p\n",*pmaptab); 2066 + } 2067 + #endif /* NOFILEIO */ 2068 2069 + #ifndef NOFILEIO 1805 2070 for (vertnum = mappptr->baseval; vertnum < (mappptr->vertnbr + mappptr->baseval); vertnum ++) { 1806 2071 if (fprintf (stream, "%ld\t%ld\n", … … 1813 2078 } 1814 2079 } 1815 - #else /* MATLAB*/1816 -if (pmaptab && *pmaptab)1817 -for (vertnum = mappptr->baseval; vertnum < (mappptr->vertnbr + mappptr->baseval); vertnum ++) {1818 -/* not sure why, but need to offset vlbltax in other direction (jes, 12/11/09) */1819 -// (*pmaptab)[vertnum-mappptr->baseval][0]=((vlbltax != NULL) ? vlbltax[vertnum] : vertnum);1820 -(*pmaptab)[vertnum-mappptr->baseval][0]=((vlbltax != NULL) ? vlbltax[vertnum+mappptr->baseval] : vertnum);1821 -(*pmaptab)[vertnum-mappptr->baseval][1]=archDomNum (&mappptr->archdat, &mappptr->domntab[mappptr->parttax[vertnum]]);1822 -// printf("mapSave - vertnum=%d; vlbltax=%d,archDomNum=%d\n",1823 -// vertnum,((vlbltax != NULL) ? vlbltax[vertnum+mappptr->baseval] : -1),archDomNum (&mappptr->archdat, &mappptr->domntab[mappptr->parttax[vertnum]]));1824 -}1825 - #endif /* MATLAB*/2080 + #else /* NOFILEIO */ 2081 + if (pmaptab && *pmaptab) 2082 + for (vertnum = mappptr->baseval; vertnum < (mappptr->vertnbr + mappptr->baseval); vertnum ++) { 2083 + /* not sure why, but need to offset vlbltax in other direction (jes, 12/11/09) */ 2084 + // (*pmaptab)[vertnum-mappptr->baseval][0]=((vlbltax != NULL) ? vlbltax[vertnum] : vertnum); 2085 + (*pmaptab)[vertnum-mappptr->baseval][0]=((vlbltax != NULL) ? vlbltax[vertnum+mappptr->baseval] : vertnum); 2086 + (*pmaptab)[vertnum-mappptr->baseval][1]=archDomNum (&mappptr->archdat, &mappptr->domntab[mappptr->parttax[vertnum]]); 2087 + // printf("mapSave - vertnum=%d; vlbltax=%d,archDomNum=%d\n", 2088 + // vertnum,((vlbltax != NULL) ? vlbltax[vertnum+mappptr->baseval] : -1),archDomNum (&mappptr->archdat, &mappptr->domntab[mappptr->parttax[vertnum]])); 2089 + } 2090 + #endif /* NOFILEIO */ 1826 2091 1827 2092 return (0); 1828 2093 } 1829 --- 206,226 ---- 1830 const Gnum * restrict vlbltax; 1831 Gnum vertnum; 1832 1833 vlbltax = (vlbltab != NULL) ? (vlbltab - mappptr->baseval) : NULL; 1834 1835 if (fprintf (stream, "%ld\n", (long) mappptr->vertnbr) == EOF) { 1836 errorPrint ("mapSave: bad output (1)"); 1837 return (1); 1838 } 1839 1840 for (vertnum = mappptr->baseval; vertnum < (mappptr->vertnbr + mappptr->baseval); vertnum ++) { 1841 if (fprintf (stream, "%ld\t%ld\n", 1842 ! (long) ((vlbltax != NULL) ? vlbltax[vertnum] : vertnum), 1843 (long) archDomNum (&mappptr->archdat, &mappptr->domntab[mappptr->parttax[vertnum]])) == EOF) { 1844 errorPrint ("mapSave: bad output (2)"); 1845 return (1); 1846 } 1847 } 1848 1849 return (0); 1850 } 1851 diff -rc src/src/libscotch/mesh_io_scot.c old/src/libscotch/mesh_io_scot.c 1852 *** src/src/libscotch/mesh_io_scot.c 2010-07-19 12:08:20.581684945 -0700 1853 --- old/src/libscotch/mesh_io_scot.c 2008-05-22 06:44:43.000000000 -0700 1854 *************** 1855 *** 85,95 **** 2094 diff -rc src/src/libscotch/mesh_io_scot.c new5/src/libscotch/mesh_io_scot.c 2095 *** src/src/libscotch/mesh_io_scot.c 2008-05-22 06:44:43.000000000 -0700 2096 --- new5/src/libscotch/mesh_io_scot.c 2010-07-19 15:04:11.402157488 -0700 2097 *************** 2098 *** 85,91 **** 2099 --- 85,95 ---- 1856 2100 int o; 1857 2101 1858 2102 if (filesrcptr != NULL) { 1859 - #ifndef MATLAB 2103 + #ifndef NOFILEIO 1860 2104 if (graphLoad (meshptr, filesrcptr, -1, 0) != 0) 1861 - #else /* MATLAB*/1862 -if (graphLoad (meshptr, filesrcptr, -1, 0, 0, 0, NULL, NULL, NULL, NULL, NULL) != 0)1863 - #endif /* MATLAB*/2105 + #else /* NOFILEIO */ 2106 + if (graphLoad (meshptr, filesrcptr, -1, 0, 0, 0, NULL, NULL, NULL, NULL, NULL) != 0) 2107 + #endif /* NOFILEIO */ 1864 2108 return (1); 1865 2109 } 1866 2110 1867 --- 85,91 ---- 1868 diff -rc src/src/libscotch/module.h old/src/libscotch/module.h 1869 *** src/src/libscotch/module.h 2010-07-19 12:08:20.584684966-07001870 --- old/src/libscotch/module.h 2009-04-26 23:07:14.000000000 -0700 1871 *** ************1872 *** 1,5 **** 1873 -#ifndef _SCOTCH_MODULE_H_1874 -#define _SCOTCH_MODULE_H_2111 diff -rc src/src/libscotch/module.h new5/src/libscotch/module.h 2112 *** src/src/libscotch/module.h 2009-04-26 23:07:14.000000000 -0700 2113 --- new5/src/libscotch/module.h 2010-07-21 12:00:44.312746389 -0700 2114 *************** 2115 *** 1,3 **** 2116 --- 1,5 ---- 2117 + #ifndef _SCOTCH_MODULE_H_ 2118 + #define _SCOTCH_MODULE_H_ 1875 2119 /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS 1876 2120 ** 1877 2121 ** This file is part of the Scotch software package for static mapping, 1878 --- 1,3 ---- 1879 *** ************1880 *** 57,65 **** 2122 *************** 2123 *** 55,60 **** 2124 --- 57,65 ---- 1881 2125 1882 2126 #define MODULE_H 1883 2127 1884 -/*Don't forget stdint.h:*/1885 -#include "stdint.h"1886 -2128 + /*Don't forget stdint.h:*/ 2129 + #include "stdint.h" 2130 + 1887 2131 /* 1888 2132 ** Collective communication handling. 1889 2133 */ 1890 --- 55,60 ---- 1891 *************** 1892 *** 686,690 **** 2134 *************** 2135 *** 156,161 **** 2136 --- 161,167 ---- 2137 #define intSave _SCOTCHintSave 2138 #define intAscn _SCOTCHintAscn 2139 #define intPerm _SCOTCHintPerm 2140 + #define intRandResetStatic _SCOTCHintRandResetStatic 2141 #define intRandReset _SCOTCHintRandReset 2142 #define intRandInit _SCOTCHintRandInit 2143 /* #define intRandVal _SCOTCHintRandVal Already a macro */ 2144 *************** 2145 *** 681,683 **** 2146 --- 687,691 ---- 1893 2147 #define vmeshStoreSave _SCOTCHvmeshStoreSave 1894 2148 #define vmeshStoreUpdt _SCOTCHvmeshStoreUpdt 1895 2149 #endif /* SCOTCH_RENAME */ 1896 -1897 -#endif //#ifndef _SCOTCH_MODULE_H_1898 --- 681,683 ---- 1899 diff -rc src/src/libscotch/parser_ll.l old/src/libscotch/parser_ll.l 1900 *** src/src/libscotch/parser_ll.l 2010-07-19 12:08:20.586684980-07001901 --- old/src/libscotch/parser_ll.l 2008-05-22 06:44:43.000000000 -0700 1902 *** ************1903 *** 192,214 **** 2150 + 2151 + #endif //#ifndef _SCOTCH_MODULE_H_ 2152 diff -rc src/src/libscotch/parser_ll.l new5/src/libscotch/parser_ll.l 2153 *** src/src/libscotch/parser_ll.l 2008-05-22 06:44:43.000000000 -0700 2154 --- new5/src/libscotch/parser_ll.l 2010-07-15 15:09:01.866095777 -0700 2155 *************** 2156 *** 192,197 **** 2157 --- 192,214 ---- 1904 2158 stratParserInit ( 1905 2159 const char * const string) /*+ Strategy string to parse +*/ 1906 2160 { 1907 -/* reset static variables from previous runs (jes, 4/29/10) */1908 -yy_current_buffer = 0;1909 -yy_hold_char = (char) 0;1910 -yy_n_chars=0; /* number of characters read into yy_ch_buf */1911 -yy_c_buf_p = (char *) 0;1912 -yy_init = 1; /* whether we need to initialize */1913 -yy_start = 0; /* start state number */1914 -yy_did_buffer_switch_on_eof=0;1915 -yy_last_accepting_state=0;1916 -yy_last_accepting_cpos = (char *) 0;1917 -stratparserstringptr = (char *) 0; /* Pointer to the string to parse */1918 -#if YY_STACK_USED1919 -yy_start_stack_ptr = 0;1920 -yy_start_stack_depth = 0;1921 -yy_start_stack = 0;1922 -#endif1923 -2161 + /* reset static variables from previous runs (jes, 4/29/10) */ 2162 + yy_current_buffer = 0; 2163 + yy_hold_char = (char) 0; 2164 + yy_n_chars=0; /* number of characters read into yy_ch_buf */ 2165 + yy_c_buf_p = (char *) 0; 2166 + yy_init = 1; /* whether we need to initialize */ 2167 + yy_start = 0; /* start state number */ 2168 + yy_did_buffer_switch_on_eof=0; 2169 + yy_last_accepting_state=0; 2170 + yy_last_accepting_cpos = (char *) 0; 2171 + stratparserstringptr = (char *) 0; /* Pointer to the string to parse */ 2172 + #if YY_STACK_USED 2173 + yy_start_stack_ptr = 0; 2174 + yy_start_stack_depth = 0; 2175 + yy_start_stack = 0; 2176 + #endif 2177 + 1924 2178 #ifdef FLEX_SCANNER 1925 2179 yyrestart (yyin); /* (Re-)initialize the parser */ 1926 2180 #endif /* FLEX_SCANNER */ 1927 --- 192,197 ---- 1928 diff -rc src/src/libscotch/parser_yy.y old/src/libscotch/parser_yy.y 1929 *** src/src/libscotch/parser_yy.y 2010-07-19 12:08:20.589685001-07001930 --- old/src/libscotch/parser_yy.y 2008-10-22 15:12:48.000000000 -0700 1931 *** ************1932 *** 774,780 **** 2181 diff -rc src/src/libscotch/parser_yy.y new5/src/libscotch/parser_yy.y 2182 *** src/src/libscotch/parser_yy.y 2008-10-22 15:12:48.000000000 -0700 2183 --- new5/src/libscotch/parser_yy.y 2010-07-15 15:09:01.874095786 -0700 2184 *************** 2185 *** 774,779 **** 2186 --- 774,780 ---- 1933 2187 stratParserInit (string); /* Initialize the lexical parser */ 1934 2188 parserstrattab = strattab; /* Point to the parsing tables */ 1935 2189 parserstratcurr = NULL; /* Clear up the temporary strategy pointer */ 1936 -parserparamcurr = NULL; /* reset the last static (jes, 4/29/10) */2190 + parserparamcurr = NULL; /* reset the last static (jes, 4/29/10) */ 1937 2191 1938 2192 if (stratParserParse2 () != 0) { /* Parse the strategy string */ 1939 2193 if (parserstratcurr != NULL) 1940 --- 774,779 ---- 1941 diff -rc src/src/libscotch/vgraph_separate_vw.c old/src/libscotch/vgraph_separate_vw.c 1942 *** src/src/libscotch/vgraph_separate_vw.c 2010-07-19 12:08:20.592685021-07001943 --- old/src/libscotch/vgraph_separate_vw.c 2008-05-22 06:44:43.000000000 -0700 1944 *** ************1945 *** 83,89 **** 2194 diff -rc src/src/libscotch/vgraph_separate_vw.c new5/src/libscotch/vgraph_separate_vw.c 2195 *** src/src/libscotch/vgraph_separate_vw.c 2008-05-22 06:44:43.000000000 -0700 2196 --- new5/src/libscotch/vgraph_separate_vw.c 2010-07-15 15:09:01.882095795 -0700 2197 *************** 2198 *** 83,88 **** 2199 --- 83,89 ---- 1946 2200 FILE * restrict fileptr; 1947 2201 Gnum vertnum; /* Vertex number */ 1948 2202 1949 -printf("vgraphSeparateVw begin -- vgraphseparatevwfilenum=%d\n",vgraphseparatevwfilenum);2203 + printf("vgraphSeparateVw begin -- vgraphseparatevwfilenum=%d\n",vgraphseparatevwfilenum); 1950 2204 sprintf (nametab, "vgraphseparatevw_output_%08d.map", vgraphseparatevwfilenum ++); 1951 2205 if ((fileptr = fopen (nametab, "w+")) == NULL) { 1952 2206 errorPrint ("vgraphSeparateVw: cannot open partition file"); 1953 --- 83,88 ---- 1954 *** ************1955 *** 103,108 **** 2207 *************** 2208 *** 102,106 **** 2209 --- 103,108 ---- 1956 2210 } 1957 2211 } 1958 2212 1959 -printf("vgraphSeparateVw end -- vgraphseparatevwfilenum=%d\n",vgraphseparatevwfilenum);2213 + printf("vgraphSeparateVw end -- vgraphseparatevwfilenum=%d\n",vgraphseparatevwfilenum); 1960 2214 return (0); 1961 2215 } 1962 --- 102,106 ---- 1963 diff -rc src/src/Makefile old/src/Makefile 1964 *** src/src/Makefile 2010-07-19 12:08:20.594685035-07001965 --- old/src/Makefile 2008-09-15 05:50:51.000000000 -0700 1966 *** ************1967 *** 97,106 **** 2216 diff -rc src/src/Makefile new5/src/Makefile 2217 *** src/src/Makefile 2008-09-15 05:50:51.000000000 -0700 2218 --- new5/src/Makefile 2010-07-19 15:29:59.056369854 -0700 2219 *************** 2220 *** 97,102 **** 2221 --- 97,109 ---- 1968 2222 (cd scotch ; $(MAKE) VERSION=\"$(VERSION)\" ptscotch && $(MAKE) ptinstall) 1969 2223 (cd libscotchmetis ; $(MAKE) ptscotch && $(MAKE) ptinstall) 1970 2224 1971 - mexscotch : required 1972 - (cd libscotch ; $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall) 1973 - (cd scotch ; $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall) 1974 - 2225 + nfioscotch : required 2226 + (cd libscotch ; $(MAKE) VERSION=\"$(VERSION)\" nfioscotch && $(MAKE) nfioinstall) 2227 + 2228 + mexscotch : required 2229 + (cd libscotch ; $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall) 2230 + (cd scotch ; $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall) 2231 + 1975 2232 install : required $(bindir) $(includedir) $(libdir) $(mandir)/man1 1976 2233 -$(CP) -f ../bin/[agm]*$(EXE) $(bindir) 1977 2234 -$(CP) -f ../include/*scotch*.h $(includedir) 1978 --- 97,102 ---- 1979 Only in src/src: Makefile.inc 1980 diff -rc src/src/scotch/gmap.h old/src/scotch/gmap.h 1981 *** src/src/scotch/gmap.h 2010-07-19 12:08:20.597685056-07001982 --- old/src/scotch/gmap.h 2008-06-18 11:05:17.000000000 -0700 1983 *** ************1984 *** 1,5 **** 1985 -#ifndef _SCOTCH_GMAP_H_1986 -#define _SCOTCH_GMAP_H_2235 Only in new5/src: Makefile.inc 2236 diff -rc src/src/scotch/gmap.h new5/src/scotch/gmap.h 2237 *** src/src/scotch/gmap.h 2008-06-18 11:05:17.000000000 -0700 2238 --- new5/src/scotch/gmap.h 2010-07-21 11:29:31.069238000 -0700 2239 *************** 2240 *** 1,3 **** 2241 --- 1,5 ---- 2242 + #ifndef _SCOTCH_GMAP_H_ 2243 + #define _SCOTCH_GMAP_H_ 1987 2244 /* Copyright 2004,2007,2008 ENSEIRB, INRIA & CNRS 1988 2245 ** 1989 2246 ** This file is part of the Scotch software package for static mapping, 1990 --- 1,3 ---- 1991 *** ************1992 *** 89,93 **** 2247 *************** 2248 *** 87,89 **** 2249 --- 89,93 ---- 1993 2250 #define C_FLAGVERBSTR 0x0002 /* Verbose flags */ 1994 2251 #define C_FLAGVERBTIM 0x0004 1995 2252 #define C_FLAGVERBMAP 0x0008 1996 - 1997 - #endif //#ifndef _SCOTCH_GMAP_H_ 1998 --- 87,89 ---- 1999 Only in src/src/scotch: gmap_mex.c 2000 Only in src/src/scotch: gmapx.c 2001 diff -rc src/src/scotch/Makefile old/src/scotch/Makefile 2002 *** src/src/scotch/Makefile 2010-07-19 12:08:20.599685070 -0700 2003 --- old/src/scotch/Makefile 2009-04-27 02:19:43.000000000 -0700 2004 *************** 2005 *** 49,62 **** 2253 + 2254 + #endif //#ifndef _SCOTCH_GMAP_H_ 2255 Only in new5/src/scotch: gmap_mex.c 2256 Only in new5/src/scotch: gmapx.c 2257 diff -rc src/src/scotch/Makefile new5/src/scotch/Makefile 2258 *** src/src/scotch/Makefile 2009-04-27 02:19:43.000000000 -0700 2259 --- new5/src/scotch/Makefile 2010-07-20 10:38:13.641149208 -0700 2260 *************** 2261 *** 49,59 **** 2006 2262 %$(EXE) : %.c 2007 2263 $(CC) $(CFLAGS) -I$(includedir) -I../libscotch -DSCOTCH_VERSION=\"$(VERSION)\" $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) 2008 2264 2009 - %$(MEX) : %.c2010 - $(CCM) $(MFLAGS) -I$(includedir) -I../libscotch -DSCOTCH_VERSION=\"$(VERSION)\" $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)2011 -2012 2265 ## 2013 2266 ## Project rules. 2014 2267 ## 2015 2268 2016 ! .PHONY : ptscotch scotch mexscotch ptinstall install mexinstall clean realclean2269 ! .PHONY : ptscotch scotch ptinstall install clean realclean 2017 2270 2018 2271 scotch : clean 2019 2272 $(MAKE) CC="$(CCS)" SCOTCHLIB=scotch \ 2020 --- 49, 59----2273 --- 49,62 ---- 2021 2274 %$(EXE) : %.c 2022 2275 $(CC) $(CFLAGS) -I$(includedir) -I../libscotch -DSCOTCH_VERSION=\"$(VERSION)\" $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) 2023 2276 2277 + %$(MEX) : %.c 2278 + $(CCM) $(MFLAGS) -I$(includedir) -I../libscotch -DSCOTCH_VERSION=\"$(VERSION)\" $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) 2279 + 2024 2280 ## 2025 2281 ## Project rules. 2026 2282 ## 2027 2283 2028 ! .PHONY : ptscotch scotch ptinstallinstall clean realclean2284 ! .PHONY : ptscotch scotch mexscotch ptinstall install mexinstall clean realclean 2029 2285 2030 2286 scotch : clean 2031 2287 $(MAKE) CC="$(CCS)" SCOTCHLIB=scotch \ 2032 2288 *************** 2033 *** 97,108 **** 2289 *** 94,99 **** 2290 --- 97,108 ---- 2034 2291 dgscat$(EXE) \ 2035 2292 dgtst$(EXE) 2036 2293 2037 -mexscotch : clean2038 - $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch \2039 -gmapx$(OBJ)2040 - $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat gmapx$(OBJ)" SCOTCHLIB=scotch \2041 -gmap_mex$(MEX)2042 -2294 + mexscotch : clean 2295 + $(MAKE) CFLAGS="$(CFLAGS) -DNOFILEIO -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=mexscotch \ 2296 + gmapx$(OBJ) 2297 + $(MAKE) CFLAGS="$(CFLAGS) -DNOFILEIO -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat gmapx$(OBJ)" SCOTCHLIB=mexscotch \ 2298 + gmap_mex$(MEX) 2299 + 2043 2300 install : 2044 2301 -$(CP) acpl$(EXE) amk_ccc$(EXE) amk_fft2$(EXE) amk_grf$(EXE) amk_hy$(EXE) amk_m2$(EXE) amk_p2$(EXE) atst$(EXE) gbase$(EXE) gcv$(EXE) gmap$(EXE) gmk_hy$(EXE) gmk_m2$(EXE) gmk_m3$(EXE) gmk_msh$(EXE) gmk_ub2$(EXE) gmtst$(EXE) gord$(EXE) gotst$(EXE) gout$(EXE) *gtst$(EXE) gscat$(EXE) mcv$(EXE) mmk_m2$(EXE) mmk_m3$(EXE) mord$(EXE) mtst$(EXE) $(bindir) 2045 2302 -$(RM) $(bindir)/gpart$(EXE) 2046 --- 94,99 ---- 2047 *** ************2048 *** 113,126 **** 2303 *************** 2304 *** 104,111 **** 2305 --- 113,126 ---- 2049 2306 -$(RM) $(bindir)/dgpart$(EXE) 2050 2307 -$(LN) $(bindir)/dgmap$(EXE) $(bindir)/dgpart$(EXE) 2051 2308 2052 -mexinstall :2053 --$(CP) gmap_mex$(MEX) $(bindir)2054 --$(RM) $(bindir)/gpart_mex$(MEX)2055 --$(LN) $(bindir)/gmap_mex$(MEX) $(bindir)/gpart_mex$(MEX)2056 -2309 + mexinstall : 2310 + -$(CP) gmap_mex$(MEX) $(bindir) 2311 + -$(RM) $(bindir)/gpart_mex$(MEX) 2312 + -$(LN) $(bindir)/gmap_mex$(MEX) $(bindir)/gpart_mex$(MEX) 2313 + 2057 2314 clean : 2058 2315 -$(RM) *~ *$(OBJ) acpl$(EXE) amk_ccc$(EXE) amk_fft2$(EXE) amk_grf$(EXE) amk_hy$(EXE) amk_m2$(EXE) amk_p2$(EXE) atst$(EXE) gbase$(EXE) gcv$(EXE) *gmap$(EXE) gmk_hy$(EXE) gmk_m2$(EXE) gmk_m3$(EXE) gmk_msh$(EXE) gmk_ub2$(EXE) gmtst$(EXE) *gord$(EXE) gotst$(EXE) gout$(EXE) *gpart$(EXE) *gscat$(EXE) *gtst$(EXE) mcv$(EXE) mmk_m2$(EXE) mmk_m3$(EXE) mord$(EXE) mtst$(EXE) 2059 --$(RM) gmap_mex$(MEX)2316 + -$(RM) gmap_mex$(MEX) 2060 2317 2061 2318 realclean : clean 2062 2319 2063 --- 104,111 ---- 2064 *** ************2065 *** 380,403 **** 2320 *************** 2321 *** 365,367 **** 2322 --- 380,403 ---- 2066 2323 $(libdir)/libscotch$(LIB) \ 2067 2324 $(libdir)/libscotcherrexit$(LIB) \ 2068 2325 mtst.h 2069 - 2070 - gmapx$(OBJ) : gmapx.c \ 2071 - ../libscotch/module.h \ 2072 - ../libscotch/common.h \ 2073 - $(includedir)/scotch.h \ 2074 - $(libdir)/libscotch$(LIB) \ 2075 - $(libdir)/libscotcherrexit$(LIB) \ 2076 - gmap.h 2077 - 2078 - gmap_mex$(MEX) : gmap_mex.c \ 2079 - ../libscotch/module.h \ 2080 - ../libscotch/common.h \ 2081 - $(includedir)/scotch.h \ 2082 - $(libdir)/libscotch$(LIB) \ 2083 - $(libdir)/libscotcherrexit$(LIB) \ 2084 - gmap.h 2085 - 2086 - gpart_mex$(MEX) : gmap_mex$(MEX) 2087 - -$(RM) gpart_mex$(MEX) 2088 - -$(LN) gmap_mex$(MEX) gpart_mex$(MEX) 2089 - 2090 --- 365,367 ---- 2326 + 2327 + gmapx$(OBJ) : gmapx.c \ 2328 + ../libscotch/module.h \ 2329 + ../libscotch/common.h \ 2330 + $(includedir)/scotch.h \ 2331 + $(libdir)/libmexscotch$(LIB) \ 2332 + $(libdir)/libmexscotcherrexit$(LIB) \ 2333 + gmap.h 2334 + 2335 + gmap_mex$(MEX) : gmap_mex.c \ 2336 + ../libscotch/module.h \ 2337 + ../libscotch/common.h \ 2338 + $(includedir)/scotch.h \ 2339 + $(libdir)/libmexscotch$(LIB) \ 2340 + $(libdir)/libmexscotcherrexit$(LIB) \ 2341 + gmap.h 2342 + 2343 + gpart_mex$(MEX) : gmap_mex$(MEX) 2344 + -$(RM) gpart_mex$(MEX) 2345 + -$(LN) gmap_mex$(MEX) gpart_mex$(MEX) 2346 +
Note:
See TracChangeset
for help on using the changeset viewer.