![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 4629
- Timestamp:
- 07/15/10 14:54:26 (15 years ago)
- Location:
- issm/trunk/externalpackages/scotch
- Files:
-
- 4 added
- 3 edited
-
install.sh (modified) (1 diff)
-
mex (added)
-
mex/Gmap.c (added)
-
mex/Gmapx.c (added)
-
mex/Makefile (added)
-
scotch.patch (modified) (48 diffs)
-
scotch_jes_notes.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/externalpackages/scotch/install.sh
r3651 r4629 39 39 cp -pr src/doc install 40 40 cp -pr src/man install 41 mkdir install/lib 42 mv src/lib/* install/lib 41 43 mkdir install/bin 42 44 mv src/bin/* install/bin 43 cp -p gmap.m install/bin44 cp -p gpart.m install/bin45 #cp -p gmap.m install/bin 46 #cp -p gpart.m install/bin 45 47 -
issm/trunk/externalpackages/scotch/scotch.patch
r3650 r4629 1 Only in new 3: bin2 Only in new 3: include3 Only in new 3: lib4 diff -rc src/src/libscotch/arch.c new 3/src/libscotch/arch.c1 Only in new4: bin 2 Only in new4: include 3 Only in new4: lib 4 diff -rc src/src/libscotch/arch.c new4/src/libscotch/arch.c 5 5 *** src/src/libscotch/arch.c 2008-09-27 07:48:01.000000000 -0700 6 --- new 3/src/libscotch/arch.c 2010-04-30 10:28:22.088131040-07006 --- new4/src/libscotch/arch.c 2010-05-03 15:37:55.104089848 -0700 7 7 *************** 8 8 *** 173,187 **** … … 68 68 memset (archptr, 0, sizeof (Arch)); /* Initialize architecture body */ 69 69 return (1); 70 diff -rc src/src/libscotch/arch_cmplt.c new 3/src/libscotch/arch_cmplt.c70 diff -rc src/src/libscotch/arch_cmplt.c new4/src/libscotch/arch_cmplt.c 71 71 *** src/src/libscotch/arch_cmplt.c 2008-05-22 06:44:41.000000000 -0700 72 --- new 3/src/libscotch/arch_cmplt.c 2010-04-30 10:28:22.093131042-070072 --- new4/src/libscotch/arch_cmplt.c 2010-05-03 15:37:55.111089854 -0700 73 73 *************** 74 74 *** 90,99 **** … … 120 120 return (1); 121 121 } 122 diff -rc src/src/libscotch/arch_cmplt.h new 3/src/libscotch/arch_cmplt.h122 diff -rc src/src/libscotch/arch_cmplt.h new4/src/libscotch/arch_cmplt.h 123 123 *** src/src/libscotch/arch_cmplt.h 2008-05-22 06:44:41.000000000 -0700 124 --- new 3/src/libscotch/arch_cmplt.h 2010-04-30 10:28:22.098131044-0700124 --- new4/src/libscotch/arch_cmplt.h 2010-05-03 15:37:55.118089860 -0700 125 125 *************** 126 126 *** 87,93 **** … … 137 137 #define archCmpltArchFree NULL 138 138 ArchDomNum archCmpltDomNum (const ArchCmplt * const, const ArchCmpltDom * const); 139 diff -rc src/src/libscotch/arch_cmpltw.c new 3/src/libscotch/arch_cmpltw.c139 diff -rc src/src/libscotch/arch_cmpltw.c new4/src/libscotch/arch_cmpltw.c 140 140 *** src/src/libscotch/arch_cmpltw.c 2008-08-27 14:22:22.000000000 -0700 141 --- new 3/src/libscotch/arch_cmpltw.c 2010-04-30 10:28:22.103131046 -0700141 --- new4/src/libscotch/arch_cmpltw.c 2010-05-03 15:37:55.126089866 -0700 142 142 *************** 143 143 *** 200,211 **** … … 209 209 return (1); 210 210 } 211 diff -rc src/src/libscotch/arch_cmpltw.h new 3/src/libscotch/arch_cmpltw.h211 diff -rc src/src/libscotch/arch_cmpltw.h new4/src/libscotch/arch_cmpltw.h 212 212 *** src/src/libscotch/arch_cmpltw.h 2008-05-22 06:44:41.000000000 -0700 213 --- new 3/src/libscotch/arch_cmpltw.h 2010-04-30 10:28:22.108131048-0700213 --- new4/src/libscotch/arch_cmpltw.h 2010-05-03 15:37:55.133089872 -0700 214 214 *************** 215 215 *** 86,92 **** … … 226 226 int archCmpltwArchFree (ArchCmpltw * restrict const); 227 227 ArchDomNum archCmpltwDomNum (const ArchCmpltw * const, const ArchCmpltwDom * const); 228 diff -rc src/src/libscotch/arch_deco.c new 3/src/libscotch/arch_deco.c228 diff -rc src/src/libscotch/arch_deco.c new4/src/libscotch/arch_deco.c 229 229 *** src/src/libscotch/arch_deco.c 2008-09-28 06:35:27.000000000 -0700 230 --- new 3/src/libscotch/arch_deco.c 2010-04-30 10:28:22.153131068-0700230 --- new4/src/libscotch/arch_deco.c 2010-05-03 15:37:55.180089911 -0700 231 231 *************** 232 232 *** 211,217 **** … … 267 267 if ((sizeof (ArchDeco) > sizeof (ArchDummy)) || 268 268 (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) { 269 diff -rc src/src/libscotch/arch_deco.h new 3/src/libscotch/arch_deco.h269 diff -rc src/src/libscotch/arch_deco.h new4/src/libscotch/arch_deco.h 270 270 *** src/src/libscotch/arch_deco.h 2008-09-27 07:49:46.000000000 -0700 271 --- new 3/src/libscotch/arch_deco.h 2010-04-30 10:28:22.158131070-0700271 --- new4/src/libscotch/arch_deco.h 2010-05-03 15:37:55.187089917 -0700 272 272 *************** 273 273 *** 113,119 **** … … 284 284 int archDecoArchFree (ArchDeco * const); 285 285 Anum archDecoArchSize (ArchDeco * const, const Anum); 286 diff -rc src/src/libscotch/arch.h new 3/src/libscotch/arch.h286 diff -rc src/src/libscotch/arch.h new4/src/libscotch/arch.h 287 287 *** src/src/libscotch/arch.h 2009-04-28 08:11:27.000000000 -0700 288 --- new 3/src/libscotch/arch.h 2010-04-30 10:28:22.163131072 -0700288 --- new4/src/libscotch/arch.h 2010-05-03 15:37:55.194089922 -0700 289 289 *************** 290 290 *** 175,181 **** … … 301 301 char * archName (const Arch * const); 302 302 const ArchClass * archClass (const char * const); 303 diff -rc src/src/libscotch/arch_hcub.c new 3/src/libscotch/arch_hcub.c303 diff -rc src/src/libscotch/arch_hcub.c new4/src/libscotch/arch_hcub.c 304 304 *** src/src/libscotch/arch_hcub.c 2008-05-22 06:44:41.000000000 -0700 305 --- new 3/src/libscotch/arch_hcub.c 2010-04-30 10:28:22.169131075-0700305 --- new4/src/libscotch/arch_hcub.c 2010-05-03 15:37:55.201089928 -0700 306 306 *************** 307 307 *** 88,95 **** … … 349 349 errorPrint ("archHcubArchLoad: bad input"); 350 350 return (1); 351 diff -rc src/src/libscotch/arch_hcub.h new 3/src/libscotch/arch_hcub.h351 diff -rc src/src/libscotch/arch_hcub.h new4/src/libscotch/arch_hcub.h 352 352 *** src/src/libscotch/arch_hcub.h 2008-05-22 06:44:41.000000000 -0700 353 --- new 3/src/libscotch/arch_hcub.h 2010-04-30 10:28:22.174131077-0700353 --- new4/src/libscotch/arch_hcub.h 2010-05-03 15:37:55.208089934 -0700 354 354 *************** 355 355 *** 85,91 **** … … 366 366 #define archHcubArchFree NULL 367 367 ArchDomNum archHcubDomNum (const ArchHcub * const, const ArchHcubDom * const); 368 diff -rc src/src/libscotch/arch_mesh.c new 3/src/libscotch/arch_mesh.c368 diff -rc src/src/libscotch/arch_mesh.c new4/src/libscotch/arch_mesh.c 369 369 *** src/src/libscotch/arch_mesh.c 2008-05-22 06:44:41.000000000 -0700 370 --- new 3/src/libscotch/arch_mesh.c 2010-04-30 10:28:22.179131079-0700370 --- new4/src/libscotch/arch_mesh.c 2010-05-03 15:37:55.215089940 -0700 371 371 *************** 372 372 *** 96,103 **** … … 465 465 return (1); 466 466 } 467 diff -rc src/src/libscotch/arch_mesh.h new 3/src/libscotch/arch_mesh.h467 diff -rc src/src/libscotch/arch_mesh.h new4/src/libscotch/arch_mesh.h 468 468 *** src/src/libscotch/arch_mesh.h 2008-05-22 06:44:41.000000000 -0700 469 --- new 3/src/libscotch/arch_mesh.h 2010-04-30 10:28:22.184131082-0700469 --- new4/src/libscotch/arch_mesh.h 2010-05-03 15:37:55.221089945 -0700 470 470 *************** 471 471 *** 96,102 **** … … 496 496 #define archMesh3ArchFree NULL 497 497 ArchDomNum archMesh3DomNum (const ArchMesh3 * const, const ArchMesh3Dom * const); 498 diff -rc src/src/libscotch/arch_tleaf.c new 3/src/libscotch/arch_tleaf.c498 diff -rc src/src/libscotch/arch_tleaf.c new4/src/libscotch/arch_tleaf.c 499 499 *** src/src/libscotch/arch_tleaf.c 2008-05-22 06:44:41.000000000 -0700 500 --- new 3/src/libscotch/arch_tleaf.c 2010-04-30 10:28:22.189131084-0700500 --- new4/src/libscotch/arch_tleaf.c 2010-05-03 15:37:55.228089950 -0700 501 501 *************** 502 502 *** 92,99 **** … … 554 554 return (1); 555 555 } 556 diff -rc src/src/libscotch/arch_tleaf.h new 3/src/libscotch/arch_tleaf.h556 diff -rc src/src/libscotch/arch_tleaf.h new4/src/libscotch/arch_tleaf.h 557 557 *** src/src/libscotch/arch_tleaf.h 2008-05-22 06:44:41.000000000 -0700 558 --- new 3/src/libscotch/arch_tleaf.h 2010-04-30 10:28:22.194131086 -0700558 --- new4/src/libscotch/arch_tleaf.h 2010-05-03 15:37:55.235089956 -0700 559 559 *************** 560 560 *** 89,95 **** … … 571 571 #define archTleafArchFree NULL 572 572 ArchDomNum archTleafDomNum (const ArchTleaf * const, const ArchTleafDom * const); 573 diff -rc src/src/libscotch/arch_torus.c new 3/src/libscotch/arch_torus.c573 diff -rc src/src/libscotch/arch_torus.c new4/src/libscotch/arch_torus.c 574 574 *** src/src/libscotch/arch_torus.c 2008-05-22 06:44:41.000000000 -0700 575 --- new 3/src/libscotch/arch_torus.c 2010-04-30 10:28:22.199131088-0700575 --- new4/src/libscotch/arch_torus.c 2010-05-03 15:37:55.242089962 -0700 576 576 *************** 577 577 *** 90,97 **** … … 670 670 return (1); 671 671 } 672 diff -rc src/src/libscotch/arch_torus.h new 3/src/libscotch/arch_torus.h672 diff -rc src/src/libscotch/arch_torus.h new4/src/libscotch/arch_torus.h 673 673 *** src/src/libscotch/arch_torus.h 2008-05-22 06:44:41.000000000 -0700 674 --- new 3/src/libscotch/arch_torus.h 2010-04-30 10:28:22.204131090-0700674 --- new4/src/libscotch/arch_torus.h 2010-05-03 15:37:55.248089967 -0700 675 675 *************** 676 676 *** 96,102 **** … … 701 701 #define archTorus3ArchFree NULL 702 702 ArchDomNum archTorus3DomNum (const ArchTorus3 * const, const ArchTorus3Dom * const); 703 diff -rc src/src/libscotch/common.c new 3/src/libscotch/common.c703 diff -rc src/src/libscotch/common.c new4/src/libscotch/common.c 704 704 *** src/src/libscotch/common.c 2008-05-22 06:44:41.000000000 -0700 705 --- new 3/src/libscotch/common.c 2010-04-30 10:28:22.209131092 -0700705 --- new4/src/libscotch/common.c 2010-05-03 15:37:55.254089972 -0700 706 706 *************** 707 707 *** 100,106 **** … … 720 720 + #endif /* MATLAB */ 721 721 } 722 diff -rc src/src/libscotch/common.h new 3/src/libscotch/common.h722 diff -rc src/src/libscotch/common.h new4/src/libscotch/common.h 723 723 *** src/src/libscotch/common.h 2009-02-06 14:20:55.000000000 -0800 724 --- new 3/src/libscotch/common.h 2010-05-03 14:22:16.763394855-0700724 --- new4/src/libscotch/common.h 2010-05-03 15:37:55.261089978 -0700 725 725 *************** 726 726 *** 66,71 **** … … 766 766 void intRandInit (void); 767 767 INT intRandVal (INT); 768 diff -rc src/src/libscotch/common_integer.c new 3/src/libscotch/common_integer.c768 diff -rc src/src/libscotch/common_integer.c new4/src/libscotch/common_integer.c 769 769 *** src/src/libscotch/common_integer.c 2009-01-21 01:32:32.000000000 -0800 770 --- new 3/src/libscotch/common_integer.c 2010-05-03 14:21:44.014369358-0700770 --- new4/src/libscotch/common_integer.c 2010-05-03 15:37:55.268089983 -0700 771 771 *************** 772 772 *** 191,196 **** … … 827 827 828 828 /*********************/ 829 diff -rc src/src/libscotch/common_memory.c new 3/src/libscotch/common_memory.c829 diff -rc src/src/libscotch/common_memory.c new4/src/libscotch/common_memory.c 830 830 *** src/src/libscotch/common_memory.c 2009-01-03 02:16:11.000000000 -0800 831 --- new 3/src/libscotch/common_memory.c 2010-04-30 10:28:22.224131099 -0700831 --- new4/src/libscotch/common_memory.c 2010-05-03 15:37:55.275089989 -0700 832 832 *************** 833 833 *** 87,93 **** … … 935 935 } 936 936 #endif /* COMMON_MEMORY_TRACE */ 937 diff -rc src/src/libscotch/dummysizes.c new 3/src/libscotch/dummysizes.c937 diff -rc src/src/libscotch/dummysizes.c new4/src/libscotch/dummysizes.c 938 938 *** src/src/libscotch/dummysizes.c 2009-05-09 16:08:02.000000000 -0700 939 --- new 3/src/libscotch/dummysizes.c 2010-04-30 10:28:22.229131101-0700939 --- new4/src/libscotch/dummysizes.c 2010-05-03 15:37:55.282089995 -0700 940 940 *************** 941 941 *** 267,271 **** … … 948 948 + #endif /* MATLAB */ 949 949 } 950 diff -rc src/src/libscotch/graph.c new 3/src/libscotch/graph.c950 diff -rc src/src/libscotch/graph.c new4/src/libscotch/graph.c 951 951 *** src/src/libscotch/graph.c 2008-05-22 06:44:42.000000000 -0700 952 --- new 3/src/libscotch/graph.c 2010-04-30 10:28:22.234131103-0700952 --- new4/src/libscotch/graph.c 2010-05-03 15:37:55.288090000 -0700 953 953 *************** 954 954 *** 135,141 **** … … 971 971 if ((grafptr->edlotax != NULL) && 972 972 ((grafptr->flagval & GRAPHEDGEGROUP) == 0)) 973 diff -rc src/src/libscotch/graph.h new 3/src/libscotch/graph.h973 diff -rc src/src/libscotch/graph.h new4/src/libscotch/graph.h 974 974 *** src/src/libscotch/graph.h 2008-06-01 02:49:11.000000000 -0700 975 --- new 3/src/libscotch/graph.h 2010-04-30 10:28:22.240131106 -0700975 --- new4/src/libscotch/graph.h 2010-05-03 15:37:55.295090006 -0700 976 976 *************** 977 977 *** 159,165 **** … … 988 988 int graphSave (const Graph * const, FILE * const); 989 989 Gnum graphBase (Graph * const, const Gnum); 990 diff -rc src/src/libscotch/graph_io.c new 3/src/libscotch/graph_io.c990 diff -rc src/src/libscotch/graph_io.c new4/src/libscotch/graph_io.c 991 991 *** src/src/libscotch/graph_io.c 2008-05-22 06:44:42.000000000 -0700 992 --- new 3/src/libscotch/graph_io.c 2010-04-30 10:28:22.245131108-0700992 --- new4/src/libscotch/graph_io.c 2010-05-03 15:37:55.303090012 -0700 993 993 *************** 994 994 *** 86,92 **** … … 1226 1226 } 1227 1227 1228 diff -rc src/src/libscotch/graph_io_scot.c new 3/src/libscotch/graph_io_scot.c1228 diff -rc src/src/libscotch/graph_io_scot.c new4/src/libscotch/graph_io_scot.c 1229 1229 *** src/src/libscotch/graph_io_scot.c 2008-05-22 06:44:42.000000000 -0700 1230 --- new 3/src/libscotch/graph_io_scot.c 2010-04-30 10:28:22.251131111-07001230 --- new4/src/libscotch/graph_io_scot.c 2010-05-03 15:37:55.310090018 -0700 1231 1231 *************** 1232 1232 *** 89,95 **** … … 1243 1243 } 1244 1244 1245 diff -rc src/src/libscotch/library_arch.c new 3/src/libscotch/library_arch.c1245 diff -rc src/src/libscotch/library_arch.c new4/src/libscotch/library_arch.c 1246 1246 *** src/src/libscotch/library_arch.c 2008-05-22 06:44:42.000000000 -0700 1247 --- new 3/src/libscotch/library_arch.c 2010-04-30 10:28:22.256131113-07001247 --- new4/src/libscotch/library_arch.c 2010-05-03 15:37:55.317090024 -0700 1248 1248 *************** 1249 1249 *** 120,128 **** … … 1278 1278 1279 1279 /*+ This routine saves the given opaque 1280 diff -rc src/src/libscotch/library_arch_f.c new 3/src/libscotch/library_arch_f.c1280 diff -rc src/src/libscotch/library_arch_f.c new4/src/libscotch/library_arch_f.c 1281 1281 *** src/src/libscotch/library_arch_f.c 2008-05-22 06:44:42.000000000 -0700 1282 --- new 3/src/libscotch/library_arch_f.c 2010-04-30 10:28:22.260131115-07001282 --- new4/src/libscotch/library_arch_f.c 2010-05-03 15:37:55.323090029 -0700 1283 1283 *************** 1284 1284 *** 121,127 **** … … 1295 1295 fclose (stream); /* This closes filenum too */ 1296 1296 1297 diff -rc src/src/libscotch/library_error_exit.c new 3/src/libscotch/library_error_exit.c1297 diff -rc src/src/libscotch/library_error_exit.c new4/src/libscotch/library_error_exit.c 1298 1298 *** src/src/libscotch/library_error_exit.c 2009-01-20 00:36:33.000000000 -0800 1299 --- new 3/src/libscotch/library_error_exit.c 2010-04-30 10:28:22.265131117-07001299 --- new4/src/libscotch/library_error_exit.c 2010-05-03 15:37:55.330090035 -0700 1300 1300 *************** 1301 1301 *** 114,119 **** … … 1370 1370 + #endif /* MATLAB */ 1371 1371 } 1372 diff -rc src/src/libscotch/library_graph.c new 3/src/libscotch/library_graph.c1372 diff -rc src/src/libscotch/library_graph.c new4/src/libscotch/library_graph.c 1373 1373 *** src/src/libscotch/library_graph.c 2008-05-22 07:28:12.000000000 -0700 1374 --- new 3/src/libscotch/library_graph.c 2010-04-30 10:28:22.270131119-07001374 --- new4/src/libscotch/library_graph.c 2010-05-03 15:37:55.337090040 -0700 1375 1375 *************** 1376 1376 *** 137,143 **** … … 1415 1415 1416 1416 /*+ This routine saves the contents of the given 1417 diff -rc src/src/libscotch/library_graph_f.c new 3/src/libscotch/library_graph_f.c1417 diff -rc src/src/libscotch/library_graph_f.c new4/src/libscotch/library_graph_f.c 1418 1418 *** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700 1419 --- new 3/src/libscotch/library_graph_f.c 2010-04-30 10:28:22.275131121-07001419 --- new4/src/libscotch/library_graph_f.c 2010-05-03 15:37:55.344090046 -0700 1420 1420 *************** 1421 1421 *** 136,142 **** … … 1432 1432 fclose (stream); /* This closes filenum too */ 1433 1433 1434 diff -rc src/src/libscotch/library_graph_map.c new 3/src/libscotch/library_graph_map.c1434 diff -rc src/src/libscotch/library_graph_map.c new4/src/libscotch/library_graph_map.c 1435 1435 *** src/src/libscotch/library_graph_map.c 2008-09-28 04:04:05.000000000 -0700 1436 --- new 3/src/libscotch/library_graph_map.c 2010-04-30 10:28:22.280131123-07001436 --- new4/src/libscotch/library_graph_map.c 2010-05-03 15:37:55.350090051 -0700 1437 1437 *************** 1438 1438 *** 182,192 **** … … 1457 1457 1458 1458 /*+ This routine computes a mapping 1459 diff -rc src/src/libscotch/library_graph_map_f.c new 3/src/libscotch/library_graph_map_f.c1459 diff -rc src/src/libscotch/library_graph_map_f.c new4/src/libscotch/library_graph_map_f.c 1460 1460 *** src/src/libscotch/library_graph_map_f.c 2008-06-28 03:44:26.000000000 -0700 1461 --- new 3/src/libscotch/library_graph_map_f.c 2010-04-30 10:28:22.285131126-07001461 --- new4/src/libscotch/library_graph_map_f.c 2010-05-03 15:37:55.357090057 -0700 1462 1462 *************** 1463 1463 *** 183,189 **** … … 1474 1474 fclose (stream); /* This closes filenum too */ 1475 1475 1476 diff -rc src/src/libscotch/library.h new 3/src/libscotch/library.h1476 diff -rc src/src/libscotch/library.h new4/src/libscotch/library.h 1477 1477 *** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700 1478 --- new 3/src/libscotch/library.h 2010-04-30 10:28:22.291131128-07001478 --- new4/src/libscotch/library.h 2010-05-03 15:37:55.365090063 -0700 1479 1479 *************** 1480 1480 *** 134,140 **** … … 1519 1519 int SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const); 1520 1520 int SCOTCH_graphMap (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const); 1521 diff -rc src/src/libscotch/Makefile new 3/src/libscotch/Makefile1521 diff -rc src/src/libscotch/Makefile new4/src/libscotch/Makefile 1522 1522 *** src/src/libscotch/Makefile 2009-05-09 16:08:04.000000000 -0700 1523 --- new 3/src/libscotch/Makefile 2010-04-30 10:28:22.297131131-07001523 --- new4/src/libscotch/Makefile 2010-06-17 09:55:33.101320246 -0700 1524 1524 *************** 1525 1525 *** 49,55 **** … … 1551 1551 + scotch.h \ 1552 1552 + scotchf.h \ 1553 + lib scotch$(LIB) \1554 + lib scotcherr$(LIB) \1555 + lib scotcherrexit$(LIB)1553 + libmexscotch$(LIB) \ 1554 + libmexscotcherr$(LIB) \ 1555 + libmexscotcherrexit$(LIB) 1556 1556 + 1557 1557 install : 1558 1558 -$(CP) scotch.h scotchf.h $(includedir) 1559 1559 -$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir) 1560 diff -rc src/src/libscotch/mapping.h new3/src/libscotch/mapping.h 1560 *************** 1561 *** 77,82 **** 1562 --- 87,96 ---- 1563 -$(CP) scotchf.h $(includedir)/ptscotchf.h 1564 -$(CP) libptscotch*$(LIB) $(libdir) 1565 1566 + mexinstall : 1567 + -$(CP) scotch.h scotchf.h $(includedir) 1568 + -$(CP) libmexscotch$(LIB) libmexscotcherr*$(LIB) $(libdir) 1569 + 1570 clean : 1571 -$(RM) *~ *$(OBJ) lib*$(LIB) common2* parser_yy.c parser_ly.h parser_ll.c *scotch.h *scotchf.h y.output dummysizes$(EXE) 1572 1573 *************** 1574 *** 2452,2457 **** 1575 --- 2466,2632 ---- 1576 $(AR) $(ARFLAGS) lib$(SCOTCHLIB)$(LIB) $(?) 1577 -$(RANLIB) lib$(SCOTCHLIB)$(LIB) 1578 1579 + libmexscotch$(LIB) : arch$(OBJ) \ 1580 + arch_build$(OBJ) \ 1581 + arch_cmplt$(OBJ) \ 1582 + arch_cmpltw$(OBJ) \ 1583 + arch_deco$(OBJ) \ 1584 + arch_hcub$(OBJ) \ 1585 + arch_mesh$(OBJ) \ 1586 + arch_tleaf$(OBJ) \ 1587 + arch_torus$(OBJ) \ 1588 + arch_vcmplt$(OBJ) \ 1589 + arch_vhcub$(OBJ) \ 1590 + bgraph$(OBJ) \ 1591 + bgraph_bipart_bd$(OBJ) \ 1592 + bgraph_bipart_df$(OBJ) \ 1593 + bgraph_bipart_ex$(OBJ) \ 1594 + bgraph_bipart_fm$(OBJ) \ 1595 + bgraph_bipart_gg$(OBJ) \ 1596 + bgraph_bipart_gp$(OBJ) \ 1597 + bgraph_bipart_ml$(OBJ) \ 1598 + bgraph_bipart_st$(OBJ) \ 1599 + bgraph_bipart_zr$(OBJ) \ 1600 + bgraph_check$(OBJ) \ 1601 + bgraph_store$(OBJ) \ 1602 + common$(OBJ) \ 1603 + common_file$(OBJ) \ 1604 + common_file_compress$(OBJ) \ 1605 + common_file_uncompress$(OBJ) \ 1606 + common_integer$(OBJ) \ 1607 + common_memory$(OBJ) \ 1608 + common_stub$(OBJ) \ 1609 + gain$(OBJ) \ 1610 + geom$(OBJ) \ 1611 + graph$(OBJ) \ 1612 + graph_base$(OBJ) \ 1613 + graph_check$(OBJ) \ 1614 + graph_coarsen$(OBJ) \ 1615 + graph_induce$(OBJ) \ 1616 + graph_io$(OBJ) \ 1617 + graph_io_chac$(OBJ) \ 1618 + graph_io_habo$(OBJ) \ 1619 + graph_io_mmkt$(OBJ) \ 1620 + graph_io_scot$(OBJ) \ 1621 + graph_list$(OBJ) \ 1622 + hall_order_hd$(OBJ) \ 1623 + hall_order_hf$(OBJ) \ 1624 + hall_order_hx$(OBJ) \ 1625 + hgraph$(OBJ) \ 1626 + hgraph_check$(OBJ) \ 1627 + hgraph_induce$(OBJ) \ 1628 + hgraph_order_bl$(OBJ) \ 1629 + hgraph_order_cp$(OBJ) \ 1630 + hgraph_order_gp$(OBJ) \ 1631 + hgraph_order_hd$(OBJ) \ 1632 + hgraph_order_hf$(OBJ) \ 1633 + hgraph_order_hx$(OBJ) \ 1634 + hgraph_order_nd$(OBJ) \ 1635 + hgraph_order_si$(OBJ) \ 1636 + hgraph_order_st$(OBJ) \ 1637 + hmesh$(OBJ) \ 1638 + hmesh_check$(OBJ) \ 1639 + hmesh_hgraph$(OBJ) \ 1640 + hmesh_induce$(OBJ) \ 1641 + hmesh_mesh$(OBJ) \ 1642 + hmesh_order_bl$(OBJ) \ 1643 + hmesh_order_cp$(OBJ) \ 1644 + hmesh_order_gr$(OBJ) \ 1645 + hmesh_order_gp$(OBJ) \ 1646 + hmesh_order_hd$(OBJ) \ 1647 + hmesh_order_hf$(OBJ) \ 1648 + hmesh_order_hx$(OBJ) \ 1649 + hmesh_order_nd$(OBJ) \ 1650 + hmesh_order_si$(OBJ) \ 1651 + hmesh_order_st$(OBJ) \ 1652 + kgraph$(OBJ) \ 1653 + kgraph_map_rb$(OBJ) \ 1654 + kgraph_map_rb_map$(OBJ) \ 1655 + kgraph_map_rb_part$(OBJ) \ 1656 + kgraph_map_st$(OBJ) \ 1657 + library_arch$(OBJ) \ 1658 + library_arch_f$(OBJ) \ 1659 + library_arch_build$(OBJ) \ 1660 + library_arch_build_f$(OBJ) \ 1661 + library_arch_cmpltw$(OBJ) \ 1662 + library_arch_cmpltw_f$(OBJ) \ 1663 + library_geom$(OBJ) \ 1664 + library_geom_f$(OBJ) \ 1665 + library_graph$(OBJ) \ 1666 + library_graph_f$(OBJ) \ 1667 + library_graph_base$(OBJ) \ 1668 + library_graph_base_f$(OBJ) \ 1669 + library_graph_check$(OBJ) \ 1670 + library_graph_check_f$(OBJ) \ 1671 + library_graph_io_chac$(OBJ) \ 1672 + library_graph_io_chac_f$(OBJ) \ 1673 + library_graph_io_habo$(OBJ) \ 1674 + library_graph_io_habo_f$(OBJ) \ 1675 + library_graph_io_mmkt$(OBJ) \ 1676 + library_graph_io_mmkt_f$(OBJ) \ 1677 + library_graph_io_scot$(OBJ) \ 1678 + library_graph_io_scot_f$(OBJ) \ 1679 + library_graph_map$(OBJ) \ 1680 + library_graph_map_f$(OBJ) \ 1681 + library_graph_map_view$(OBJ) \ 1682 + library_graph_map_view_f$(OBJ) \ 1683 + library_graph_order$(OBJ) \ 1684 + library_graph_order_f$(OBJ) \ 1685 + library_mesh$(OBJ) \ 1686 + library_mesh_f$(OBJ) \ 1687 + library_mesh_graph$(OBJ) \ 1688 + library_mesh_graph_f$(OBJ) \ 1689 + library_mesh_io_habo$(OBJ) \ 1690 + library_mesh_io_habo_f$(OBJ) \ 1691 + library_mesh_io_scot$(OBJ) \ 1692 + library_mesh_io_scot_f$(OBJ) \ 1693 + library_mesh_order$(OBJ) \ 1694 + library_mesh_order_f$(OBJ) \ 1695 + library_parser$(OBJ) \ 1696 + library_parser_f$(OBJ) \ 1697 + library_random$(OBJ) \ 1698 + library_random_f$(OBJ) \ 1699 + mapping$(OBJ) \ 1700 + mapping_io$(OBJ) \ 1701 + mesh$(OBJ) \ 1702 + mesh_check$(OBJ) \ 1703 + mesh_coarsen$(OBJ) \ 1704 + mesh_graph$(OBJ) \ 1705 + mesh_induce_sepa$(OBJ) \ 1706 + mesh_io$(OBJ) \ 1707 + mesh_io_habo$(OBJ) \ 1708 + mesh_io_scot$(OBJ) \ 1709 + order$(OBJ) \ 1710 + order_check$(OBJ) \ 1711 + order_io$(OBJ) \ 1712 + parser$(OBJ) \ 1713 + parser_ll$(OBJ) \ 1714 + parser_yy$(OBJ) \ 1715 + vgraph$(OBJ) \ 1716 + vgraph_check$(OBJ) \ 1717 + vgraph_separate_bd$(OBJ) \ 1718 + vgraph_separate_es$(OBJ) \ 1719 + vgraph_separate_fm$(OBJ) \ 1720 + vgraph_separate_gg$(OBJ) \ 1721 + vgraph_separate_gp$(OBJ) \ 1722 + vgraph_separate_ml$(OBJ) \ 1723 + vgraph_separate_st$(OBJ) \ 1724 + vgraph_separate_th$(OBJ) \ 1725 + vgraph_separate_vw$(OBJ) \ 1726 + vgraph_separate_zr$(OBJ) \ 1727 + vgraph_store$(OBJ) \ 1728 + vmesh$(OBJ) \ 1729 + vmesh_check$(OBJ) \ 1730 + vmesh_separate_fm$(OBJ) \ 1731 + vmesh_separate_gg$(OBJ) \ 1732 + vmesh_separate_gr$(OBJ) \ 1733 + vmesh_separate_ml$(OBJ) \ 1734 + vmesh_separate_zr$(OBJ) \ 1735 + vmesh_separate_st$(OBJ) \ 1736 + vmesh_store$(OBJ) 1737 + $(AR) $(ARFLAGS) $(@) $(?) 1738 + -$(RANLIB) $(@) 1739 + 1740 libptscotcherr$(LIB) : library_error$(OBJ) 1741 $(AR) $(ARFLAGS) $(@) $(?) 1742 -$(RANLIB) $(@) 1743 *************** 1744 *** 2467,2469 **** 1745 --- 2642,2651 ---- 1746 libscotcherrexit$(LIB) : library_error_exit$(OBJ) 1747 $(AR) $(ARFLAGS) $(@) $(?) 1748 -$(RANLIB) $(@) 1749 + libmexscotcherr$(LIB) : library_error$(OBJ) 1750 + $(AR) $(ARFLAGS) $(@) $(?) 1751 + -$(RANLIB) $(@) 1752 + 1753 + libmexscotcherrexit$(LIB) : library_error_exit$(OBJ) 1754 + $(AR) $(ARFLAGS) $(@) $(?) 1755 + -$(RANLIB) $(@) 1756 Only in new4/src/libscotch: Makefile_save 1757 diff -rc src/src/libscotch/mapping.h new4/src/libscotch/mapping.h 1561 1758 *** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700 1562 --- new 3/src/libscotch/mapping.h 2010-04-30 10:28:22.302131133-07001759 --- new4/src/libscotch/mapping.h 2010-05-03 15:37:55.381090077 -0700 1563 1760 *************** 1564 1761 *** 106,112 **** … … 1575 1772 1576 1773 #undef static 1577 diff -rc src/src/libscotch/mapping_io.c new 3/src/libscotch/mapping_io.c1774 diff -rc src/src/libscotch/mapping_io.c new4/src/libscotch/mapping_io.c 1578 1775 *** src/src/libscotch/mapping_io.c 2008-05-22 06:44:43.000000000 -0700 1579 --- new 3/src/libscotch/mapping_io.c 2010-04-30 10:28:22.307131135-07001776 --- new4/src/libscotch/mapping_io.c 2010-05-03 15:37:55.388090082 -0700 1580 1777 *************** 1581 1778 *** 199,204 **** … … 1664 1861 return (0); 1665 1862 } 1666 diff -rc src/src/libscotch/mesh_io_scot.c new 3/src/libscotch/mesh_io_scot.c1863 diff -rc src/src/libscotch/mesh_io_scot.c new4/src/libscotch/mesh_io_scot.c 1667 1864 *** src/src/libscotch/mesh_io_scot.c 2008-05-22 06:44:43.000000000 -0700 1668 --- new 3/src/libscotch/mesh_io_scot.c 2010-04-30 10:28:22.312131137 -07001865 --- new4/src/libscotch/mesh_io_scot.c 2010-05-03 15:37:55.394090087 -0700 1669 1866 *************** 1670 1867 *** 85,91 **** … … 1681 1878 } 1682 1879 1683 diff -rc src/src/libscotch/module.h new 3/src/libscotch/module.h1880 diff -rc src/src/libscotch/module.h new4/src/libscotch/module.h 1684 1881 *** src/src/libscotch/module.h 2009-04-26 23:07:14.000000000 -0700 1685 --- new 3/src/libscotch/module.h 2010-05-03 14:48:29.655638124 -07001882 --- new4/src/libscotch/module.h 2010-05-03 15:37:55.402090094 -0700 1686 1883 *************** 1687 1884 *** 156,161 **** … … 1694 1891 #define intRandInit _SCOTCHintRandInit 1695 1892 /* #define intRandVal _SCOTCHintRandVal Already a macro */ 1696 diff -rc src/src/libscotch/parser_ll.l new 3/src/libscotch/parser_ll.l1893 diff -rc src/src/libscotch/parser_ll.l new4/src/libscotch/parser_ll.l 1697 1894 *** src/src/libscotch/parser_ll.l 2008-05-22 06:44:43.000000000 -0700 1698 --- new 3/src/libscotch/parser_ll.l 2010-04-30 10:28:22.318131140-07001895 --- new4/src/libscotch/parser_ll.l 2010-05-03 15:37:55.410090101 -0700 1699 1896 *************** 1700 1897 *** 192,197 **** … … 1723 1920 yyrestart (yyin); /* (Re-)initialize the parser */ 1724 1921 #endif /* FLEX_SCANNER */ 1725 diff -rc src/src/libscotch/parser_yy.y new 3/src/libscotch/parser_yy.y1922 diff -rc src/src/libscotch/parser_yy.y new4/src/libscotch/parser_yy.y 1726 1923 *** src/src/libscotch/parser_yy.y 2008-10-22 15:12:48.000000000 -0700 1727 --- new 3/src/libscotch/parser_yy.y 2010-04-30 10:28:22.363131160-07001924 --- new4/src/libscotch/parser_yy.y 2010-05-03 15:37:55.418090107 -0700 1728 1925 *************** 1729 1926 *** 774,779 **** … … 1736 1933 if (stratParserParse2 () != 0) { /* Parse the strategy string */ 1737 1934 if (parserstratcurr != NULL) 1738 diff -rc src/src/libscotch/vgraph_separate_vw.c new 3/src/libscotch/vgraph_separate_vw.c1935 diff -rc src/src/libscotch/vgraph_separate_vw.c new4/src/libscotch/vgraph_separate_vw.c 1739 1936 *** src/src/libscotch/vgraph_separate_vw.c 2008-05-22 06:44:43.000000000 -0700 1740 --- new 3/src/libscotch/vgraph_separate_vw.c 2010-04-30 10:28:22.368131162-07001937 --- new4/src/libscotch/vgraph_separate_vw.c 2010-05-03 15:37:55.425090113 -0700 1741 1938 *************** 1742 1939 *** 83,88 **** … … 1758 1955 return (0); 1759 1956 } 1760 diff -rc src/src/Makefile new 3/src/Makefile1957 diff -rc src/src/Makefile new4/src/Makefile 1761 1958 *** src/src/Makefile 2008-09-15 05:50:51.000000000 -0700 1762 --- new 3/src/Makefile 2010-04-30 10:28:22.373131164-07001959 --- new4/src/Makefile 2010-06-17 09:31:54.881418932 -0700 1763 1960 *************** 1764 1961 *** 97,102 **** … … 1768 1965 1769 1966 + mexscotch : required 1770 + (cd libscotch ; $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) install)1967 + (cd libscotch ; $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall) 1771 1968 + (cd scotch ; $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall) 1772 1969 + … … 1774 1971 -$(CP) -f ../bin/[agm]*$(EXE) $(bindir) 1775 1972 -$(CP) -f ../include/*scotch*.h $(includedir) 1776 Only in new 3/src: Makefile.inc1777 Only in new 3/src/scotch: gmap_mex.c1778 Only in new 3/src/scotch: gmapx.c1779 diff -rc src/src/scotch/Makefile new 3/src/scotch/Makefile1973 Only in new4/src: Makefile.inc 1974 Only in new4/src/scotch: gmap_mex.c 1975 Only in new4/src/scotch: gmapx.c 1976 diff -rc src/src/scotch/Makefile new4/src/scotch/Makefile 1780 1977 *** src/src/scotch/Makefile 2009-04-27 02:19:43.000000000 -0700 1781 --- new 3/src/scotch/Makefile 2010-04-30 10:28:22.379131167-07001978 --- new4/src/scotch/Makefile 2010-06-17 10:09:39.718475100 -0700 1782 1979 *************** 1783 1980 *** 49,59 **** … … 1825 2022 *************** 1826 2023 *** 104,111 **** 1827 --- 113,12 4----2024 --- 113,126 ---- 1828 2025 -$(RM) $(bindir)/dgpart$(EXE) 1829 2026 -$(LN) $(bindir)/dgmap$(EXE) $(bindir)/dgpart$(EXE) … … 1831 2028 + mexinstall : 1832 2029 + -$(CP) gmap_mex$(MEX) $(bindir) 2030 + -$(RM) $(bindir)/gpart_mex$(MEX) 2031 + -$(LN) $(bindir)/gmap_mex$(MEX) $(bindir)/gpart_mex$(MEX) 1833 2032 + 1834 2033 clean : … … 1840 2039 *************** 1841 2040 *** 365,367 **** 1842 --- 3 78,396----2041 --- 380,403 ---- 1843 2042 $(libdir)/libscotch$(LIB) \ 1844 2043 $(libdir)/libscotcherrexit$(LIB) \ … … 1860 2059 + $(libdir)/libscotcherrexit$(LIB) \ 1861 2060 + gmap.h 2061 + 2062 + gpart_mex$(MEX) : gmap_mex$(MEX) 2063 + -$(RM) gpart_mex$(MEX) 2064 + -$(LN) gmap_mex$(MEX) gpart_mex$(MEX) 2065 + -
issm/trunk/externalpackages/scotch/scotch_jes_notes.txt
r3650 r4629 302 302 - implemented common_integer.c/intRandResetStatic to reset static variables from previous runs. 303 303 304 6/16/10: 305 306 - renamed scotch x-layer and separated it from rest of build. 307 - set up scotch to build both stand-alone and mex libraries. 308
Note:
See TracChangeset
for help on using the changeset viewer.
