Changeset 4655
- Timestamp:
- 07/19/10 12:33:30 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/externalpackages/scotch/scotch.patch
r4653 r4655 3 3 Only in src: lib 4 4 diff -rc src/src/libscotch/arch.c old/src/libscotch/arch.c 5 *** src/src/libscotch/arch.c 2010-07-19 1 1:51:37.187617636-07005 *** src/src/libscotch/arch.c 2010-07-19 12:08:20.485684277 -0700 6 6 --- old/src/libscotch/arch.c 2008-09-27 07:48:01.000000000 -0700 7 7 *************** … … 69 69 --- 190,196 ---- 70 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 1 1:51:37.190617657-070071 *** src/src/libscotch/arch_cmplt.c 2010-07-19 12:08:20.488684298 -0700 72 72 --- old/src/libscotch/arch_cmplt.c 2008-05-22 06:44:41.000000000 -0700 73 73 *************** … … 121 121 --- 102,109 ---- 122 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 1 1:51:37.193617678-0700123 *** src/src/libscotch/arch_cmplt.h 2010-07-19 12:08:20.490684312 -0700 124 124 --- old/src/libscotch/arch_cmplt.h 2008-05-22 06:44:41.000000000 -0700 125 125 *************** … … 138 138 --- 87,93 ---- 139 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 1 1:51:37.195617692 -0700140 *** src/src/libscotch/arch_cmpltw.c 2010-07-19 12:08:20.493684332 -0700 141 141 --- old/src/libscotch/arch_cmpltw.c 2008-08-27 14:22:22.000000000 -0700 142 142 *************** … … 210 210 --- 230,237 ---- 211 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 1 1:51:37.198617713 -0700212 *** src/src/libscotch/arch_cmpltw.h 2010-07-19 12:08:20.496684353 -0700 213 213 --- old/src/libscotch/arch_cmpltw.h 2008-05-22 06:44:41.000000000 -0700 214 214 *************** … … 227 227 --- 86,92 ---- 228 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 1 1:51:37.201617734-0700229 *** src/src/libscotch/arch_deco.c 2010-07-19 12:08:20.498684367 -0700 230 230 --- old/src/libscotch/arch_deco.c 2008-09-28 06:35:27.000000000 -0700 231 231 *************** … … 268 268 --- 220,225 ---- 269 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 1 1:51:37.204617756-0700270 *** src/src/libscotch/arch_deco.h 2010-07-19 12:08:20.501684388 -0700 271 271 --- old/src/libscotch/arch_deco.h 2008-09-27 07:49:46.000000000 -0700 272 272 *************** … … 285 285 --- 113,119 ---- 286 286 diff -rc src/src/libscotch/arch.h old/src/libscotch/arch.h 287 *** src/src/libscotch/arch.h 2010-07-19 1 1:51:37.206617770-0700287 *** src/src/libscotch/arch.h 2010-07-19 12:08:20.503684402 -0700 288 288 --- old/src/libscotch/arch.h 2009-04-28 08:11:27.000000000 -0700 289 289 *************** … … 302 302 --- 175,181 ---- 303 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 1 1:51:37.209617791-0700304 *** src/src/libscotch/arch_hcub.c 2010-07-19 12:08:20.506684423 -0700 305 305 --- old/src/libscotch/arch_hcub.c 2008-05-22 06:44:41.000000000 -0700 306 306 *************** … … 350 350 --- 98,105 ---- 351 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 1 1:51:37.212617812-0700352 *** src/src/libscotch/arch_hcub.h 2010-07-19 12:08:20.508684437 -0700 353 353 --- old/src/libscotch/arch_hcub.h 2008-05-22 06:44:41.000000000 -0700 354 354 *************** … … 367 367 --- 85,91 ---- 368 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 1 1:51:37.215617833-0700369 *** src/src/libscotch/arch_mesh.c 2010-07-19 12:08:20.511684458 -0700 370 370 --- old/src/libscotch/arch_mesh.c 2008-05-22 06:44:41.000000000 -0700 371 371 *************** … … 466 466 --- 431,440 ---- 467 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 1 1:51:37.217617847-0700468 *** src/src/libscotch/arch_mesh.h 2010-07-19 12:08:20.514684479 -0700 469 469 --- old/src/libscotch/arch_mesh.h 2008-05-22 06:44:41.000000000 -0700 470 470 *************** … … 497 497 --- 114,120 ---- 498 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 1 1:51:37.220617868-0700499 *** src/src/libscotch/arch_tleaf.c 2010-07-19 12:08:20.517684499 -0700 500 500 --- old/src/libscotch/arch_tleaf.c 2008-05-22 06:44:41.000000000 -0700 501 501 *************** … … 555 555 --- 109,114 ---- 556 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 1 1:51:37.223617890-0700557 *** src/src/libscotch/arch_tleaf.h 2010-07-19 12:08:20.519684513 -0700 558 558 --- old/src/libscotch/arch_tleaf.h 2008-05-22 06:44:41.000000000 -0700 559 559 *************** … … 572 572 --- 89,95 ---- 573 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 1 1:51:37.226617911-0700574 *** src/src/libscotch/arch_torus.c 2010-07-19 12:08:20.522684534 -0700 575 575 --- old/src/libscotch/arch_torus.c 2008-05-22 06:44:41.000000000 -0700 576 576 *************** … … 671 671 --- 373,382 ---- 672 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 1 1:51:37.228617925-0700673 *** src/src/libscotch/arch_torus.h 2010-07-19 12:08:20.524684548 -0700 674 674 --- old/src/libscotch/arch_torus.h 2008-05-22 06:44:41.000000000 -0700 675 675 *************** … … 702 702 --- 114,120 ---- 703 703 diff -rc src/src/libscotch/common.c old/src/libscotch/common.c 704 *** src/src/libscotch/common.c 2010-07-19 1 1:51:37.231617946-0700704 *** src/src/libscotch/common.c 2010-07-19 12:08:20.527684569 -0700 705 705 --- old/src/libscotch/common.c 2008-05-22 06:44:41.000000000 -0700 706 706 *************** … … 721 721 --- 100,106 ---- 722 722 diff -rc src/src/libscotch/common.h old/src/libscotch/common.h 723 *** src/src/libscotch/common.h 2010-07-19 1 1:51:37.233617960-0700723 *** src/src/libscotch/common.h 2010-07-19 12:08:20.529684583 -0700 724 724 --- old/src/libscotch/common.h 2009-02-06 14:20:55.000000000 -0800 725 725 *************** … … 732 732 --- 1,3 ---- 733 733 *************** 734 *** 251,255 **** 734 *** 81,87 **** 735 #include <sys/resource.h> 736 #endif /* COMMON_TIMING_OLD */ 737 #include <unistd.h> 738 - #include <sys/param.h> 739 740 #ifdef SCOTCH_PTSCOTCH 741 #include <mpi.h> 742 --- 79,84 ---- 743 *************** 744 *** 109,114 **** 745 --- 106,113 ---- 746 #define memCpy(dst,src,siz) memcpy((dst),(src),(siz)) 747 #define memMov(dst,src,siz) memmove((dst),(src),(siz)) 748 749 + #define MIN(x,y) (((x) < (y)) ? (x) : (y)) 750 + #define MAX(x,y) (((x) < (y)) ? (y) : (x)) 751 #define ABS(x) MAX ((x), -(x)) 752 #define SIGN(x) (((x) < 0) ? -1 : 1) 753 754 *************** 755 *** 202,219 **** 756 int fileUncompressType (const char * const); 757 int fileNameDistExpand (char ** const, const int, const int, const int); 758 759 - #ifdef __cplusplus 760 - extern "C" { 761 - #endif /* __cplusplus */ 762 - 763 void errorProg (const char * const); 764 void errorPrint (const char * const, ...); 765 void errorPrintW (const char * const, ...); 766 767 - #ifdef __cplusplus 768 - } 769 - #endif /* __cplusplus */ 770 - 771 int intLoad (FILE * const, INT * const); 772 int intSave (FILE * const, const INT); 773 void intAscn (INT * const, const INT, const INT); 774 --- 201,210 ---- 775 *************** 776 *** 258,262 **** 735 777 void nl##__ pl \ 736 778 { nu pc; } \ … … 740 782 --- 249,251 ---- 741 783 diff -rc src/src/libscotch/common_integer.c old/src/libscotch/common_integer.c 742 *** src/src/libscotch/common_integer.c 2010-07-19 1 1:51:37.236617981-0700784 *** src/src/libscotch/common_integer.c 2010-07-19 12:11:35.015039059 -0700 743 785 --- old/src/libscotch/common_integer.c 2009-01-21 01:32:32.000000000 -0800 744 786 *************** … … 801 843 --- 237,242 ---- 802 844 diff -rc src/src/libscotch/common_memory.c old/src/libscotch/common_memory.c 803 *** src/src/libscotch/common_memory.c 2010-07-19 1 1:51:37.239618002-0700845 *** src/src/libscotch/common_memory.c 2010-07-19 12:08:20.535684625 -0700 804 846 --- old/src/libscotch/common_memory.c 2009-01-03 02:16:11.000000000 -0800 805 847 *************** … … 909 951 --- 185,192 ---- 910 952 diff -rc src/src/libscotch/dummysizes.c old/src/libscotch/dummysizes.c 911 *** src/src/libscotch/dummysizes.c 2010-07-19 1 1:51:37.241618017-0700953 *** src/src/libscotch/dummysizes.c 2010-07-19 12:08:20.538684646 -0700 912 954 --- old/src/libscotch/dummysizes.c 2009-05-09 16:08:02.000000000 -0700 913 955 *************** … … 922 964 --- 267,271 ---- 923 965 diff -rc src/src/libscotch/graph.c old/src/libscotch/graph.c 924 *** src/src/libscotch/graph.c 2010-07-19 1 1:51:37.244618038-0700966 *** src/src/libscotch/graph.c 2010-07-19 12:08:20.540684660 -0700 925 967 --- old/src/libscotch/graph.c 2008-05-22 06:44:42.000000000 -0700 926 968 *************** … … 945 987 ((grafptr->flagval & GRAPHEDGEGROUP) == 0)) 946 988 diff -rc src/src/libscotch/graph.h old/src/libscotch/graph.h 947 *** src/src/libscotch/graph.h 2010-07-19 1 1:51:37.247618059-0700989 *** src/src/libscotch/graph.h 2010-07-19 12:08:20.543684680 -0700 948 990 --- old/src/libscotch/graph.h 2008-06-01 02:49:11.000000000 -0700 949 991 *************** … … 962 1004 --- 159,165 ---- 963 1005 diff -rc src/src/libscotch/graph_io.c old/src/libscotch/graph_io.c 964 *** src/src/libscotch/graph_io.c 2010-07-19 1 1:51:37.250618080-07001006 *** src/src/libscotch/graph_io.c 2010-07-19 12:08:20.546684701 -0700 965 1007 --- old/src/libscotch/graph_io.c 2008-05-22 06:44:42.000000000 -0700 966 1008 *************** … … 1200 1242 --- 307,313 ---- 1201 1243 diff -rc src/src/libscotch/graph_io_scot.c old/src/libscotch/graph_io_scot.c 1202 *** src/src/libscotch/graph_io_scot.c 2010-07-19 1 1:51:37.253618101-07001244 *** src/src/libscotch/graph_io_scot.c 2010-07-19 12:08:20.549684722 -0700 1203 1245 --- old/src/libscotch/graph_io_scot.c 2008-05-22 06:44:42.000000000 -0700 1204 1246 *************** … … 1217 1259 --- 89,95 ---- 1218 1260 diff -rc src/src/libscotch/library_arch.c old/src/libscotch/library_arch.c 1219 *** src/src/libscotch/library_arch.c 2010-07-19 1 1:51:37.255618115-07001261 *** src/src/libscotch/library_arch.c 2010-07-19 12:08:20.550684729 -0700 1220 1262 --- old/src/libscotch/library_arch.c 2008-05-22 06:44:42.000000000 -0700 1221 1263 *************** … … 1252 1294 /*+ This routine saves the given opaque 1253 1295 diff -rc src/src/libscotch/library_arch_f.c old/src/libscotch/library_arch_f.c 1254 *** src/src/libscotch/library_arch_f.c 2010-07-19 1 1:51:37.257618129-07001296 *** src/src/libscotch/library_arch_f.c 2010-07-19 12:08:20.552684743 -0700 1255 1297 --- old/src/libscotch/library_arch_f.c 2008-05-22 06:44:42.000000000 -0700 1256 1298 *************** … … 1269 1311 --- 121,127 ---- 1270 1312 diff -rc src/src/libscotch/library_error_exit.c old/src/libscotch/library_error_exit.c 1271 *** src/src/libscotch/library_error_exit.c 2010-07-19 1 1:51:37.260618150-07001313 *** src/src/libscotch/library_error_exit.c 2010-07-19 12:08:20.556684771 -0700 1272 1314 --- old/src/libscotch/library_error_exit.c 2009-01-20 00:36:33.000000000 -0800 1273 1315 *************** … … 1344 1386 --- 171,174 ---- 1345 1387 diff -rc src/src/libscotch/library_graph.c old/src/libscotch/library_graph.c 1346 *** src/src/libscotch/library_graph.c 2010-07-19 1 1:51:37.263618172 -07001388 *** src/src/libscotch/library_graph.c 2010-07-19 12:08:20.559684792 -0700 1347 1389 --- old/src/libscotch/library_graph.c 2008-05-22 07:28:12.000000000 -0700 1348 1390 *************** … … 1389 1431 --- 153,159 ---- 1390 1432 diff -rc src/src/libscotch/library_graph_f.c old/src/libscotch/library_graph_f.c 1391 *** src/src/libscotch/library_graph_f.c 2010-07-19 1 1:51:37.265618186 -07001433 *** src/src/libscotch/library_graph_f.c 2010-07-19 12:08:20.561684806 -0700 1392 1434 --- old/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700 1393 1435 *************** … … 1406 1448 --- 136,142 ---- 1407 1449 diff -rc src/src/libscotch/library_graph_map.c old/src/libscotch/library_graph_map.c 1408 *** src/src/libscotch/library_graph_map.c 2010-07-19 1 1:51:37.267618200 -07001450 *** src/src/libscotch/library_graph_map.c 2010-07-19 12:08:20.563684820 -0700 1409 1451 --- old/src/libscotch/library_graph_map.c 2008-09-28 04:04:05.000000000 -0700 1410 1452 *************** … … 1431 1473 --- 182,192 ---- 1432 1474 diff -rc src/src/libscotch/library_graph_map_f.c old/src/libscotch/library_graph_map_f.c 1433 *** src/src/libscotch/library_graph_map_f.c 2010-07-19 1 1:51:37.269618214 -07001475 *** src/src/libscotch/library_graph_map_f.c 2010-07-19 12:08:20.565684834 -0700 1434 1476 --- old/src/libscotch/library_graph_map_f.c 2008-06-28 03:44:26.000000000 -0700 1435 1477 *************** … … 1448 1490 --- 183,189 ---- 1449 1491 diff -rc src/src/libscotch/library.h old/src/libscotch/library.h 1450 *** src/src/libscotch/library.h 2010-07-19 1 1:51:37.272618235-07001492 *** src/src/libscotch/library.h 2010-07-19 12:08:20.568684854 -0700 1451 1493 --- old/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700 1452 1494 *************** … … 1467 1509 --- 278,280 ---- 1468 1510 diff -rc src/src/libscotch/Makefile old/src/libscotch/Makefile 1469 *** src/src/libscotch/Makefile 2010-07-19 1 1:51:37.277618270-07001511 *** src/src/libscotch/Makefile 2010-07-19 12:08:20.573684889 -0700 1470 1512 --- old/src/libscotch/Makefile 2009-05-09 16:08:04.000000000 -0700 1471 1513 *************** … … 1702 1744 --- 2467,2469 ---- 1703 1745 diff -rc src/src/libscotch/mapping.h old/src/libscotch/mapping.h 1704 *** src/src/libscotch/mapping.h 2010-07-19 1 1:51:37.279618284-07001746 *** src/src/libscotch/mapping.h 2010-07-19 12:08:20.575684903 -0700 1705 1747 --- old/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700 1706 1748 *************** … … 1719 1761 --- 106,112 ---- 1720 1762 diff -rc src/src/libscotch/mapping_io.c old/src/libscotch/mapping_io.c 1721 *** src/src/libscotch/mapping_io.c 2010-07-19 1 1:51:37.282618306-07001763 *** src/src/libscotch/mapping_io.c 2010-07-19 12:08:20.578684924 -0700 1722 1764 --- old/src/libscotch/mapping_io.c 2008-05-22 06:44:43.000000000 -0700 1723 1765 *************** … … 1808 1850 } 1809 1851 diff -rc src/src/libscotch/mesh_io_scot.c old/src/libscotch/mesh_io_scot.c 1810 *** src/src/libscotch/mesh_io_scot.c 2010-07-19 1 1:51:37.285618327-07001852 *** src/src/libscotch/mesh_io_scot.c 2010-07-19 12:08:20.581684945 -0700 1811 1853 --- old/src/libscotch/mesh_io_scot.c 2008-05-22 06:44:43.000000000 -0700 1812 1854 *************** … … 1825 1867 --- 85,91 ---- 1826 1868 diff -rc src/src/libscotch/module.h old/src/libscotch/module.h 1827 *** src/src/libscotch/module.h 2010-07-19 1 1:51:37.288618348-07001869 *** src/src/libscotch/module.h 2010-07-19 12:08:20.584684966 -0700 1828 1870 --- old/src/libscotch/module.h 2009-04-26 23:07:14.000000000 -0700 1829 1871 *************** … … 1856 1898 --- 681,683 ---- 1857 1899 diff -rc src/src/libscotch/parser_ll.l old/src/libscotch/parser_ll.l 1858 *** src/src/libscotch/parser_ll.l 2010-07-19 1 1:51:37.290618362-07001900 *** src/src/libscotch/parser_ll.l 2010-07-19 12:08:20.586684980 -0700 1859 1901 --- old/src/libscotch/parser_ll.l 2008-05-22 06:44:43.000000000 -0700 1860 1902 *************** … … 1885 1927 --- 192,197 ---- 1886 1928 diff -rc src/src/libscotch/parser_yy.y old/src/libscotch/parser_yy.y 1887 *** src/src/libscotch/parser_yy.y 2010-07-19 1 1:51:37.293618383-07001929 *** src/src/libscotch/parser_yy.y 2010-07-19 12:08:20.589685001 -0700 1888 1930 --- old/src/libscotch/parser_yy.y 2008-10-22 15:12:48.000000000 -0700 1889 1931 *************** … … 1898 1940 --- 774,779 ---- 1899 1941 diff -rc src/src/libscotch/vgraph_separate_vw.c old/src/libscotch/vgraph_separate_vw.c 1900 *** src/src/libscotch/vgraph_separate_vw.c 2010-07-19 1 1:51:37.296618404-07001942 *** src/src/libscotch/vgraph_separate_vw.c 2010-07-19 12:08:20.592685021 -0700 1901 1943 --- old/src/libscotch/vgraph_separate_vw.c 2008-05-22 06:44:43.000000000 -0700 1902 1944 *************** … … 1920 1962 --- 102,106 ---- 1921 1963 diff -rc src/src/Makefile old/src/Makefile 1922 *** src/src/Makefile 2010-07-19 1 1:51:37.298618418-07001964 *** src/src/Makefile 2010-07-19 12:08:20.594685035 -0700 1923 1965 --- old/src/Makefile 2008-09-15 05:50:51.000000000 -0700 1924 1966 *************** … … 1937 1979 Only in src/src: Makefile.inc 1938 1980 diff -rc src/src/scotch/gmap.h old/src/scotch/gmap.h 1939 *** src/src/scotch/gmap.h 2010-07-19 1 1:52:16.821897100-07001981 *** src/src/scotch/gmap.h 2010-07-19 12:08:20.597685056 -0700 1940 1982 --- old/src/scotch/gmap.h 2008-06-18 11:05:17.000000000 -0700 1941 1983 *************** … … 1958 2000 Only in src/src/scotch: gmapx.c 1959 2001 diff -rc src/src/scotch/Makefile old/src/scotch/Makefile 1960 *** src/src/scotch/Makefile 2010-07-19 1 1:51:37.303618454-07002002 *** src/src/scotch/Makefile 2010-07-19 12:08:20.599685070 -0700 1961 2003 --- old/src/scotch/Makefile 2009-04-27 02:19:43.000000000 -0700 1962 2004 ***************
Note:
See TracChangeset
for help on using the changeset viewer.