Changeset 4653


Ignore:
Timestamp:
07/19/10 11:54:03 (15 years ago)
Author:
Eric.Larour
Message:

fixed header files

Location:
issm/trunk/externalpackages/scotch
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/externalpackages/scotch/install.sh

    r4631 r4653  
    11#!/bin/bash
     2
     3#get number of CPUS
     4NUMCPUS=$1;
    25
    36# Some cleanup
    … …  
    1821# Apply patches (all at once, since many)
    1922# (written by diff -rc src ~/Libs/scotch_5.1 > scotch.patch)
    20 patch -p0 < scotch.patch
     23patch -R -p0 < scotch.patch
     24#patch -p0 < scotch.patch
     25
     26
    2127
    2228# Build scotch
    … …  
    2632cd src/src
    2733# For stand-alone scotch modules:
    28 make scotch
     34make -j $NUMCPUS scotch
    2935#make clean
    3036# For mex scotch modules:
    … …  
    4046cp -pr src/man install
    4147mkdir install/include
    42 cp -p src/src/libscotch/module.h install/include
    43 cp -p src/src/libscotch/common.h install/include
    44 cp -p src/include/scotch.h install/include
    45 cp -p src/src/scotch/gmap.h install/include
     48cp -p src/src/libscotch/module.h install/include/scotch_module.h
     49cp -p src/src/libscotch/common.h install/include/scotch_common.h
     50cp -p src/include/scotch.h install/include/
     51cp -p src/src/scotch/gmap.h install/include/scotch_gmap.h
    4652mkdir install/lib
    4753mv src/lib/* install/lib
    … …  
    5056#cp -p gmap.m install/bin
    5157#cp -p gpart.m install/bin
    52 

  • issm/trunk/externalpackages/scotch/scotch.patch

    r4650 r4653  
    33Only in src: lib
    44diff -rc src/src/libscotch/arch.c old/src/libscotch/arch.c
    5 *** src/src/libscotch/arch.c    2010-07-19 10:53:22.888731718 -0700
     5*** src/src/libscotch/arch.c    2010-07-19 11:51:37.187617636 -0700
    66--- old/src/libscotch/arch.c    2008-09-27 07:48:01.000000000 -0700
    77***************
    … …  
    6969--- 190,196 ----
    7070diff -rc src/src/libscotch/arch_cmplt.c old/src/libscotch/arch_cmplt.c
    71 *** src/src/libscotch/arch_cmplt.c      2010-07-19 10:53:22.891731738 -0700
     71*** src/src/libscotch/arch_cmplt.c      2010-07-19 11:51:37.190617657 -0700
    7272--- old/src/libscotch/arch_cmplt.c      2008-05-22 06:44:41.000000000 -0700
    7373***************
    … …  
    121121--- 102,109 ----
    122122diff -rc src/src/libscotch/arch_cmplt.h old/src/libscotch/arch_cmplt.h
    123 *** src/src/libscotch/arch_cmplt.h      2010-07-19 10:53:22.893731751 -0700
     123*** src/src/libscotch/arch_cmplt.h      2010-07-19 11:51:37.193617678 -0700
    124124--- old/src/libscotch/arch_cmplt.h      2008-05-22 06:44:41.000000000 -0700
    125125***************
    … …  
    138138--- 87,93 ----
    139139diff -rc src/src/libscotch/arch_cmpltw.c old/src/libscotch/arch_cmpltw.c
    140 *** src/src/libscotch/arch_cmpltw.c     2010-07-19 10:53:22.896731770 -0700
     140*** src/src/libscotch/arch_cmpltw.c     2010-07-19 11:51:37.195617692 -0700
    141141--- old/src/libscotch/arch_cmpltw.c     2008-08-27 14:22:22.000000000 -0700
    142142***************
    … …  
    210210--- 230,237 ----
    211211diff -rc src/src/libscotch/arch_cmpltw.h old/src/libscotch/arch_cmpltw.h
    212 *** src/src/libscotch/arch_cmpltw.h     2010-07-19 10:53:22.899731789 -0700
     212*** src/src/libscotch/arch_cmpltw.h     2010-07-19 11:51:37.198617713 -0700
    213213--- old/src/libscotch/arch_cmpltw.h     2008-05-22 06:44:41.000000000 -0700
    214214***************
    … …  
    227227--- 86,92 ----
    228228diff -rc src/src/libscotch/arch_deco.c old/src/libscotch/arch_deco.c
    229 *** src/src/libscotch/arch_deco.c       2010-07-19 10:53:22.902731808 -0700
     229*** src/src/libscotch/arch_deco.c       2010-07-19 11:51:37.201617734 -0700
    230230--- old/src/libscotch/arch_deco.c       2008-09-28 06:35:27.000000000 -0700
    231231***************
    … …  
    268268--- 220,225 ----
    269269diff -rc src/src/libscotch/arch_deco.h old/src/libscotch/arch_deco.h
    270 *** src/src/libscotch/arch_deco.h       2010-07-19 10:53:22.904731821 -0700
     270*** src/src/libscotch/arch_deco.h       2010-07-19 11:51:37.204617756 -0700
    271271--- old/src/libscotch/arch_deco.h       2008-09-27 07:49:46.000000000 -0700
    272272***************
    … …  
    285285--- 113,119 ----
    286286diff -rc src/src/libscotch/arch.h old/src/libscotch/arch.h
    287 *** src/src/libscotch/arch.h    2010-07-19 10:53:22.907731841 -0700
     287*** src/src/libscotch/arch.h    2010-07-19 11:51:37.206617770 -0700
    288288--- old/src/libscotch/arch.h    2009-04-28 08:11:27.000000000 -0700
    289289***************
    … …  
    302302--- 175,181 ----
    303303diff -rc src/src/libscotch/arch_hcub.c old/src/libscotch/arch_hcub.c
    304 *** src/src/libscotch/arch_hcub.c       2010-07-19 10:53:22.910731860 -0700
     304*** src/src/libscotch/arch_hcub.c       2010-07-19 11:51:37.209617791 -0700
    305305--- old/src/libscotch/arch_hcub.c       2008-05-22 06:44:41.000000000 -0700
    306306***************
    … …  
    350350--- 98,105 ----
    351351diff -rc src/src/libscotch/arch_hcub.h old/src/libscotch/arch_hcub.h
    352 *** src/src/libscotch/arch_hcub.h       2010-07-19 10:53:22.912731873 -0700
     352*** src/src/libscotch/arch_hcub.h       2010-07-19 11:51:37.212617812 -0700
    353353--- old/src/libscotch/arch_hcub.h       2008-05-22 06:44:41.000000000 -0700
    354354***************
    … …  
    367367--- 85,91 ----
    368368diff -rc src/src/libscotch/arch_mesh.c old/src/libscotch/arch_mesh.c
    369 *** src/src/libscotch/arch_mesh.c       2010-07-19 10:53:22.915731892 -0700
     369*** src/src/libscotch/arch_mesh.c       2010-07-19 11:51:37.215617833 -0700
    370370--- old/src/libscotch/arch_mesh.c       2008-05-22 06:44:41.000000000 -0700
    371371***************
    … …  
    466466--- 431,440 ----
    467467diff -rc src/src/libscotch/arch_mesh.h old/src/libscotch/arch_mesh.h
    468 *** src/src/libscotch/arch_mesh.h       2010-07-19 10:53:22.918731911 -0700
     468*** src/src/libscotch/arch_mesh.h       2010-07-19 11:51:37.217617847 -0700
    469469--- old/src/libscotch/arch_mesh.h       2008-05-22 06:44:41.000000000 -0700
    470470***************
    … …  
    497497--- 114,120 ----
    498498diff -rc src/src/libscotch/arch_tleaf.c old/src/libscotch/arch_tleaf.c
    499 *** src/src/libscotch/arch_tleaf.c      2010-07-19 10:53:22.920731924 -0700
     499*** src/src/libscotch/arch_tleaf.c      2010-07-19 11:51:37.220617868 -0700
    500500--- old/src/libscotch/arch_tleaf.c      2008-05-22 06:44:41.000000000 -0700
    501501***************
    … …  
    555555--- 109,114 ----
    556556diff -rc src/src/libscotch/arch_tleaf.h old/src/libscotch/arch_tleaf.h
    557 *** src/src/libscotch/arch_tleaf.h      2010-07-19 10:53:22.923731944 -0700
     557*** src/src/libscotch/arch_tleaf.h      2010-07-19 11:51:37.223617890 -0700
    558558--- old/src/libscotch/arch_tleaf.h      2008-05-22 06:44:41.000000000 -0700
    559559***************
    … …  
    572572--- 89,95 ----
    573573diff -rc src/src/libscotch/arch_torus.c old/src/libscotch/arch_torus.c
    574 *** src/src/libscotch/arch_torus.c      2010-07-19 10:53:22.926731963 -0700
     574*** src/src/libscotch/arch_torus.c      2010-07-19 11:51:37.226617911 -0700
    575575--- old/src/libscotch/arch_torus.c      2008-05-22 06:44:41.000000000 -0700
    576576***************
    … …  
    671671--- 373,382 ----
    672672diff -rc src/src/libscotch/arch_torus.h old/src/libscotch/arch_torus.h
    673 *** src/src/libscotch/arch_torus.h      2010-07-19 10:53:22.928731976 -0700
     673*** src/src/libscotch/arch_torus.h      2010-07-19 11:51:37.228617925 -0700
    674674--- old/src/libscotch/arch_torus.h      2008-05-22 06:44:41.000000000 -0700
    675675***************
    … …  
    702702--- 114,120 ----
    703703diff -rc src/src/libscotch/common.c old/src/libscotch/common.c
    704 *** src/src/libscotch/common.c  2010-07-19 10:53:22.931731995 -0700
     704*** src/src/libscotch/common.c  2010-07-19 11:51:37.231617946 -0700
    705705--- old/src/libscotch/common.c  2008-05-22 06:44:41.000000000 -0700
    706706***************
    … …  
    721721--- 100,106 ----
    722722diff -rc src/src/libscotch/common.h old/src/libscotch/common.h
    723 *** src/src/libscotch/common.h  2010-07-19 10:53:22.933732008 -0700
     723*** src/src/libscotch/common.h  2010-07-19 11:51:37.233617960 -0700
    724724--- old/src/libscotch/common.h  2009-02-06 14:20:55.000000000 -0800
    725725***************
    726 *** 66,72 ****
    727   #include            <stdio.h>
    728   #include            <stdarg.h>
    729   #include            <stdlib.h>
    730 - #include            <stdint.h>                    /* added for intptr_t */
    731   #ifdef HAVE_MALLOC_H
    732   #include            <malloc.h>                    /* Deprecated, but required on some old systems */
    733   #endif /* HAVE_MALLOC_H */
    734 --- 66,71 ----
    735 ***************
    736 *** 89,108 ****
    737   #include            <pthread.h>
    738   #endif /* ((defined COMMON_PTHREAD) || (defined SCOTCH_PTHREAD)) */
    739  
    740 - #ifdef MATLAB
    741 -     #include "mat.h"
    742 -     #include "mex.h"
    743 -     #include "matrix.h"
    744 -
    745 -     #define printf mexPrintf
    746 -     #define fprintf(file,...) (file == stdout || file == stderr ? mexPrintf(__VA_ARGS__) : fprintf(file,__VA_ARGS__))
    747 -     #define malloc mxMalloc
    748 -     #define calloc mxCalloc
    749 -     #define realloc mxRealloc
    750 -     #define free mxFree
    751 -     #define exit(status) mexErrMsgTxt("exit=" #status)
    752 - #endif
    753 -
    754   /*
    755   **  Working definitions.
    756   */
    757 --- 88,93 ----
    758 ***************
    759 *** 224,230 ****
    760   int                         intSave             (FILE * const, const INT);
    761   void                        intAscn             (INT * const, const INT, const INT);
    762   void                        intPerm             (INT * const, const INT);
    763 - void                        intRandResetStatic  (void);
    764   void                        intRandReset        (void);
    765   void                        intRandInit         (void);
    766   INT                         intRandVal          (INT);
    767 --- 209,214 ----
     726*** 1,5 ****
     727- #ifndef _SCOTCH_COMMON_H_
     728- #define _SCOTCH_COMMON_H_
     729  /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS
     730  **
     731  ** This file is part of the Scotch software package for static mapping,
     732--- 1,3 ----
     733***************
     734*** 251,255 ****
     735  void nl##__ pl                                   \
     736  { nu pc; }                                       \
     737  void nu pl
     738-
     739- #endif //#ifndef _SCOTCH_COMMON_H_
     740--- 249,251 ----
    768741diff -rc src/src/libscotch/common_integer.c old/src/libscotch/common_integer.c
    769 *** src/src/libscotch/common_integer.c  2010-07-19 10:53:22.936732027 -0700
     742*** src/src/libscotch/common_integer.c  2010-07-19 11:51:37.236617981 -0700
    770743--- old/src/libscotch/common_integer.c  2009-01-21 01:32:32.000000000 -0800
    771744***************
    … …  
    828801--- 237,242 ----
    829802diff -rc src/src/libscotch/common_memory.c old/src/libscotch/common_memory.c
    830 *** src/src/libscotch/common_memory.c   2010-07-19 10:53:22.939732046 -0700
     803*** src/src/libscotch/common_memory.c   2010-07-19 11:51:37.239618002 -0700
    831804--- old/src/libscotch/common_memory.c   2009-01-03 02:16:11.000000000 -0800
    832805***************
    … …  
    936909--- 185,192 ----
    937910diff -rc src/src/libscotch/dummysizes.c old/src/libscotch/dummysizes.c
    938 *** src/src/libscotch/dummysizes.c      2010-07-19 10:53:22.941732059 -0700
     911*** src/src/libscotch/dummysizes.c      2010-07-19 11:51:37.241618017 -0700
    939912--- old/src/libscotch/dummysizes.c      2009-05-09 16:08:02.000000000 -0700
    940913***************
    … …  
    949922--- 267,271 ----
    950923diff -rc src/src/libscotch/graph.c old/src/libscotch/graph.c
    951 *** src/src/libscotch/graph.c   2010-07-19 10:53:22.943732072 -0700
     924*** src/src/libscotch/graph.c   2010-07-19 11:51:37.244618038 -0700
    952925--- old/src/libscotch/graph.c   2008-05-22 06:44:42.000000000 -0700
    953926***************
    … …  
    972945          ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
    973946diff -rc src/src/libscotch/graph.h old/src/libscotch/graph.h
    974 *** src/src/libscotch/graph.h   2010-07-19 10:53:22.946732092 -0700
     947*** src/src/libscotch/graph.h   2010-07-19 11:51:37.247618059 -0700
    975948--- old/src/libscotch/graph.h   2008-06-01 02:49:11.000000000 -0700
    976949***************
    … …  
    989962--- 159,165 ----
    990963diff -rc src/src/libscotch/graph_io.c old/src/libscotch/graph_io.c
    991 *** src/src/libscotch/graph_io.c        2010-07-19 10:53:22.949732111 -0700
     964*** src/src/libscotch/graph_io.c        2010-07-19 11:51:37.250618080 -0700
    992965--- old/src/libscotch/graph_io.c        2008-05-22 06:44:42.000000000 -0700
    993966***************
    … …  
    12271200--- 307,313 ----
    12281201diff -rc src/src/libscotch/graph_io_scot.c old/src/libscotch/graph_io_scot.c
    1229 *** src/src/libscotch/graph_io_scot.c   2010-07-19 10:53:22.952732130 -0700
     1202*** src/src/libscotch/graph_io_scot.c   2010-07-19 11:51:37.253618101 -0700
    12301203--- old/src/libscotch/graph_io_scot.c   2008-05-22 06:44:42.000000000 -0700
    12311204***************
    … …  
    12441217--- 89,95 ----
    12451218diff -rc src/src/libscotch/library_arch.c old/src/libscotch/library_arch.c
    1246 *** src/src/libscotch/library_arch.c    2010-07-19 10:53:22.954732143 -0700
     1219*** src/src/libscotch/library_arch.c    2010-07-19 11:51:37.255618115 -0700
    12471220--- old/src/libscotch/library_arch.c    2008-05-22 06:44:42.000000000 -0700
    12481221***************
    … …  
    12791252  /*+ This routine saves the given opaque
    12801253diff -rc src/src/libscotch/library_arch_f.c old/src/libscotch/library_arch_f.c
    1281 *** src/src/libscotch/library_arch_f.c  2010-07-19 10:53:22.956732156 -0700
     1254*** src/src/libscotch/library_arch_f.c  2010-07-19 11:51:37.257618129 -0700
    12821255--- old/src/libscotch/library_arch_f.c  2008-05-22 06:44:42.000000000 -0700
    12831256***************
    … …  
    12961269--- 121,127 ----
    12971270diff -rc src/src/libscotch/library_error_exit.c old/src/libscotch/library_error_exit.c
    1298 *** src/src/libscotch/library_error_exit.c      2010-07-19 10:53:22.959732175 -0700
     1271*** src/src/libscotch/library_error_exit.c      2010-07-19 11:51:37.260618150 -0700
    12991272--- old/src/libscotch/library_error_exit.c      2009-01-20 00:36:33.000000000 -0800
    13001273***************
    … …  
    13711344--- 171,174 ----
    13721345diff -rc src/src/libscotch/library_graph.c old/src/libscotch/library_graph.c
    1373 *** src/src/libscotch/library_graph.c   2010-07-19 10:53:22.962732194 -0700
     1346*** src/src/libscotch/library_graph.c   2010-07-19 11:51:37.263618172 -0700
    13741347--- old/src/libscotch/library_graph.c   2008-05-22 07:28:12.000000000 -0700
    13751348***************
    … …  
    14161389--- 153,159 ----
    14171390diff -rc src/src/libscotch/library_graph_f.c old/src/libscotch/library_graph_f.c
    1418 *** src/src/libscotch/library_graph_f.c 2010-07-19 10:53:22.964732207 -0700
     1391*** src/src/libscotch/library_graph_f.c 2010-07-19 11:51:37.265618186 -0700
    14191392--- old/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700
    14201393***************
    … …  
    14331406--- 136,142 ----
    14341407diff -rc src/src/libscotch/library_graph_map.c old/src/libscotch/library_graph_map.c
    1435 *** src/src/libscotch/library_graph_map.c       2010-07-19 10:53:22.967732227 -0700
     1408*** src/src/libscotch/library_graph_map.c       2010-07-19 11:51:37.267618200 -0700
    14361409--- old/src/libscotch/library_graph_map.c       2008-09-28 04:04:05.000000000 -0700
    14371410***************
    … …  
    14581431--- 182,192 ----
    14591432diff -rc src/src/libscotch/library_graph_map_f.c old/src/libscotch/library_graph_map_f.c
    1460 *** src/src/libscotch/library_graph_map_f.c     2010-07-19 10:53:22.969732239 -0700
     1433*** src/src/libscotch/library_graph_map_f.c     2010-07-19 11:51:37.269618214 -0700
    14611434--- old/src/libscotch/library_graph_map_f.c     2008-06-28 03:44:26.000000000 -0700
    14621435***************
    … …  
    14751448--- 183,189 ----
    14761449diff -rc src/src/libscotch/library.h old/src/libscotch/library.h
    1477 *** src/src/libscotch/library.h 2010-07-19 10:53:22.972732259 -0700
     1450*** src/src/libscotch/library.h 2010-07-19 11:51:37.272618235 -0700
    14781451--- old/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700
    14791452***************
    1480 *** 134,144 ****
    1481  
    1482   int                         SCOTCH_archInit     (SCOTCH_Arch * const);
    1483   void                        SCOTCH_archExit     (SCOTCH_Arch * const);
    1484 - #ifndef MATLAB
    1485   int                         SCOTCH_archLoad     (SCOTCH_Arch * const, FILE * const);
    1486 - #else /* MATLAB */
    1487 - int                         SCOTCH_archLoad     (SCOTCH_Arch * const, FILE * const, const char *, const SCOTCH_Num, const SCOTCH_Num *);
    1488 - #endif /* MATLAB */
    1489   int                         SCOTCH_archSave     (const SCOTCH_Arch * const, FILE * const);
    1490   int                         SCOTCH_archBuild    (SCOTCH_Arch * const, const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num * const, const SCOTCH_Strat * const);
    1491   int                         SCOTCH_archCmplt    (SCOTCH_Arch * const, const SCOTCH_Num);
    1492 --- 134,140 ----
    1493 ***************
    1494 *** 195,205 ****
    1495   int                         SCOTCH_graphInit    (SCOTCH_Graph * const);
    1496   void                        SCOTCH_graphExit    (SCOTCH_Graph * const);
    1497   void                        SCOTCH_graphFree    (SCOTCH_Graph * const);
    1498 - #ifndef MATLAB
    1499   int                         SCOTCH_graphLoad    (SCOTCH_Graph * const, FILE * const, const SCOTCH_Num, const SCOTCH_Num);
    1500 - #else /* MATLAB */
    1501 - 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 *);
    1502 - #endif /* MATLAB */
    1503   int                         SCOTCH_graphSave    (const SCOTCH_Graph * const, FILE * const);
    1504   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);
    1505   SCOTCH_Num                  SCOTCH_graphBase    (SCOTCH_Graph * const, const SCOTCH_Num baseval);
    1506 --- 191,197 ----
    1507 ***************
    1508 *** 218,228 ****
    1509   int                         SCOTCH_graphMapInit (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Arch * const, SCOTCH_Num * const);
    1510   void                        SCOTCH_graphMapExit (const SCOTCH_Graph * const, SCOTCH_Mapping * const);
    1511   int                         SCOTCH_graphMapLoad (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
    1512 - #ifndef MATLAB
    1513   int                         SCOTCH_graphMapSave (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
    1514 - #else /* MATLAB */
    1515 - int                         SCOTCH_graphMapSave (SCOTCH_Num *, SCOTCH_Num (**)[2], const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
    1516 - #endif /* MATLAB */
    1517   int                         SCOTCH_graphMapView (const SCOTCH_Graph * const, const SCOTCH_Mapping * const, FILE * const);
    1518   int                         SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const);
    1519   int                         SCOTCH_graphMap     (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const);
    1520 --- 210,216 ----
     1453*** 1,5 ****
     1454- #ifndef _SCOTCH_H_
     1455- #define _SCOTCH_H_
     1456  /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS
     1457  **
     1458  ** This file is part of the Scotch software package for static mapping,
     1459--- 1,3 ----
     1460***************
     1461*** 280,284 ****
     1462  #ifdef __cplusplus
     1463  }
     1464  #endif /* __cplusplus */
     1465-
     1466- #endif //#ifndef _SCOTCH_H_
     1467--- 278,280 ----
    15211468diff -rc src/src/libscotch/Makefile old/src/libscotch/Makefile
    1522 *** src/src/libscotch/Makefile  2010-07-19 10:53:22.977732291 -0700
     1469*** src/src/libscotch/Makefile  2010-07-19 11:51:37.277618270 -0700
    15231470--- old/src/libscotch/Makefile  2009-05-09 16:08:04.000000000 -0700
    15241471***************
    … …  
    17551702--- 2467,2469 ----
    17561703diff -rc src/src/libscotch/mapping.h old/src/libscotch/mapping.h
    1757 *** src/src/libscotch/mapping.h 2010-07-19 10:53:22.980732310 -0700
     1704*** src/src/libscotch/mapping.h 2010-07-19 11:51:37.279618284 -0700
    17581705--- old/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700
    17591706***************
    … …  
    17721719--- 106,112 ----
    17731720diff -rc src/src/libscotch/mapping_io.c old/src/libscotch/mapping_io.c
    1774 *** src/src/libscotch/mapping_io.c      2010-07-19 10:53:22.983732330 -0700
     1721*** src/src/libscotch/mapping_io.c      2010-07-19 11:51:37.282618306 -0700
    17751722--- old/src/libscotch/mapping_io.c      2008-05-22 06:44:43.000000000 -0700
    17761723***************
    … …  
    18611808  }
    18621809diff -rc src/src/libscotch/mesh_io_scot.c old/src/libscotch/mesh_io_scot.c
    1863 *** src/src/libscotch/mesh_io_scot.c    2010-07-19 10:53:22.986732349 -0700
     1810*** src/src/libscotch/mesh_io_scot.c    2010-07-19 11:51:37.285618327 -0700
    18641811--- old/src/libscotch/mesh_io_scot.c    2008-05-22 06:44:43.000000000 -0700
    18651812***************
    … …  
    18781825--- 85,91 ----
    18791826diff -rc src/src/libscotch/module.h old/src/libscotch/module.h
    1880 *** src/src/libscotch/module.h  2010-07-19 10:53:22.990732375 -0700
     1827*** src/src/libscotch/module.h  2010-07-19 11:51:37.288618348 -0700
    18811828--- old/src/libscotch/module.h  2009-04-26 23:07:14.000000000 -0700
    18821829***************
    1883 *** 156,162 ****
    1884   #define intSave                     _SCOTCHintSave
    1885   #define intAscn                     _SCOTCHintAscn
    1886   #define intPerm                     _SCOTCHintPerm
    1887 - #define intRandResetStatic          _SCOTCHintRandResetStatic
    1888   #define intRandReset                _SCOTCHintRandReset
    1889   #define intRandInit                 _SCOTCHintRandInit
    1890   /* #define intRandVal               _SCOTCHintRandVal Already a macro */
    1891 --- 156,161 ----
     1830*** 1,5 ****
     1831- #ifndef _SCOTCH_MODULE_H_
     1832- #define _SCOTCH_MODULE_H_
     1833  /* Copyright 2004,2007-2009 ENSEIRB, INRIA & CNRS
     1834  **
     1835  ** This file is part of the Scotch software package for static mapping,
     1836--- 1,3 ----
     1837***************
     1838*** 57,65 ****
     1839 
     1840  #define MODULE_H
     1841 
     1842- /*Don't forget stdint.h:*/
     1843- #include "stdint.h"
     1844-
     1845  /*
     1846  ** Collective communication handling.
     1847  */
     1848--- 55,60 ----
     1849***************
     1850*** 686,690 ****
     1851  #define vmeshStoreSave              _SCOTCHvmeshStoreSave
     1852  #define vmeshStoreUpdt              _SCOTCHvmeshStoreUpdt
     1853  #endif /* SCOTCH_RENAME */
     1854-
     1855- #endif //#ifndef _SCOTCH_MODULE_H_
     1856--- 681,683 ----
    18921857diff -rc src/src/libscotch/parser_ll.l old/src/libscotch/parser_ll.l
    1893 *** src/src/libscotch/parser_ll.l       2010-07-19 10:53:22.993732394 -0700
     1858*** src/src/libscotch/parser_ll.l       2010-07-19 11:51:37.290618362 -0700
    18941859--- old/src/libscotch/parser_ll.l       2008-05-22 06:44:43.000000000 -0700
    18951860***************
    … …  
    19201885--- 192,197 ----
    19211886diff -rc src/src/libscotch/parser_yy.y old/src/libscotch/parser_yy.y
    1922 *** src/src/libscotch/parser_yy.y       2010-07-19 10:53:22.997732420 -0700
     1887*** src/src/libscotch/parser_yy.y       2010-07-19 11:51:37.293618383 -0700
    19231888--- old/src/libscotch/parser_yy.y       2008-10-22 15:12:48.000000000 -0700
    19241889***************
    … …  
    19331898--- 774,779 ----
    19341899diff -rc src/src/libscotch/vgraph_separate_vw.c old/src/libscotch/vgraph_separate_vw.c
    1935 *** src/src/libscotch/vgraph_separate_vw.c      2010-07-19 10:53:22.999732432 -0700
     1900*** src/src/libscotch/vgraph_separate_vw.c      2010-07-19 11:51:37.296618404 -0700
    19361901--- old/src/libscotch/vgraph_separate_vw.c      2008-05-22 06:44:43.000000000 -0700
    19371902***************
    … …  
    19551920--- 102,106 ----
    19561921diff -rc src/src/Makefile old/src/Makefile
    1957 *** src/src/Makefile    2010-07-19 10:53:23.001732445 -0700
     1922*** src/src/Makefile    2010-07-19 11:51:37.298618418 -0700
    19581923--- old/src/Makefile    2008-09-15 05:50:51.000000000 -0700
    19591924***************
    … …  
    19711936--- 97,102 ----
    19721937Only in src/src: Makefile.inc
     1938diff -rc src/src/scotch/gmap.h old/src/scotch/gmap.h
     1939*** src/src/scotch/gmap.h       2010-07-19 11:52:16.821897100 -0700
     1940--- old/src/scotch/gmap.h       2008-06-18 11:05:17.000000000 -0700
     1941***************
     1942*** 1,5 ****
     1943- #ifndef _SCOTCH_GMAP_H_
     1944- #define _SCOTCH_GMAP_H_
     1945  /* Copyright 2004,2007,2008 ENSEIRB, INRIA & CNRS
     1946  **
     1947  ** This file is part of the Scotch software package for static mapping,
     1948--- 1,3 ----
     1949***************
     1950*** 89,93 ****
     1951  #define C_FLAGVERBSTR               0x0002        /* Verbose flags */
     1952  #define C_FLAGVERBTIM               0x0004
     1953  #define C_FLAGVERBMAP               0x0008
     1954-
     1955- #endif //#ifndef _SCOTCH_GMAP_H_
     1956--- 87,89 ----
    19731957Only in src/src/scotch: gmap_mex.c
    19741958Only in src/src/scotch: gmapx.c
    19751959diff -rc src/src/scotch/Makefile old/src/scotch/Makefile
    1976 *** src/src/scotch/Makefile     2010-07-19 10:53:23.004732465 -0700
     1960*** src/src/scotch/Makefile     2010-07-19 11:51:37.303618454 -0700
    19771961--- old/src/scotch/Makefile     2009-04-27 02:19:43.000000000 -0700
    19781962***************
Note: See TracChangeset for help on using the changeset viewer.