Changeset 3639


Ignore:
Timestamp:
04/30/10 10:34:29 (15 years ago)
Author:
jschierm
Message:

Scotch: reset static variables from previous runs to allow multiple runs from Matlab without clearing workspace.

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

Legend:

Unmodified
Added
Removed

  • issm/trunk/externalpackages/scotch/gmapx.c

    r3617 r3639  
    151151  int                 i,j,k;
    152152
    153 /*  check static variables from previous runs  */
    154 
    155   if (C_paraNum > 0 || C_fileNum > 0) {
    156     printf("gmap_mex still in memory -- clear gmap_mex and try again.\n");
    157     return(1);
     153/*  reset static variables from previous runs (jes, 4/27/10)  */
     154
     155  C_partNbr = 2;        /* Default number of parts     */
     156  C_paraNum = 0;        /* Number of parameters        */
     157  C_paraNbr = 0;        /* No parameters for mapping   */
     158  C_fileNum = 0;        /* Number of file in arg list  */
     159  C_fileNbr = 4;        /* Number of files for mapping */
     160  for (i=0; i<C_FILENBR; i++) {
     161    C_fileTab[i].name = "-";
     162    C_fileTab[i].pntr = NULL;
     163    if (i < 2)
     164      C_fileTab[i].mode = "r";
     165    else
     166      C_fileTab[i].mode = "w";
    158167  }
    159168
    … …  
    338347  clockStart (&runtime[1]);
    339348
     349  printf("point 10a\n");
    340350  SCOTCH_graphMapInit    (&grafdat, &mapdat, &archdat, NULL);
     351  printf("point 10b\n");
    341352  SCOTCH_graphMapCompute (&grafdat, &mapdat, &stradat); /* Perform mapping */
    342353  printf("point 11\n");

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

    r3617 r3639  
    1 Only in new: bin
    2 Only in new: include
    3 Only in new: lib
    4 diff -rc src/src/libscotch/arch.c new/src/libscotch/arch.c
     1Only in new2: bin
     2Only in new2: include
     3Only in new2: lib
     4diff -rc src/src/libscotch/arch.c new2/src/libscotch/arch.c
    55*** src/src/libscotch/arch.c    2008-09-27 07:48:01.000000000 -0700
    6 --- new/src/libscotch/arch.c    2010-04-06 15:51:57.485253299 -0700
     6--- new2/src/libscotch/arch.c   2010-04-26 10:35:09.779996545 -0700
    77***************
    88*** 173,187 ****
    … …  
    6868        memset     (archptr, 0, sizeof (Arch));     /* Initialize architecture body */
    6969        return     (1);
    70 diff -rc src/src/libscotch/arch_cmplt.c new/src/libscotch/arch_cmplt.c
     70diff -rc src/src/libscotch/arch_cmplt.c new2/src/libscotch/arch_cmplt.c
    7171*** src/src/libscotch/arch_cmplt.c      2008-05-22 06:44:41.000000000 -0700
    72 --- new/src/libscotch/arch_cmplt.c      2010-04-06 15:51:57.492253308 -0700
     72--- new2/src/libscotch/arch_cmplt.c     2010-04-26 10:35:09.786996551 -0700
    7373***************
    7474*** 90,99 ****
    … …  
    120120      return     (1);
    121121    }
    122 diff -rc src/src/libscotch/arch_cmplt.h new/src/libscotch/arch_cmplt.h
     122diff -rc src/src/libscotch/arch_cmplt.h new2/src/libscotch/arch_cmplt.h
    123123*** src/src/libscotch/arch_cmplt.h      2008-05-22 06:44:41.000000000 -0700
    124 --- new/src/libscotch/arch_cmplt.h      2010-04-06 15:51:57.499253316 -0700
     124--- new2/src/libscotch/arch_cmplt.h     2010-04-26 10:35:09.794996558 -0700
    125125***************
    126126*** 87,93 ****
    … …  
    137137  #define archCmpltArchFree           NULL
    138138  ArchDomNum                  archCmpltDomNum     (const ArchCmplt * const, const ArchCmpltDom * const);
    139 diff -rc src/src/libscotch/arch_cmpltw.c new/src/libscotch/arch_cmpltw.c
     139diff -rc src/src/libscotch/arch_cmpltw.c new2/src/libscotch/arch_cmpltw.c
    140140*** src/src/libscotch/arch_cmpltw.c     2008-08-27 14:22:22.000000000 -0700
    141 --- new/src/libscotch/arch_cmpltw.c     2010-04-06 15:51:57.505253324 -0700
     141--- new2/src/libscotch/arch_cmpltw.c    2010-04-26 10:35:09.801996564 -0700
    142142***************
    143143*** 200,211 ****
    … …  
    209209        return     (1);
    210210      }
    211 diff -rc src/src/libscotch/arch_cmpltw.h new/src/libscotch/arch_cmpltw.h
     211diff -rc src/src/libscotch/arch_cmpltw.h new2/src/libscotch/arch_cmpltw.h
    212212*** src/src/libscotch/arch_cmpltw.h     2008-05-22 06:44:41.000000000 -0700
    213 --- new/src/libscotch/arch_cmpltw.h     2010-04-06 15:51:57.512253332 -0700
     213--- new2/src/libscotch/arch_cmpltw.h    2010-04-26 10:35:09.809996571 -0700
    214214***************
    215215*** 86,92 ****
    … …  
    226226  int                         archCmpltwArchFree  (ArchCmpltw * restrict const);
    227227  ArchDomNum                  archCmpltwDomNum    (const ArchCmpltw * const, const ArchCmpltwDom * const);
    228 diff -rc src/src/libscotch/arch_deco.c new/src/libscotch/arch_deco.c
     228diff -rc src/src/libscotch/arch_deco.c new2/src/libscotch/arch_deco.c
    229229*** src/src/libscotch/arch_deco.c       2008-09-28 06:35:27.000000000 -0700
    230 --- new/src/libscotch/arch_deco.c       2010-04-06 15:51:57.519253341 -0700
     230--- new2/src/libscotch/arch_deco.c      2010-04-26 10:35:09.816996577 -0700
    231231***************
    232232*** 211,217 ****
    … …  
    267267    if ((sizeof (ArchDeco)    > sizeof (ArchDummy)) ||
    268268        (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) {
    269 diff -rc src/src/libscotch/arch_deco.h new/src/libscotch/arch_deco.h
     269diff -rc src/src/libscotch/arch_deco.h new2/src/libscotch/arch_deco.h
    270270*** src/src/libscotch/arch_deco.h       2008-09-27 07:49:46.000000000 -0700
    271 --- new/src/libscotch/arch_deco.h       2010-04-06 15:51:57.527253350 -0700
     271--- new2/src/libscotch/arch_deco.h      2010-04-26 10:35:09.823996583 -0700
    272272***************
    273273*** 113,119 ****
    … …  
    284284  int                         archDecoArchFree    (ArchDeco * const);
    285285  Anum                        archDecoArchSize    (ArchDeco * const, const Anum);
    286 diff -rc src/src/libscotch/arch.h new/src/libscotch/arch.h
     286diff -rc src/src/libscotch/arch.h new2/src/libscotch/arch.h
    287287*** src/src/libscotch/arch.h    2009-04-28 08:11:27.000000000 -0700
    288 --- new/src/libscotch/arch.h    2010-04-06 15:51:57.533253358 -0700
     288--- new2/src/libscotch/arch.h   2010-04-26 10:35:09.831996590 -0700
    289289***************
    290290*** 175,181 ****
    … …  
    301301  char *                      archName            (const Arch * const);
    302302  const ArchClass *           archClass           (const char * const);
    303 diff -rc src/src/libscotch/arch_hcub.c new/src/libscotch/arch_hcub.c
     303diff -rc src/src/libscotch/arch_hcub.c new2/src/libscotch/arch_hcub.c
    304304*** src/src/libscotch/arch_hcub.c       2008-05-22 06:44:41.000000000 -0700
    305 --- new/src/libscotch/arch_hcub.c       2010-04-06 15:51:57.540253366 -0700
     305--- new2/src/libscotch/arch_hcub.c      2010-04-26 10:35:09.838996596 -0700
    306306***************
    307307*** 88,95 ****
    … …  
    349349      errorPrint ("archHcubArchLoad: bad input");
    350350      return     (1);
    351 diff -rc src/src/libscotch/arch_hcub.h new/src/libscotch/arch_hcub.h
     351diff -rc src/src/libscotch/arch_hcub.h new2/src/libscotch/arch_hcub.h
    352352*** src/src/libscotch/arch_hcub.h       2008-05-22 06:44:41.000000000 -0700
    353 --- new/src/libscotch/arch_hcub.h       2010-04-06 15:51:57.547253375 -0700
     353--- new2/src/libscotch/arch_hcub.h      2010-04-26 10:35:09.845996602 -0700
    354354***************
    355355*** 85,91 ****
    … …  
    366366  #define archHcubArchFree            NULL
    367367  ArchDomNum                  archHcubDomNum      (const ArchHcub * const, const ArchHcubDom * const);
    368 diff -rc src/src/libscotch/arch_mesh.c new/src/libscotch/arch_mesh.c
     368diff -rc src/src/libscotch/arch_mesh.c new2/src/libscotch/arch_mesh.c
    369369*** src/src/libscotch/arch_mesh.c       2008-05-22 06:44:41.000000000 -0700
    370 --- new/src/libscotch/arch_mesh.c       2010-04-06 15:51:57.555253385 -0700
     370--- new2/src/libscotch/arch_mesh.c      2010-04-26 10:35:09.853996609 -0700
    371371***************
    372372*** 96,103 ****
    … …  
    465465      return     (1);
    466466    }
    467 diff -rc src/src/libscotch/arch_mesh.h new/src/libscotch/arch_mesh.h
     467diff -rc src/src/libscotch/arch_mesh.h new2/src/libscotch/arch_mesh.h
    468468*** src/src/libscotch/arch_mesh.h       2008-05-22 06:44:41.000000000 -0700
    469 --- new/src/libscotch/arch_mesh.h       2010-04-06 15:51:57.561253392 -0700
     469--- new2/src/libscotch/arch_mesh.h      2010-04-26 10:35:09.860996615 -0700
    470470***************
    471471*** 96,102 ****
    … …  
    496496  #define archMesh3ArchFree           NULL
    497497  ArchDomNum                  archMesh3DomNum     (const ArchMesh3 * const, const ArchMesh3Dom * const);
    498 diff -rc src/src/libscotch/arch_tleaf.c new/src/libscotch/arch_tleaf.c
     498diff -rc src/src/libscotch/arch_tleaf.c new2/src/libscotch/arch_tleaf.c
    499499*** src/src/libscotch/arch_tleaf.c      2008-05-22 06:44:41.000000000 -0700
    500 --- new/src/libscotch/arch_tleaf.c      2010-04-06 15:51:57.569253402 -0700
     500--- new2/src/libscotch/arch_tleaf.c     2010-04-26 10:35:09.867996621 -0700
    501501***************
    502502*** 92,99 ****
    … …  
    554554      return     (1);
    555555    }
    556 diff -rc src/src/libscotch/arch_tleaf.h new/src/libscotch/arch_tleaf.h
     556diff -rc src/src/libscotch/arch_tleaf.h new2/src/libscotch/arch_tleaf.h
    557557*** src/src/libscotch/arch_tleaf.h      2008-05-22 06:44:41.000000000 -0700
    558 --- new/src/libscotch/arch_tleaf.h      2010-04-06 15:51:57.576253410 -0700
     558--- new2/src/libscotch/arch_tleaf.h     2010-04-26 10:35:09.875996627 -0700
    559559***************
    560560*** 89,95 ****
    … …  
    571571  #define archTleafArchFree           NULL
    572572  ArchDomNum                  archTleafDomNum     (const ArchTleaf * const, const ArchTleafDom * const);
    573 diff -rc src/src/libscotch/arch_torus.c new/src/libscotch/arch_torus.c
     573diff -rc src/src/libscotch/arch_torus.c new2/src/libscotch/arch_torus.c
    574574*** src/src/libscotch/arch_torus.c      2008-05-22 06:44:41.000000000 -0700
    575 --- new/src/libscotch/arch_torus.c      2010-04-06 15:51:57.583253419 -0700
     575--- new2/src/libscotch/arch_torus.c     2010-04-26 10:35:09.883996634 -0700
    576576***************
    577577*** 90,97 ****
    … …  
    670670      return     (1);
    671671    }
    672 diff -rc src/src/libscotch/arch_torus.h new/src/libscotch/arch_torus.h
     672diff -rc src/src/libscotch/arch_torus.h new2/src/libscotch/arch_torus.h
    673673*** src/src/libscotch/arch_torus.h      2008-05-22 06:44:41.000000000 -0700
    674 --- new/src/libscotch/arch_torus.h      2010-04-06 15:51:57.590253427 -0700
     674--- new2/src/libscotch/arch_torus.h     2010-04-26 10:35:09.890996640 -0700
    675675***************
    676676*** 96,102 ****
    … …  
    701701  #define archTorus3ArchFree          NULL
    702702  ArchDomNum                  archTorus3DomNum    (const ArchTorus3 * const, const ArchTorus3Dom * const);
    703 diff -rc src/src/libscotch/common.c new/src/libscotch/common.c
     703diff -rc src/src/libscotch/common.c new2/src/libscotch/common.c
    704704*** src/src/libscotch/common.c  2008-05-22 06:44:41.000000000 -0700
    705 --- new/src/libscotch/common.c  2010-04-06 15:51:57.597253436 -0700
     705--- new2/src/libscotch/common.c 2010-04-26 10:35:09.897996646 -0700
    706706***************
    707707*** 100,106 ****
    … …  
    720720+ #endif /* MATLAB */
    721721  }
    722 diff -rc src/src/libscotch/common.h new/src/libscotch/common.h
     722diff -rc src/src/libscotch/common.h new2/src/libscotch/common.h
    723723*** src/src/libscotch/common.h  2009-02-06 14:20:55.000000000 -0800
    724 --- new/src/libscotch/common.h  2010-04-06 15:51:57.604253444 -0700
     724--- new2/src/libscotch/common.h 2010-04-06 15:51:57.604253000 -0700
    725725***************
    726726*** 66,71 ****
    … …  
    756756  **  Working definitions.
    757757  */
    758 diff -rc src/src/libscotch/dummysizes.c new/src/libscotch/dummysizes.c
     758diff -rc src/src/libscotch/common_integer.c new2/src/libscotch/common_integer.c
     759*** src/src/libscotch/common_integer.c  2009-01-21 01:32:32.000000000 -0800
     760--- new2/src/libscotch/common_integer.c 2010-04-27 11:27:22.228561248 -0700
     761***************
     762*** 205,210 ****
     763--- 205,211 ----
     764  void
     765  intRandInit (void)
     766  {
     767+   printf("intRandInit begin -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed);
     768    if (intrandflag == 0) {                         /* If generator not yet initialized */
     769  #if ! ((defined COMMON_DEBUG) || (defined COMMON_RANDOM_FIXED_SEED) || (defined SCOTCH_DETERMINISTIC))
     770      intrandseed = time (NULL);                    /* Set random seed if needed */
     771***************
     772*** 216,221 ****
     773--- 217,223 ----
     774  #endif /* COMMON_RANDOM_RAND */
     775      intrandflag = 1;                              /* Generator has been initialized */
     776    }
     777+   printf("intRandInit end   -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed);
     778  }
     779 
     780  /* This routine reinitializes the pseudo-random
     781***************
     782*** 228,233 ****
     783--- 230,236 ----
     784  void
     785  intRandReset (void)
     786  {
     787+   printf("intRandReset begin -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed);
     788    if (intrandflag != 0) {                         /* Keep seed computed during first initialization */
     789  #ifdef COMMON_RANDOM_RAND
     790      srand (intrandseed);
     791***************
     792*** 237,242 ****
     793--- 240,246 ----
     794    }
     795    else
     796      intRandInit ();
     797+   printf("intRandReset end   -- intrandflag=%d,intrandseed=%d\n",intrandflag,intrandseed);
     798  }
     799 
     800  /*********************/
     801Only in new2/src/libscotch: common_integer_old.c
     802diff -rc src/src/libscotch/common_memory.c new2/src/libscotch/common_memory.c
     803*** src/src/libscotch/common_memory.c   2009-01-03 02:16:11.000000000 -0800
     804--- new2/src/libscotch/common_memory.c  2010-04-29 14:32:20.883655193 -0700
     805***************
     806*** 87,93 ****
     807--- 87,95 ----
     808    size_t              newadd;
     809    byte *              newptr;
     810 
     811+   printf("memAllocRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     812  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     813+   printf("memAllocRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     814    if (muteflag != 0) {                            /* Unsafe code with respect to race conditions but should work as first allocs are sequential */
     815      muteflag = 0;
     816      pthread_mutex_init (&mutelocdat, NULL);       /* Initialize local mutex */
     817***************
     818*** 109,116 ****
     819--- 111,120 ----
     820 
     821  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     822    pthread_mutex_unlock (&mutelocdat);             /* Unlock local mutex */
     823+   printf("memAllocRecord end   -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     824  #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */
     825 
     826+   printf("memAllocRecord end   -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     827    return ((void *) newptr);                       /* Return skewed pointer or NULL */
     828  }
     829 
     830***************
     831*** 124,133 ****
     832--- 128,139 ----
     833    size_t              oldsiz;
     834    size_t              newadd;
     835 
     836+   printf("memReallocRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     837    tmpptr = ((byte *) oldptr) - COMMON_MEMORY_SKEW;
     838    oldsiz = *((size_t *) tmpptr);
     839 
     840  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     841+   printf("memReallocRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     842    pthread_mutex_lock (&mutelocdat);               /* Lock local mutex */
     843  #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */
     844 
     845***************
     846*** 145,152 ****
     847--- 151,160 ----
     848 
     849  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     850    pthread_mutex_unlock (&mutelocdat);             /* Unlock local mutex */
     851+   printf("memReallocRecord end   -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     852  #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */
     853 
     854+   printf("memReallocRecord end   -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     855    return ((void *) newptr);                       /* Return skewed pointer or NULL */
     856  }
     857 
     858***************
     859*** 157,166 ****
     860--- 165,176 ----
     861    byte *              tmpptr;
     862    size_t              oldsiz;
     863 
     864+   printf("memFreeRecord begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     865    tmpptr = ((byte *) oldptr) - COMMON_MEMORY_SKEW;
     866    oldsiz = *((size_t *) tmpptr);
     867 
     868  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     869+   printf("memFreeRecord begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     870    pthread_mutex_lock (&mutelocdat);               /* Lock local mutex */
     871  #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */
     872 
     873***************
     874*** 169,175 ****
     875--- 179,187 ----
     876 
     877  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     878    pthread_mutex_unlock (&mutelocdat);             /* Unlock local mutex */
     879+   printf("memFreeRecord end   -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     880  #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */
     881+   printf("memFreeRecord end   -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     882  }
     883 
     884  size_t
     885***************
     886*** 177,183 ****
     887--- 189,197 ----
     888  {
     889    size_t              curmax;
     890 
     891+   printf("memMax begin -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     892  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     893+   printf("memMax begin -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     894    pthread_mutex_lock (&mutelocdat);               /* Lock local mutex */
     895  #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */
     896 
     897***************
     898*** 185,192 ****
     899--- 199,208 ----
     900 
     901  #if (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD))
     902    pthread_mutex_unlock (&mutelocdat);             /* Unlock local mutex */
     903+   printf("memMax end   -- muteflag=%d,mutelocdat=%p\n",muteflag,mutelocdat);
     904  #endif /* (defined (COMMON_PTHREAD) || defined (SCOTCH_PTHREAD)) */
     905 
     906+   printf("memMax end   -- memorysiz=%d,memorymax=%d\n",memorysiz,memorymax);
     907    return (curmax);
     908  }
     909  #endif /* COMMON_MEMORY_TRACE */
     910Only in new2/src/libscotch: common_memory_old.c
     911diff -rc src/src/libscotch/dummysizes.c new2/src/libscotch/dummysizes.c
    759912*** src/src/libscotch/dummysizes.c      2009-05-09 16:08:02.000000000 -0700
    760 --- new/src/libscotch/dummysizes.c      2010-04-06 15:51:57.611253453 -0700
     913--- new2/src/libscotch/dummysizes.c     2010-04-26 10:35:09.912996659 -0700
    761914***************
    762915*** 267,271 ****
    … …  
    769922+ #endif /* MATLAB */
    770923  }
    771 diff -rc src/src/libscotch/graph.c new/src/libscotch/graph.c
     924diff -rc src/src/libscotch/graph.c new2/src/libscotch/graph.c
    772925*** src/src/libscotch/graph.c   2008-05-22 06:44:42.000000000 -0700
    773 --- new/src/libscotch/graph.c   2010-04-06 15:51:57.618253461 -0700
     926--- new2/src/libscotch/graph.c  2010-04-26 10:35:09.920996666 -0700
    774927***************
    775928*** 135,141 ****
    … …  
    792945      if ((grafptr->edlotax != NULL) &&
    793946          ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
    794 diff -rc src/src/libscotch/graph.h new/src/libscotch/graph.h
     947diff -rc src/src/libscotch/graph.h new2/src/libscotch/graph.h
    795948*** src/src/libscotch/graph.h   2008-06-01 02:49:11.000000000 -0700
    796 --- new/src/libscotch/graph.h   2010-04-06 15:51:57.624253469 -0700
     949--- new2/src/libscotch/graph.h  2010-04-26 10:35:09.927996672 -0700
    797950***************
    798951*** 159,165 ****
    … …  
    809962  int                         graphSave           (const Graph * const, FILE * const);
    810963  Gnum                        graphBase           (Graph * const, const Gnum);
    811 diff -rc src/src/libscotch/graph_io.c new/src/libscotch/graph_io.c
     964diff -rc src/src/libscotch/graph_io.c new2/src/libscotch/graph_io.c
    812965*** src/src/libscotch/graph_io.c        2008-05-22 06:44:42.000000000 -0700
    813 --- new/src/libscotch/graph_io.c        2010-04-06 15:51:57.632253478 -0700
     966--- new2/src/libscotch/graph_io.c       2010-04-26 10:35:09.936996680 -0700
    814967***************
    815968*** 86,92 ****
    … …  
    10471200    }
    10481201 
    1049 diff -rc src/src/libscotch/graph_io_scot.c new/src/libscotch/graph_io_scot.c
     1202diff -rc src/src/libscotch/graph_io_scot.c new2/src/libscotch/graph_io_scot.c
    10501203*** src/src/libscotch/graph_io_scot.c   2008-05-22 06:44:42.000000000 -0700
    1051 --- new/src/libscotch/graph_io_scot.c   2010-04-06 15:51:57.638253486 -0700
     1204--- new2/src/libscotch/graph_io_scot.c  2010-04-26 10:35:09.944996687 -0700
    10521205***************
    10531206*** 89,95 ****
    … …  
    10641217    }
    10651218 
    1066 diff -rc src/src/libscotch/library_arch.c new/src/libscotch/library_arch.c
     1219diff -rc src/src/libscotch/library_arch.c new2/src/libscotch/library_arch.c
    10671220*** src/src/libscotch/library_arch.c    2008-05-22 06:44:42.000000000 -0700
    1068 --- new/src/libscotch/library_arch.c    2010-04-06 15:51:57.644253493 -0700
     1221--- new2/src/libscotch/library_arch.c   2010-04-26 10:35:09.952996693 -0700
    10691222***************
    10701223*** 120,128 ****
    … …  
    10991252 
    11001253  /*+ This routine saves the given opaque
    1101 diff -rc src/src/libscotch/library_arch_f.c new/src/libscotch/library_arch_f.c
     1254diff -rc src/src/libscotch/library_arch_f.c new2/src/libscotch/library_arch_f.c
    11021255*** src/src/libscotch/library_arch_f.c  2008-05-22 06:44:42.000000000 -0700
    1103 --- new/src/libscotch/library_arch_f.c  2010-04-06 15:51:57.651253502 -0700
     1256--- new2/src/libscotch/library_arch_f.c 2010-04-26 10:35:09.959996699 -0700
    11041257***************
    11051258*** 121,127 ****
    … …  
    11161269    fclose (stream);                                /* This closes filenum too */
    11171270 
    1118 diff -rc src/src/libscotch/library_error_exit.c new/src/libscotch/library_error_exit.c
     1271diff -rc src/src/libscotch/library_error_exit.c new2/src/libscotch/library_error_exit.c
    11191272*** src/src/libscotch/library_error_exit.c      2009-01-20 00:36:33.000000000 -0800
    1120 --- new/src/libscotch/library_error_exit.c      2010-04-06 15:51:57.657253509 -0700
     1273--- new2/src/libscotch/library_error_exit.c     2010-04-26 10:35:09.966996705 -0700
    11211274***************
    11221275*** 114,119 ****
    … …  
    11911344+ #endif /* MATLAB */
    11921345  }
    1193 diff -rc src/src/libscotch/library_graph.c new/src/libscotch/library_graph.c
     1346diff -rc src/src/libscotch/library_graph.c new2/src/libscotch/library_graph.c
    11941347*** src/src/libscotch/library_graph.c   2008-05-22 07:28:12.000000000 -0700
    1195 --- new/src/libscotch/library_graph.c   2010-04-06 15:51:57.664253518 -0700
     1348--- new2/src/libscotch/library_graph.c  2010-04-26 10:35:09.973996711 -0700
    11961349***************
    11971350*** 137,143 ****
    … …  
    12361389 
    12371390  /*+ This routine saves the contents of the given
    1238 diff -rc src/src/libscotch/library_graph_f.c new/src/libscotch/library_graph_f.c
     1391diff -rc src/src/libscotch/library_graph_f.c new2/src/libscotch/library_graph_f.c
    12391392*** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700
    1240 --- new/src/libscotch/library_graph_f.c 2010-04-06 15:51:57.671253526 -0700
     1393--- new2/src/libscotch/library_graph_f.c        2010-04-26 10:35:09.981996718 -0700
    12411394***************
    12421395*** 136,142 ****
    … …  
    12531406    fclose (stream);                                /* This closes filenum too */
    12541407 
    1255 diff -rc src/src/libscotch/library_graph_map.c new/src/libscotch/library_graph_map.c
     1408diff -rc src/src/libscotch/library_graph_map.c new2/src/libscotch/library_graph_map.c
    12561409*** src/src/libscotch/library_graph_map.c       2008-09-28 04:04:05.000000000 -0700
    1257 --- new/src/libscotch/library_graph_map.c       2010-04-06 15:51:57.678253535 -0700
     1410--- new2/src/libscotch/library_graph_map.c      2010-04-06 15:51:57.678253000 -0700
    12581411***************
    12591412*** 182,192 ****
    … …  
    12781431 
    12791432  /*+ This routine computes a mapping
    1280 diff -rc src/src/libscotch/library_graph_map_f.c new/src/libscotch/library_graph_map_f.c
     1433diff -rc src/src/libscotch/library_graph_map_f.c new2/src/libscotch/library_graph_map_f.c
    12811434*** src/src/libscotch/library_graph_map_f.c     2008-06-28 03:44:26.000000000 -0700
    1282 --- new/src/libscotch/library_graph_map_f.c     2010-04-06 15:51:57.684253542 -0700
     1435--- new2/src/libscotch/library_graph_map_f.c    2010-04-26 10:35:09.995996730 -0700
    12831436***************
    12841437*** 183,189 ****
    … …  
    12951448    fclose (stream);                                /* This closes filenum too */
    12961449 
    1297 diff -rc src/src/libscotch/library.h new/src/libscotch/library.h
     1450Only in new2/src/libscotch: library_graph_map_save.c
     1451diff -rc src/src/libscotch/library.h new2/src/libscotch/library.h
    12981452*** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700
    1299 --- new/src/libscotch/library.h 2010-04-06 15:51:57.691253550 -0700
     1453--- new2/src/libscotch/library.h        2010-04-26 10:35:10.002996736 -0700
    13001454***************
    13011455*** 134,140 ****
    … …  
    13401494  int                         SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const);
    13411495  int                         SCOTCH_graphMap     (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const);
    1342 diff -rc src/src/libscotch/Makefile new/src/libscotch/Makefile
     1496diff -rc src/src/libscotch/Makefile new2/src/libscotch/Makefile
    13431497*** src/src/libscotch/Makefile  2009-05-09 16:08:04.000000000 -0700
    1344 --- new/src/libscotch/Makefile  2010-04-06 15:51:57.700253561 -0700
     1498--- new2/src/libscotch/Makefile 2010-04-26 10:35:10.011996000 -0700
    13451499***************
    13461500*** 49,55 ****
    … …  
    13791533                                        -$(CP) scotch.h scotchf.h $(includedir)
    13801534                                        -$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir)
    1381 diff -rc src/src/libscotch/mapping.h new/src/libscotch/mapping.h
     1535Only in new2/src/libscotch: Makefile_save
     1536diff -rc src/src/libscotch/mapping.h new2/src/libscotch/mapping.h
    13821537*** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700
    1383 --- new/src/libscotch/mapping.h 2010-04-06 15:51:57.708253571 -0700
     1538--- new2/src/libscotch/mapping.h        2010-04-26 10:35:10.019996751 -0700
    13841539***************
    13851540*** 106,112 ****
    … …  
    13961551 
    13971552  #undef static
    1398 diff -rc src/src/libscotch/mapping_io.c new/src/libscotch/mapping_io.c
     1553diff -rc src/src/libscotch/mapping_io.c new2/src/libscotch/mapping_io.c
    13991554*** src/src/libscotch/mapping_io.c      2008-05-22 06:44:43.000000000 -0700
    1400 --- new/src/libscotch/mapping_io.c      2010-04-06 15:51:57.714253579 -0700
     1555--- new2/src/libscotch/mapping_io.c     2010-04-26 10:35:10.026996757 -0700
    14011556***************
    14021557*** 199,204 ****
    … …  
    14851640    return (0);
    14861641  }
    1487 diff -rc src/src/libscotch/mesh_io_scot.c new/src/libscotch/mesh_io_scot.c
     1642diff -rc src/src/libscotch/mesh_io_scot.c new2/src/libscotch/mesh_io_scot.c
    14881643*** src/src/libscotch/mesh_io_scot.c    2008-05-22 06:44:43.000000000 -0700
    1489 --- new/src/libscotch/mesh_io_scot.c    2010-04-06 15:51:57.721253587 -0700
     1644--- new2/src/libscotch/mesh_io_scot.c   2010-04-26 10:35:10.033996763 -0700
    14901645***************
    14911646*** 85,91 ****
    … …  
    15021657    }
    15031658 
    1504 diff -rc src/src/Makefile new/src/Makefile
     1659diff -rc src/src/libscotch/parser_ll.l new2/src/libscotch/parser_ll.l
     1660*** src/src/libscotch/parser_ll.l       2008-05-22 06:44:43.000000000 -0700
     1661--- new2/src/libscotch/parser_ll.l      2010-04-29 14:45:27.766400063 -0700
     1662***************
     1663*** 192,197 ****
     1664--- 192,214 ----
     1665  stratParserInit (
     1666  const char * const          string)               /*+ Strategy string to parse +*/
     1667  {
     1668+ /*  reset static variables from previous runs (jes, 4/29/10)  */
     1669+   yy_current_buffer = 0;
     1670+   yy_hold_char = (char) 0;
     1671+   yy_n_chars=0;          /* number of characters read into yy_ch_buf */
     1672+   yy_c_buf_p = (char *) 0;
     1673+   yy_init = 1;         /* whether we need to initialize */
     1674+   yy_start = 0;        /* start state number */
     1675+   yy_did_buffer_switch_on_eof=0;
     1676+   yy_last_accepting_state=0;
     1677+   yy_last_accepting_cpos = (char *) 0;
     1678+   stratparserstringptr = (char *) 0; /* Pointer to the string to parse */
     1679+ #if YY_STACK_USED
     1680+   yy_start_stack_ptr = 0;
     1681+   yy_start_stack_depth = 0;
     1682+   yy_start_stack = 0;
     1683+ #endif
     1684+
     1685  #ifdef FLEX_SCANNER
     1686    yyrestart (yyin);                               /* (Re-)initialize the parser */
     1687  #endif /* FLEX_SCANNER */
     1688Only in new2/src/libscotch: parser_ll_save.c
     1689Only in new2/src/libscotch: parser_yy_save.c
     1690diff -rc src/src/libscotch/parser_yy.y new2/src/libscotch/parser_yy.y
     1691*** src/src/libscotch/parser_yy.y       2008-10-22 15:12:48.000000000 -0700
     1692--- new2/src/libscotch/parser_yy.y      2010-04-29 11:48:09.378829347 -0700
     1693***************
     1694*** 774,779 ****
     1695--- 774,780 ----
     1696    stratParserInit (string);                       /* Initialize the lexical parser           */
     1697    parserstrattab  = strattab;                     /* Point to the parsing tables             */
     1698    parserstratcurr = NULL;                         /* Clear up the temporary strategy pointer */
     1699+   parserparamcurr = NULL;                         /* reset the last static (jes, 4/29/10)    */
     1700 
     1701    if (stratParserParse2 () != 0) {                /* Parse the strategy string */
     1702      if (parserstratcurr != NULL)
     1703diff -rc src/src/libscotch/vgraph_separate_vw.c new2/src/libscotch/vgraph_separate_vw.c
     1704*** src/src/libscotch/vgraph_separate_vw.c      2008-05-22 06:44:43.000000000 -0700
     1705--- new2/src/libscotch/vgraph_separate_vw.c     2010-04-27 11:34:15.756132566 -0700
     1706***************
     1707*** 83,88 ****
     1708--- 83,89 ----
     1709    FILE * restrict     fileptr;
     1710    Gnum                vertnum;                    /* Vertex number */
     1711 
     1712+   printf("vgraphSeparateVw begin -- vgraphseparatevwfilenum=%d\n",vgraphseparatevwfilenum);
     1713    sprintf (nametab, "vgraphseparatevw_output_%08d.map", vgraphseparatevwfilenum ++);
     1714    if ((fileptr = fopen (nametab, "w+")) == NULL) {
     1715      errorPrint ("vgraphSeparateVw: cannot open partition file");
     1716***************
     1717*** 102,106 ****
     1718--- 103,108 ----
     1719      }
     1720    }
     1721 
     1722+   printf("vgraphSeparateVw end   -- vgraphseparatevwfilenum=%d\n",vgraphseparatevwfilenum);
     1723    return (0);
     1724  }
     1725Only in new2/src/libscotch: .vgraph_separate_vw.c.swp
     1726Only in new2/src/libscotch: vgraph_separate_vw_old.c
     1727diff -rc src/src/Makefile new2/src/Makefile
    15051728*** src/src/Makefile    2008-09-15 05:50:51.000000000 -0700
    1506 --- new/src/Makefile    2010-04-06 15:51:57.728253596 -0700
     1729--- new2/src/Makefile   2010-04-26 10:35:10.040996769 -0700
    15071730***************
    15081731*** 97,102 ****
    … …  
    15181741                                        -$(CP) -f ../bin/[agm]*$(EXE) $(bindir)
    15191742                                        -$(CP) -f ../include/*scotch*.h $(includedir)
    1520 Only in new/src: Makefile.inc
    1521 Only in new/src/scotch: gmap_mex.c
    1522 Only in new/src/scotch: gmap_mex_save.c
    1523 Only in new/src/scotch: gmapx.c
    1524 diff -rc src/src/scotch/Makefile new/src/scotch/Makefile
     1743Only in new2/src: Makefile.inc
     1744Only in new2/src/scotch: gmap_mex.c
     1745Only in new2/src/scotch: gmapx.c
     1746diff -rc src/src/scotch/Makefile new2/src/scotch/Makefile
    15251747*** src/src/scotch/Makefile     2009-04-27 02:19:43.000000000 -0700
    1526 --- new/src/scotch/Makefile     2010-04-22 15:56:37.518839458 -0700
     1748--- new2/src/scotch/Makefile    2010-04-26 10:35:10.048996776 -0700
    15271749***************
    15281750*** 49,59 ****
    … …  
    16051827+                                       $(libdir)/libscotcherrexit$(LIB)        \
    16061828+                                       gmap.h
    1607 Only in new/src/scotch: Makefile_save

  • issm/trunk/externalpackages/scotch/scotch_jes_notes.txt

    r3617 r3639  
    293293- separated gmap_mex.c driver into gmap_mex.c matlab-layer (independent of scotch) and gmapx.c x-layer (independent of matlab).
    294294
     2954/29/10:
     296
     297- made changes to gmapx.c, parser_yy.y/stratParserParse, and
     298  parser_ll.l/stratParserInit to reset static variables from previous runs.
     299also inserted print statements into common_integer.c/intRand*,
     300common_memory.c/mem*, and vgraph_separate_vw.c/vgraphSeparateVw to monitor
     301static variables in case those have to be reset.
     302
Note: See TracChangeset for help on using the changeset viewer.