Changeset 3060


Ignore:
Timestamp:
02/19/10 16:03:30 (15 years ago)
Author:
jschierm
Message:

Scotch: implement environment variables in Makefiles.

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

Legend:

Unmodified
Added
Removed

  • issm/trunk/externalpackages/scotch/Makefile.inc

    r3003 r3060  
    1111CCP     = mpicc
    1212CCD     = mpicc
    13 CCM     = mex
    14 #CFLAGS = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -fPIC -I/usr/local/pkgs/matlab-7.6/extern/include
     13CCM     = ${MATLAB_DIR}/bin/mex
     14#CFLAGS = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -fPIC -I${MATLAB_DIR}/extern/include
    1515CFLAGS  = -m64 -O3 -std=c99 -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -fPIC
    16 #LDFLAGS        = -lz -lm -lrt -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat
    17 #LDFLAGS        = -lz -lm -lrt -Wl,-rpath-link,/usr/local/pkgs/matlab-7.6/bin/glnxa64 -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat
     16#LDFLAGS        = -lz -lm -lrt -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat
     17#LDFLAGS        = -lz -lm -lrt -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat
    1818LDFLAGS = -lz -lm -lrt
    19 MFLAGS  = -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -I/usr/local/pkgs/matlab-7.6/extern/include -largeArrayDims
     19MFLAGS  = -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t -DCOMMON_TIMING_OLD -DMATLAB -I${MATLAB_DIR}/extern/include -largeArrayDims
    2020CP      = cp
    2121LEX     = flex

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

    r3003 r3060  
    1 Only in /home/jschierm/Libs/scotch_5.1: 3elt.log
    2 Only in /home/jschierm/Libs/scotch_5.1: 3elt.map
    3 Only in /home/jschierm/Libs/scotch_5.1: bin
    4 Only in /home/jschierm/Libs/scotch_5.1: diary
    5 Only in /home/jschierm/Libs/scotch_5.1: gmap.log
    6 Only in /home/jschierm/Libs/scotch_5.1: gmap.m
    7 Only in /home/jschierm/Libs/scotch_5.1: gmap.map
    8 Only in /home/jschierm/Libs/scotch_5.1/grf: 3elt.grf
    9 Only in src/grf: 3elt.grf.gz
    10 Only in /home/jschierm/Libs/scotch_5.1/grf: 3elt.xyz
    11 Only in src/grf: 3elt.xyz.gz
    12 Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt2.grf
    13 Only in src/grf: 4elt2.grf.gz
    14 Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt2.xyz
    15 Only in src/grf: 4elt2.xyz.gz
    16 Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt.grf
    17 Only in src/grf: 4elt.grf.gz
    18 Only in /home/jschierm/Libs/scotch_5.1/grf: 4elt.xyz
    19 Only in src/grf: 4elt.xyz.gz
    20 Only in /home/jschierm/Libs/scotch_5.1/grf: bump.grf
    21 Only in src/grf: bump.grf.gz
    22 Only in /home/jschierm/Libs/scotch_5.1/grf: bump.xyz
    23 Only in src/grf: bump.xyz.gz
    24 Only in /home/jschierm/Libs/scotch_5.1: include
    25 Only in /home/jschierm/Libs/scotch_5.1: lib
    26 Only in /home/jschierm/Libs/scotch_5.1: ScotchGraphWrite.m
    27 Only in /home/jschierm/Libs/scotch_5.1: ScotchMapRead.m
    28 Only in /home/jschierm/Libs/scotch_5.1: ScotchRun.m
    29 Only in /home/jschierm/Libs/scotch_5.1: scotch_save.tar
    30 Only in /home/jschierm/Libs/scotch_5.1: ScotchTargetWrite.m
    31 diff -rc src/src/libscotch/arch.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.c
     1Only in new: bin
     2Only in new: include
     3Only in new: lib
     4diff -rc src/src/libscotch/arch.c new/src/libscotch/arch.c
    325*** src/src/libscotch/arch.c    2008-09-27 07:48:01.000000000 -0700
    33 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.c 2010-02-10 11:08:45.873926805 -0800
     6--- new/src/libscotch/arch.c    2010-02-10 11:23:26.442951850 -0800
    347***************
    358*** 173,187 ****
    … …  
    9568        memset     (archptr, 0, sizeof (Arch));     /* Initialize architecture body */
    9669        return     (1);
    97 diff -rc src/src/libscotch/arch_cmplt.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.c
     70diff -rc src/src/libscotch/arch_cmplt.c new/src/libscotch/arch_cmplt.c
    9871*** src/src/libscotch/arch_cmplt.c      2008-05-22 06:44:41.000000000 -0700
    99 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.c   2010-02-08 15:42:01.878691914 -0800
     72--- new/src/libscotch/arch_cmplt.c      2010-02-10 11:23:26.449951858 -0800
    10073***************
    10174*** 90,99 ****
    … …  
    147120      return     (1);
    148121    }
    149 diff -rc src/src/libscotch/arch_cmplt.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.h
     122diff -rc src/src/libscotch/arch_cmplt.h new/src/libscotch/arch_cmplt.h
    150123*** src/src/libscotch/arch_cmplt.h      2008-05-22 06:44:41.000000000 -0700
    151 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmplt.h   2010-02-08 15:24:01.543386538 -0800
     124--- new/src/libscotch/arch_cmplt.h      2010-02-10 11:23:26.455951865 -0800
    152125***************
    153126*** 87,93 ****
    … …  
    164137  #define archCmpltArchFree           NULL
    165138  ArchDomNum                  archCmpltDomNum     (const ArchCmplt * const, const ArchCmpltDom * const);
    166 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmplt_old.c
    167 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmplt_old.h
    168 diff -rc src/src/libscotch/arch_cmpltw.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.c
     139diff -rc src/src/libscotch/arch_cmpltw.c new/src/libscotch/arch_cmpltw.c
    169140*** src/src/libscotch/arch_cmpltw.c     2008-08-27 14:22:22.000000000 -0700
    170 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.c  2010-02-08 15:44:15.206851120 -0800
     141--- new/src/libscotch/arch_cmpltw.c     2010-02-10 11:23:26.462951873 -0800
    171142***************
    172143*** 200,211 ****
    … …  
    238209        return     (1);
    239210      }
    240 diff -rc src/src/libscotch/arch_cmpltw.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.h
     211diff -rc src/src/libscotch/arch_cmpltw.h new/src/libscotch/arch_cmpltw.h
    241212*** src/src/libscotch/arch_cmpltw.h     2008-05-22 06:44:41.000000000 -0700
    242 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_cmpltw.h  2010-02-09 11:44:11.147224781 -0800
     213--- new/src/libscotch/arch_cmpltw.h     2010-02-10 11:23:26.469951882 -0800
    243214***************
    244215*** 86,92 ****
    … …  
    255226  int                         archCmpltwArchFree  (ArchCmpltw * restrict const);
    256227  ArchDomNum                  archCmpltwDomNum    (const ArchCmpltw * const, const ArchCmpltwDom * const);
    257 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmpltw_old.c
    258 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_cmpltw_old.h
    259 diff -rc src/src/libscotch/arch_deco.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.c
     228diff -rc src/src/libscotch/arch_deco.c new/src/libscotch/arch_deco.c
    260229*** src/src/libscotch/arch_deco.c       2008-09-28 06:35:27.000000000 -0700
    261 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.c    2010-02-08 15:46:23.549004027 -0800
     230--- new/src/libscotch/arch_deco.c       2010-02-10 11:23:26.476951890 -0800
    262231***************
    263232*** 211,217 ****
    … …  
    298267    if ((sizeof (ArchDeco)    > sizeof (ArchDummy)) ||
    299268        (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) {
    300 diff -rc src/src/libscotch/arch_deco.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.h
     269diff -rc src/src/libscotch/arch_deco.h new/src/libscotch/arch_deco.h
    301270*** src/src/libscotch/arch_deco.h       2008-09-27 07:49:46.000000000 -0700
    302 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_deco.h    2010-02-08 15:25:21.216483840 -0800
     271--- new/src/libscotch/arch_deco.h       2010-02-10 11:23:26.482951897 -0800
    303272***************
    304273*** 113,119 ****
    … …  
    315284  int                         archDecoArchFree    (ArchDeco * const);
    316285  Anum                        archDecoArchSize    (ArchDeco * const, const Anum);
    317 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_deco_old.c
    318 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_deco_old.h
    319 diff -rc src/src/libscotch/arch.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.h
     286diff -rc src/src/libscotch/arch.h new/src/libscotch/arch.h
    320287*** src/src/libscotch/arch.h    2009-04-28 08:11:27.000000000 -0700
    321 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch.h 2010-02-08 15:14:06.397653868 -0800
     288--- new/src/libscotch/arch.h    2010-02-10 11:23:26.488951904 -0800
    322289***************
    323290*** 175,181 ****
    … …  
    334301  char *                      archName            (const Arch * const);
    335302  const ArchClass *           archClass           (const char * const);
    336 diff -rc src/src/libscotch/arch_hcub.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.c
     303diff -rc src/src/libscotch/arch_hcub.c new/src/libscotch/arch_hcub.c
    337304*** src/src/libscotch/arch_hcub.c       2008-05-22 06:44:41.000000000 -0700
    338 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.c    2010-02-08 15:48:09.189129642 -0800
     305--- new/src/libscotch/arch_hcub.c       2010-02-10 11:23:26.495951912 -0800
    339306***************
    340307*** 88,95 ****
    … …  
    382349      errorPrint ("archHcubArchLoad: bad input");
    383350      return     (1);
    384 diff -rc src/src/libscotch/arch_hcub.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.h
     351diff -rc src/src/libscotch/arch_hcub.h new/src/libscotch/arch_hcub.h
    385352*** src/src/libscotch/arch_hcub.h       2008-05-22 06:44:41.000000000 -0700
    386 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_hcub.h    2010-02-08 15:26:06.864539511 -0800
     353--- new/src/libscotch/arch_hcub.h       2010-02-10 11:23:26.501951919 -0800
    387354***************
    388355*** 85,91 ****
    … …  
    399366  #define archHcubArchFree            NULL
    400367  ArchDomNum                  archHcubDomNum      (const ArchHcub * const, const ArchHcubDom * const);
    401 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_hcub_old.c
    402 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_hcub_old.h
    403 diff -rc src/src/libscotch/arch_mesh.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.c
     368diff -rc src/src/libscotch/arch_mesh.c new/src/libscotch/arch_mesh.c
    404369*** src/src/libscotch/arch_mesh.c       2008-05-22 06:44:41.000000000 -0700
    405 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.c    2010-02-08 15:52:01.266404851 -0800
     370--- new/src/libscotch/arch_mesh.c       2010-02-10 11:23:26.508951927 -0800
    406371***************
    407372*** 96,103 ****
    … …  
    500465      return     (1);
    501466    }
    502 diff -rc src/src/libscotch/arch_mesh.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.h
     467diff -rc src/src/libscotch/arch_mesh.h new/src/libscotch/arch_mesh.h
    503468*** src/src/libscotch/arch_mesh.h       2008-05-22 06:44:41.000000000 -0700
    504 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_mesh.h    2010-02-08 15:27:29.654640338 -0800
     469--- new/src/libscotch/arch_mesh.h       2010-02-10 11:23:26.514951934 -0800
    505470***************
    506471*** 96,102 ****
    … …  
    531496  #define archMesh3ArchFree           NULL
    532497  ArchDomNum                  archMesh3DomNum     (const ArchMesh3 * const, const ArchMesh3Dom * const);
    533 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_mesh_old.c
    534 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_mesh_old.h
    535 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_old.c
    536 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_old.h
    537 diff -rc src/src/libscotch/arch_tleaf.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.c
     498diff -rc src/src/libscotch/arch_tleaf.c new/src/libscotch/arch_tleaf.c
    538499*** src/src/libscotch/arch_tleaf.c      2008-05-22 06:44:41.000000000 -0700
    539 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.c   2010-02-08 15:53:28.701508248 -0800
     500--- new/src/libscotch/arch_tleaf.c      2010-02-10 11:23:26.520951941 -0800
    540501***************
    541502*** 92,99 ****
    … …  
    593554      return     (1);
    594555    }
    595 diff -rc src/src/libscotch/arch_tleaf.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.h
     556diff -rc src/src/libscotch/arch_tleaf.h new/src/libscotch/arch_tleaf.h
    596557*** src/src/libscotch/arch_tleaf.h      2008-05-22 06:44:41.000000000 -0700
    597 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_tleaf.h   2010-02-08 15:28:10.269689735 -0800
     558--- new/src/libscotch/arch_tleaf.h      2010-02-10 11:23:26.526951948 -0800
    598559***************
    599560*** 89,95 ****
    … …  
    610571  #define archTleafArchFree           NULL
    611572  ArchDomNum                  archTleafDomNum     (const ArchTleaf * const, const ArchTleafDom * const);
    612 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_tleaf_old.c
    613 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_tleaf_old.h
    614 diff -rc src/src/libscotch/arch_torus.c /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.c
     573diff -rc src/src/libscotch/arch_torus.c new/src/libscotch/arch_torus.c
    615574*** src/src/libscotch/arch_torus.c      2008-05-22 06:44:41.000000000 -0700
    616 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.c   2010-02-10 09:58:44.790706850 -0800
     575--- new/src/libscotch/arch_torus.c      2010-02-10 11:23:26.533951956 -0800
    617576***************
    618577*** 90,97 ****
    … …  
    711670      return     (1);
    712671    }
    713 diff -rc src/src/libscotch/arch_torus.h /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.h
     672diff -rc src/src/libscotch/arch_torus.h new/src/libscotch/arch_torus.h
    714673*** src/src/libscotch/arch_torus.h      2008-05-22 06:44:41.000000000 -0700
    715 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/arch_torus.h   2010-02-08 15:29:22.742777748 -0800
     674--- new/src/libscotch/arch_torus.h      2010-02-10 11:23:26.540951964 -0800
    716675***************
    717676*** 96,102 ****
    … …  
    742701  #define archTorus3ArchFree          NULL
    743702  ArchDomNum                  archTorus3DomNum    (const ArchTorus3 * const, const ArchTorus3Dom * const);
    744 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_torus_old.c
    745 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: arch_torus_old.h
    746 diff -rc src/src/libscotch/common.c /home/jschierm/Libs/scotch_5.1/src/libscotch/common.c
     703diff -rc src/src/libscotch/common.c new/src/libscotch/common.c
    747704*** src/src/libscotch/common.c  2008-05-22 06:44:41.000000000 -0700
    748 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/common.c       2009-08-20 11:26:05.906946884 -0700
     705--- new/src/libscotch/common.c  2010-02-10 11:23:26.546951971 -0800
    749706***************
    750707*** 100,106 ****
    … …  
    763720+ #endif /* MATLAB */
    764721  }
    765 diff -rc src/src/libscotch/common.h /home/jschierm/Libs/scotch_5.1/src/libscotch/common.h
     722diff -rc src/src/libscotch/common.h new/src/libscotch/common.h
    766723*** src/src/libscotch/common.h  2009-02-06 14:20:55.000000000 -0800
    767 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/common.h       2009-08-25 10:12:42.449687289 -0700
     724--- new/src/libscotch/common.h  2010-02-10 11:23:26.552951978 -0800
    768725***************
    769726*** 66,71 ****
    … …  
    799756  **  Working definitions.
    800757  */
    801 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: common_old.c
    802 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: common_old.h
    803 diff -rc src/src/libscotch/dummysizes.c /home/jschierm/Libs/scotch_5.1/src/libscotch/dummysizes.c
     758diff -rc src/src/libscotch/dummysizes.c new/src/libscotch/dummysizes.c
    804759*** src/src/libscotch/dummysizes.c      2009-05-09 16:08:02.000000000 -0700
    805 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/dummysizes.c   2009-08-20 10:23:00.204162919 -0700
     760--- new/src/libscotch/dummysizes.c      2010-02-10 11:23:26.558951985 -0800
    806761***************
    807762*** 267,271 ****
    … …  
    814769+ #endif /* MATLAB */
    815770  }
    816 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: dummysizes_old.c
    817 diff -rc src/src/libscotch/graph.c /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.c
     771diff -rc src/src/libscotch/graph.c new/src/libscotch/graph.c
    818772*** src/src/libscotch/graph.c   2008-05-22 06:44:42.000000000 -0700
    819 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.c        2009-12-11 11:17:23.319268242 -0800
     773--- new/src/libscotch/graph.c   2010-02-10 11:23:26.564951992 -0800
    820774***************
    821775*** 135,141 ****
    … …  
    838792      if ((grafptr->edlotax != NULL) &&
    839793          ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
    840 diff -rc src/src/libscotch/graph.h /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.h
     794diff -rc src/src/libscotch/graph.h new/src/libscotch/graph.h
    841795*** src/src/libscotch/graph.h   2008-06-01 02:49:11.000000000 -0700
    842 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph.h        2010-02-08 14:21:35.655766453 -0800
     796--- new/src/libscotch/graph.h   2010-02-10 11:23:26.570951999 -0800
    843797***************
    844798*** 159,165 ****
    … …  
    855809  int                         graphSave           (const Graph * const, FILE * const);
    856810  Gnum                        graphBase           (Graph * const, const Gnum);
    857 diff -rc src/src/libscotch/graph_io.c /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io.c
     811diff -rc src/src/libscotch/graph_io.c new/src/libscotch/graph_io.c
    858812*** src/src/libscotch/graph_io.c        2008-05-22 06:44:42.000000000 -0700
    859 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io.c     2010-02-09 09:33:53.440543871 -0800
     813--- new/src/libscotch/graph_io.c        2010-02-10 11:23:26.577952008 -0800
    860814***************
    861815*** 86,92 ****
    … …  
    10931047    }
    10941048 
    1095 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_io_old.c
    1096 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_io_save.c
    1097 diff -rc src/src/libscotch/graph_io_scot.c /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io_scot.c
     1049diff -rc src/src/libscotch/graph_io_scot.c new/src/libscotch/graph_io_scot.c
    10981050*** src/src/libscotch/graph_io_scot.c   2008-05-22 06:44:42.000000000 -0700
    1099 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/graph_io_scot.c        2010-02-08 14:40:05.279143819 -0800
     1051--- new/src/libscotch/graph_io_scot.c   2010-02-10 11:23:26.584952016 -0800
    11001052***************
    11011053*** 89,95 ****
    … …  
    11121064    }
    11131065 
    1114 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_io_scot_old.c
    1115 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_old.c
    1116 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: graph_old.h
    1117 diff -rc src/src/libscotch/library_arch.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch.c
     1066diff -rc src/src/libscotch/library_arch.c new/src/libscotch/library_arch.c
    11181067*** src/src/libscotch/library_arch.c    2008-05-22 06:44:42.000000000 -0700
    1119 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch.c 2010-02-08 15:41:48.114675458 -0800
     1068--- new/src/libscotch/library_arch.c    2010-02-10 11:23:26.605952040 -0800
    11201069***************
    11211070*** 120,128 ****
    … …  
    11501099 
    11511100  /*+ This routine saves the given opaque
    1152 diff -rc src/src/libscotch/library_arch_f.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch_f.c
     1101diff -rc src/src/libscotch/library_arch_f.c new/src/libscotch/library_arch_f.c
    11531102*** src/src/libscotch/library_arch_f.c  2008-05-22 06:44:42.000000000 -0700
    1154 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_arch_f.c       2010-02-08 15:57:30.991794029 -0800
     1103--- new/src/libscotch/library_arch_f.c  2010-02-10 11:23:26.611952047 -0800
    11551104***************
    11561105*** 121,127 ****
    … …  
    11671116    fclose (stream);                                /* This closes filenum too */
    11681117 
    1169 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_arch_f_old.c
    1170 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_arch_old.c
    1171 diff -rc src/src/libscotch/library_error_exit.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_error_exit.c
     1118diff -rc src/src/libscotch/library_error_exit.c new/src/libscotch/library_error_exit.c
    11721119*** src/src/libscotch/library_error_exit.c      2009-01-20 00:36:33.000000000 -0800
    1173 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_error_exit.c   2009-08-20 10:35:56.268159643 -0700
     1120--- new/src/libscotch/library_error_exit.c      2010-02-10 11:23:26.617952054 -0800
    11741121***************
    11751122*** 114,119 ****
    … …  
    12441191+ #endif /* MATLAB */
    12451192  }
    1246 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_error_exit_old.c
    1247 diff -rc src/src/libscotch/library_graph.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph.c
     1193diff -rc src/src/libscotch/library_graph.c new/src/libscotch/library_graph.c
    12481194*** src/src/libscotch/library_graph.c   2008-05-22 07:28:12.000000000 -0700
    1249 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph.c        2010-02-08 15:40:32.323584768 -0800
     1195--- new/src/libscotch/library_graph.c   2010-02-10 11:23:26.623952061 -0800
    12501196***************
    12511197*** 137,143 ****
    … …  
    12901236 
    12911237  /*+ This routine saves the contents of the given
    1292 diff -rc src/src/libscotch/library_graph_f.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_f.c
     1238diff -rc src/src/libscotch/library_graph_f.c new/src/libscotch/library_graph_f.c
    12931239*** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700
    1294 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_f.c      2010-02-08 14:42:47.845342853 -0800
     1240--- new/src/libscotch/library_graph_f.c 2010-02-10 11:23:26.630952069 -0800
    12951241***************
    12961242*** 136,142 ****
    … …  
    13071253    fclose (stream);                                /* This closes filenum too */
    13081254 
    1309 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_f_old.c
    1310 diff -rc src/src/libscotch/library_graph_map.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map.c
     1255diff -rc src/src/libscotch/library_graph_map.c new/src/libscotch/library_graph_map.c
    13111256*** src/src/libscotch/library_graph_map.c       2008-09-28 04:04:05.000000000 -0700
    1312 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map.c    2010-02-08 14:48:10.401735571 -0800
     1257--- new/src/libscotch/library_graph_map.c       2010-02-10 11:23:26.635952075 -0800
    13131258***************
    13141259*** 182,192 ****
    … …  
    13331278 
    13341279  /*+ This routine computes a mapping
    1335 diff -rc src/src/libscotch/library_graph_map_f.c /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map_f.c
     1280diff -rc src/src/libscotch/library_graph_map_f.c new/src/libscotch/library_graph_map_f.c
    13361281*** src/src/libscotch/library_graph_map_f.c     2008-06-28 03:44:26.000000000 -0700
    1337 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library_graph_map_f.c  2010-02-08 15:01:51.742742812 -0800
     1282--- new/src/libscotch/library_graph_map_f.c     2010-02-10 11:23:26.642952083 -0800
    13381283***************
    13391284*** 183,189 ****
    … …  
    13501295    fclose (stream);                                /* This closes filenum too */
    13511296 
    1352 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_map_f_old.c
    1353 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_map_old.c
    1354 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_graph_old.c
    1355 diff -rc src/src/libscotch/library.h /home/jschierm/Libs/scotch_5.1/src/libscotch/library.h
     1297diff -rc src/src/libscotch/library.h new/src/libscotch/library.h
    13561298*** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700
    1357 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/library.h      2010-02-08 15:08:39.121250004 -0800
     1299--- new/src/libscotch/library.h 2010-02-10 11:23:26.648952090 -0800
    13581300***************
    13591301*** 134,140 ****
    … …  
    13981340  int                         SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const);
    13991341  int                         SCOTCH_graphMap     (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const);
    1400 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: library_old.h
    1401 diff -rc src/src/libscotch/Makefile /home/jschierm/Libs/scotch_5.1/src/libscotch/Makefile
     1342diff -rc src/src/libscotch/Makefile new/src/libscotch/Makefile
    14021343*** src/src/libscotch/Makefile  2009-05-09 16:08:04.000000000 -0700
    1403 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/Makefile       2010-02-10 10:20:55.219532741 -0800
     1344--- new/src/libscotch/Makefile  2010-02-19 15:46:06.253243103 -0800
    14041345***************
    14051346*** 49,55 ****
    … …  
    14261367 
    14271368+ mexscotch                     :       clean
    1428 +                                       $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I/usr/local/pkgs/matlab-7.6/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,/usr/local/pkgs/matlab-7.6/bin/glnxa64 -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch      \
     1369+                                       $(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     \
    14291370+                                       scotch.h                                                \
    14301371+                                       scotchf.h                                               \
    … …  
    14361377                                        -$(CP) scotch.h scotchf.h $(includedir)
    14371378                                        -$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir)
    1438 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: Makefile_old
    1439 diff -rc src/src/libscotch/mapping.h /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping.h
     1379diff -rc src/src/libscotch/mapping.h new/src/libscotch/mapping.h
    14401380*** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700
    1441 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping.h      2010-02-08 14:49:15.141814037 -0800
     1381--- new/src/libscotch/mapping.h 2010-02-10 11:23:26.662952107 -0800
    14421382***************
    14431383*** 106,112 ****
    … …  
    14541394 
    14551395  #undef static
    1456 diff -rc src/src/libscotch/mapping_io.c /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping_io.c
     1396diff -rc src/src/libscotch/mapping_io.c new/src/libscotch/mapping_io.c
    14571397*** src/src/libscotch/mapping_io.c      2008-05-22 06:44:43.000000000 -0700
    1458 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/mapping_io.c   2010-02-08 14:59:13.768544543 -0800
     1398--- new/src/libscotch/mapping_io.c      2010-02-10 11:23:26.667952113 -0800
    14591399***************
    14601400*** 199,204 ****
    … …  
    15431483    return (0);
    15441484  }
    1545 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: mapping_io_old.c
    1546 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: mapping_old.h
    1547 diff -rc src/src/libscotch/mesh_io_scot.c /home/jschierm/Libs/scotch_5.1/src/libscotch/mesh_io_scot.c
     1485diff -rc src/src/libscotch/mesh_io_scot.c new/src/libscotch/mesh_io_scot.c
    15481486*** src/src/libscotch/mesh_io_scot.c    2008-05-22 06:44:43.000000000 -0700
    1549 --- /home/jschierm/Libs/scotch_5.1/src/libscotch/mesh_io_scot.c 2010-02-08 14:41:47.841269476 -0800
     1487--- new/src/libscotch/mesh_io_scot.c    2010-02-10 11:23:26.673952120 -0800
    15501488***************
    15511489*** 85,91 ****
    … …  
    15621500    }
    15631501 
    1564 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: mesh_io_scot_old.c
    1565 Only in /home/jschierm/Libs/scotch_5.1/src/libscotch: scotch_old.h
    1566 diff -rc src/src/Makefile /home/jschierm/Libs/scotch_5.1/src/Makefile
     1502diff -rc src/src/Makefile new/src/Makefile
    15671503*** src/src/Makefile    2008-09-15 05:50:51.000000000 -0700
    1568 --- /home/jschierm/Libs/scotch_5.1/src/Makefile 2010-02-10 09:41:16.791255216 -0800
     1504--- new/src/Makefile    2010-02-10 11:23:26.678952125 -0800
    15691505***************
    15701506*** 97,102 ****
    … …  
    15801516                                        -$(CP) -f ../bin/[agm]*$(EXE) $(bindir)
    15811517                                        -$(CP) -f ../include/*scotch*.h $(includedir)
    1582 Only in /home/jschierm/Libs/scotch_5.1/src: Makefile.inc
    1583 Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old
    1584 Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old2.inc
    1585 Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old3.inc
    1586 Only in /home/jschierm/Libs/scotch_5.1/src: Makefile_old.inc
    1587 Only in /home/jschierm/Libs/scotch_5.1/src: make.out
    1588 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: acpl.mexa64
    1589 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_ccc.mexa64
    1590 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_fft2.mexa64
    1591 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_grf.mexa64
    1592 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_hy.mexa64
    1593 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_m2.mexa64
    1594 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: amk_p2.mexa64
    1595 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: atst.mexa64
    1596 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gbase.mexa64
    1597 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gcv.mexa64
    1598 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gmap_mex.c
    1599 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: gmap_mex_old.c
    1600 diff -rc src/src/scotch/Makefile /home/jschierm/Libs/scotch_5.1/src/scotch/Makefile
     1518Only in new/src: Makefile.inc
     1519Only in new/src/scotch: gmap_mex.c
     1520diff -rc src/src/scotch/Makefile new/src/scotch/Makefile
    16011521*** src/src/scotch/Makefile     2009-04-27 02:19:43.000000000 -0700
    1602 --- /home/jschierm/Libs/scotch_5.1/src/scotch/Makefile  2010-02-10 10:17:04.854221946 -0800
     1522--- new/src/scotch/Makefile     2010-02-19 15:47:58.973374370 -0800
    16031523***************
    16041524*** 49,59 ****
    … …  
    16361556 
    16371557+ mexscotch                     :       clean
    1638 +                                       $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I/usr/local/pkgs/matlab-7.6/extern/include" CC="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,/usr/local/pkgs/matlab-7.6/bin/glnxa64 -L/usr/local/pkgs/matlab-7.6/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch   \
     1558+                                       $(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" SCOTCHLIB=scotch  \
    16391559+                                       gmap_mex$(MEX)
    16401560+
    … …  
    16711591+                                       $(libdir)/libscotcherrexit$(LIB)        \
    16721592+                                       gmap.h
    1673 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: Makefile_old
    1674 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: Makefile_old2
    1675 Only in /home/jschierm/Libs/scotch_5.1/src/scotch: Makefile_old3
    1676 Only in /home/jschierm/Libs/scotch_5.1/src: scotch_jes_notes.txt
    1677 Only in /home/jschierm/Libs/scotch_5.1/src: scotch_README.txt
Note: See TracChangeset for help on using the changeset viewer.