Changeset 157


Ignore:
Timestamp:
Sep 2, 2010 8:14:24 AM (9 years ago)
Author:
kulshres
Message:

merge stable version with revision 156

Location:
stable/2.1
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • stable/2.1/ADOL-C/doc/version.tex

    r130 r157  
    11\newcommand{\packagename}{adolc}
    2 \newcommand{\packageversion}{2.1.8-stable}
     2\newcommand{\packageversion}{2.1.9-stable}
    33\newcommand{\packagetar}{\packagename-\packageversion}
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/sparse_hessian.cpp

    r42 r157  
    196196    printf("\n");
    197197
     198    for(i=0;i<n;i++)
     199       free(HP[i]);
     200    free(HP);
     201
     202    myfree2(H);
     203    myfree2(Hcomp);
     204
     205    for (i = 0; i < n; i++)
     206        delete[] Seed[i];
     207    delete[] Seed;
     208
    198209}
    199210
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/sparse_jacobian.cpp

    r42 r157  
    222222    printf("\n");
    223223
     224    for (i=0;i<m;i++)
     225        free(JP[i]);
     226    free(JP);
     227    myfree2(J);
     228
     229    for (i = 0; i < n; i++)
     230        delete[] Seed[i];
     231    delete[] Seed;
     232
     233    myfree2(Jcomp);
    224234}
    225235
  • stable/2.1/ADOL-C/src/common.h

    r116 r157  
    9898#endif
    9999
    100 #define MAXDEC(a,b) if ((a) < (b)) (a) = (b)
    101 #define MINDEC(a,b) if ((a) > (b)) (a) = (b)
     100#define MAXDEC(a,b) do { register revreal __r = (b); if ( __r > (a) ) (a) = __r; } while (0)
     101#define MAXDECI(a,b) do { register int __r = (b); if ( __r > (a) ) (a) = __r; } while (0)
     102#define MINDECR(a,b) do { register revreal __r = (b); if ( __r < (a) ) (a) = __r; } while (0)
     103#define MINDEC(a,b) do { register int __r = (b); if ( __r < (a) ) (a) = __r; } while (0)
    102104
    103105#define MAX_ADOLC(a,b) ( (a)<(b)? (b):(a) )
  • stable/2.1/ADOL-C/src/config.h.in

    r130 r157  
    127127#undef PACKAGE_VERSION
    128128
     129/* The size of `void *', as computed by sizeof. */
     130#undef SIZEOF_VOID_P
     131
    129132/* Define to 1 if you have the ANSI C header files. */
    130133#undef STDC_HEADERS
  • stable/2.1/ADOL-C/src/sparse/Makefile.am

    r116 r157  
    1111##############################################################################
    1212
    13 AM_CFLAGS                = @ac_adolc_cflags@ -DADOLC_INTERNAL=1
    14 AM_CXXFLAGS              = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
     13AM_CFLAGS                = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
     14AM_CXXFLAGS              = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    1515AM_LDFLAGS               = -no-undefined @COLPACK_LIBS@
    1616AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
  • stable/2.1/ADOL-C/src/sparse/Makefile.in

    r130 r157  
    233233top_builddir = @top_builddir@
    234234top_srcdir = @top_srcdir@
    235 AM_CFLAGS = @ac_adolc_cflags@ -DADOLC_INTERNAL=1
    236 AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
     235AM_CFLAGS = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
     236AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    237237AM_LDFLAGS = -no-undefined @COLPACK_LIBS@
    238238AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
  • stable/2.1/ADOL-C/src/sparse/sparsedrivers.cpp

    r122 r157  
    115115#if HAVE_LIBCOLPACK
    116116{
    117   int dummy;
    118 
    119   BipartiteGraphPartialColoringInterface *g = new BipartiteGraphPartialColoringInterface(SRC_MEM_ADOLC,JP,m,n);
    120 
    121   if (option == 1)
    122     g->GenerateSeedJacobian(JP, m, n, Seed, p, &dummy,
     117  int dummy, i, j;
     118
     119  BipartiteGraphPartialColoringInterface *g = new BipartiteGraphPartialColoringInterface(SRC_MEM_ADOLC, JP, m, n);
     120
     121  if (option == 1) 
     122    g->GenerateSeedJacobian_unmanaged(Seed, p, &dummy,
    123123                                "SMALLEST_LAST","ROW_PARTIAL_DISTANCE_TWO");
    124   else
    125     g->GenerateSeedJacobian(JP, m, n, Seed, &dummy, p,
     124  else 
     125    g->GenerateSeedJacobian_unmanaged(Seed, &dummy, p,
    126126                                "SMALLEST_LAST","COLUMN_PARTIAL_DISTANCE_TWO");
     127  delete g;
     128
    127129}
    128130#else
     
    189191#if HAVE_LIBCOLPACK
    190192{
    191   int dummy;
    192 
    193   GraphColoringInterface *g = new GraphColoringInterface(SRC_WAIT);
     193  int seed_rows, i, j;
     194
     195  GraphColoringInterface *g = new GraphColoringInterface(SRC_MEM_ADOLC, HP, n);
    194196
    195197  if (option == 0)
    196     g->GenerateSeedHessian(HP, n, Seed, &dummy, p,
     198    g->GenerateSeedHessian_unmanaged(Seed, &seed_rows, p,
    197199                           "SMALLEST_LAST","ACYCLIC_FOR_INDIRECT_RECOVERY");
    198200  else
    199     g->GenerateSeedHessian(HP, n, Seed, &dummy, p,
     201    g->GenerateSeedHessian_unmanaged(Seed, &seed_rows, p,
    200202                           "SMALLEST_LAST","STAR");
    201 
     203  delete g;
    202204}
    203205#else
     
    272274      }
    273275     
     276      sJinfos.depen = depen;
    274277      sJinfos.nnz_in = depen;
    275278      sJinfos.nnz_in = 0;
     
    294297        }
    295298                       
    296       g = new BipartiteGraphPartialColoringInterface(SRC_WAIT);
     299      /* sJinfos.Seed is memory managed by ColPack and will be deleted
     300       * along with g. We only keep it in sJinfos for the repeat != 0 case */
     301
     302      g = new BipartiteGraphPartialColoringInterface(SRC_MEM_ADOLC, sJinfos.JP, depen, indep);
    297303      jr1d = new JacobianRecovery1D;
    298304       
    299305      if (options[3] == 1)
    300306        {
    301           g->GenerateSeedJacobian(sJinfos.JP, depen, indep, &(sJinfos.Seed), &(sJinfos.seed_rows),
     307          g->GenerateSeedJacobian(&(sJinfos.Seed), &(sJinfos.seed_rows),
    302308                                  &(sJinfos.seed_clms), "SMALLEST_LAST","ROW_PARTIAL_DISTANCE_TWO");
    303309          sJinfos.seed_clms = indep;
     
    305311      else
    306312        {
    307           g->GenerateSeedJacobian(sJinfos.JP, depen, indep, &(sJinfos.Seed), &(sJinfos.seed_rows),
     313          g->GenerateSeedJacobian(&(sJinfos.Seed), &(sJinfos.seed_rows),
    308314                                &(sJinfos.seed_clms), "SMALLEST_LAST","COLUMN_PARTIAL_DISTANCE_TWO");
    309315          sJinfos.seed_rows = depen;
     
    455461        Seed = NULL;
    456462
    457         g = new GraphColoringInterface(SRC_WAIT);
     463        g = new GraphColoringInterface(SRC_MEM_ADOLC, sHinfos.HP, indep);
    458464        hr = new HessianRecovery;
    459465
    460466        if (options[1] == 0)
    461           g->GenerateSeedHessian(sHinfos.HP, indep, &Seed, &dummy, &sHinfos.p,
     467          g->GenerateSeedHessian(&Seed, &dummy, &sHinfos.p,
    462468                                 "SMALLEST_LAST","ACYCLIC_FOR_INDIRECT_RECOVERY");
    463469        else
    464           g->GenerateSeedHessian(sHinfos.HP, indep, &Seed, &dummy, &sHinfos.p,
     470          g->GenerateSeedHessian(&Seed, &dummy, &sHinfos.p,
    465471                                 "SMALLEST_LAST","STAR");
    466472
     
    473479            sHinfos.Xppp[i][l][0] = Seed[i][l];
    474480
    475         for (i=0; i<indep; i++)
    476           delete[] Seed[i];
    477 
    478         delete[] Seed;
     481        /* Seed will be freed by ColPack when g is freed */
    479482        Seed = NULL;
    480483
     
    953956
    954957/* ------------------------------------------------------------------------- */
    955 void freeSparseJacInfos(double *y, double **Seed, double **B, unsigned int **JP,
    956                                          void *g, void *jr1d, int seed_rows, int seed_clms, int depen)
     958void freeSparseJacInfos(double *y, double **B, unsigned int **JP, void *g,
     959                        void *jr1d, int seed_rows, int seed_clms, int depen)
    957960{
    958961    int i;
    959 
    960962    if(y)
    961963      myfree1(y);
    962 
    963     if (Seed)
    964     {
    965         for (i = 0; i < seed_rows; i++)
    966             delete[] Seed[i];
    967         delete[] Seed;
    968     }
    969964
    970965    if(B)
     
    978973
    979974#ifdef HAVE_LIBCOLPACK
    980     // yields segmentation fault, check again !!
    981     // if (g)
    982     //   delete (BipartiteGraphPartialColoringInterface *) g;
     975     if (g)
     976       delete (BipartiteGraphPartialColoringInterface *) g;
    983977
    984978    if (jr1d)
     
    10091003   if(Upp)
    10101004      myfree2(Upp);
    1011 
    10121005    for (int i=0;i<indep;i++) {
    10131006      free(HP[i]);
     
    10171010
    10181011#ifdef HAVE_LIBCOLPACK
    1019     // yields segmentation fault, check again !!
    1020     // // if (g)
    1021     // //   delete (BipartiteGraphPartialColoringInterface *) g;
     1012     if (g)
     1013       delete (GraphColoringInterface *) g;
    10221014
    10231015    if (hr)
  • stable/2.1/ADOL-C/src/sparse/sparsedrivers.h

    r116 r157  
    9898
    9999/****************************************************************************/
    100 /*          Cast the void pointers to their respective type and free memory */
    101 ADOLC_DLL_EXPORT void freeSparseJacInfos(double *y, double **Seed, double **B, unsigned int **JP,
    102                                          void *g, void *jr1d, int seed_rows, int seed_clms, int depen);
    103 
    104 ADOLC_DLL_EXPORT void freeSparseHessInfos(double **Hcomp, double ***Xppp, double ***Yppp, double ***Zppp,
    105                                           double **Upp, unsigned int **HP,
    106                                           void *g, void *hr, int p, int indep);
    107 
    108100END_C_DECLS
    109101
    110 /****************************************************************************/
    111 
    112102#endif
  • stable/2.1/ADOL-C/src/tape_handling.cpp

    r122 r157  
    2929#ifdef SPARSE
    3030BEGIN_C_DECLS
    31 ADOLC_DLL_EXPORT void freeSparseJacInfos(double *y, double **Seed, double **B, unsigned int **JP,
    32                                          void *g, void *jr1d, int seed_rows, int seed_clms, int depen);
    33 ADOLC_DLL_EXPORT void freeSparseHessInfos(double **Hcomp, double ***Xppp, double ***Yppp, double ***Zppp,
    34                                           double **Upp, unsigned int **HP,
    35                                           void *g, void *hr, int p, int indep);
     31extern void freeSparseJacInfos(double *y, double **B, unsigned int **JP, void *g,
     32                              void *jr1d, int seed_rows, int seed_clms, int depen);
     33extern void freeSparseHessInfos(double **Hcomp, double ***Xppp, double ***Yppp, double ***Zppp,
     34                                double **Upp, unsigned int **HP,
     35                                void *g, void *hr, int p, int indep);
    3636END_C_DECLS
    3737#endif
     
    157157    newTapeInfos->traceFlag=1;
    158158    newTapeInfos->inUse=1;
     159#ifdef SPARSE
    159160    newTapeInfos->pTapeInfos.inJacSparseUse=0;
    160161    newTapeInfos->pTapeInfos.inHessSparseUse=0;
     
    164165    newTapeInfos->pTapeInfos.sJinfos.jr1d=NULL;
    165166    newTapeInfos->pTapeInfos.sJinfos.Seed=NULL;
     167    newTapeInfos->pTapeInfos.sJinfos.JP=NULL;
     168    newTapeInfos->pTapeInfos.sJinfos.depen=0;
     169    newTapeInfos->pTapeInfos.sJinfos.nnz_in=0;
     170    newTapeInfos->pTapeInfos.sJinfos.seed_rows=0;
     171    newTapeInfos->pTapeInfos.sJinfos.seed_clms=0;
    166172    newTapeInfos->pTapeInfos.sHinfos.Zppp=NULL;
    167173    newTapeInfos->pTapeInfos.sHinfos.Yppp=NULL;
     
    169175    newTapeInfos->pTapeInfos.sHinfos.Upp=NULL;
    170176    newTapeInfos->pTapeInfos.sHinfos.Hcomp=NULL;
     177    newTapeInfos->pTapeInfos.sHinfos.HP=NULL;
     178    newTapeInfos->pTapeInfos.sHinfos.g=NULL;
     179    newTapeInfos->pTapeInfos.sHinfos.hr=NULL;
     180    newTapeInfos->pTapeInfos.sHinfos.nnz_in=0;
     181    newTapeInfos->pTapeInfos.sHinfos.indep=0;
     182    newTapeInfos->pTapeInfos.sHinfos.p=0;
     183#endif
     184
    171185    newTapeInfos->stats[OP_BUFFER_SIZE] =
    172186        ADOLC_GLOBAL_TAPE_VARS.operationBufferSize;
     
    321335    tapeInfos->traceFlag=1;
    322336    tapeInfos->inUse=0;
     337#ifdef SPARSE
    323338    tapeInfos->pTapeInfos.inJacSparseUse=0;
    324339    tapeInfos->pTapeInfos.inHessSparseUse=0;
     340#endif
    325341    tapeInfos->tapingComplete = 1;
    326342    read_tape_stats(tapeInfos);
     
    328344}
    329345
     346#ifdef SPARSE
    330347/* updates the tape infos on sparse Jac for the given ID  */
    331348void setTapeInfoJacSparse(short tapeID, SparseJacInfos sJinfos) {
     
    343360            if ((*tiIter)->tapeID==tapeID) {
    344361                tapeInfos=*tiIter;
    345 #ifdef SPARSE
    346362                // free memory of tape entry that had been used previously
    347363                freeSparseJacInfos(tapeInfos->pTapeInfos.sJinfos.y,
    348                         tapeInfos->pTapeInfos.sJinfos.Seed,
    349364                        tapeInfos->pTapeInfos.sJinfos.B,
    350365                        tapeInfos->pTapeInfos.sJinfos.JP,
     
    354369                        tapeInfos->pTapeInfos.sJinfos.seed_clms,
    355370                        tapeInfos->pTapeInfos.sJinfos.depen);
    356 #endif
    357 
    358371                tapeInfos->pTapeInfos.sJinfos.y=sJinfos.y;
    359372                tapeInfos->pTapeInfos.sJinfos.Seed=sJinfos.Seed;
     
    370383    }
    371384}
    372 
     385#endif
     386
     387#ifdef SPARSE
    373388/* updates the tape infos on sparse Hess for the given ID  */
    374389void setTapeInfoHessSparse(short tapeID, SparseHessInfos sHinfos) {
     
    386401            if ((*tiIter)->tapeID==tapeID) {
    387402                tapeInfos=*tiIter;
    388 #ifdef SPARSE
    389403                // free memory of tape entry that had been used previously
    390404                    freeSparseHessInfos(tapeInfos->pTapeInfos.sHinfos.Hcomp,
     
    398412                                        tapeInfos->pTapeInfos.sHinfos.p,
    399413                                        tapeInfos->pTapeInfos.sHinfos.indep);   
    400 #endif
    401414                    tapeInfos->pTapeInfos.sHinfos.Hcomp=sHinfos.Hcomp;
    402415                    tapeInfos->pTapeInfos.sHinfos.Xppp=sHinfos.Xppp;
     
    414427    }
    415428}
     429#endif
    416430
    417431void init() {
     
    512526            }
    513527
    514 
    515             if ((*tiIter)->pTapeInfos.sJinfos.B != NULL)
    516             {
    517                 free((char*)  *(*tiIter)->pTapeInfos.sJinfos.B);
    518                 free((char*)   (*tiIter)->pTapeInfos.sJinfos.B);
    519                 (*tiIter)->pTapeInfos.sJinfos.B = NULL;
    520             }
    521             if ((*tiIter)->pTapeInfos.sJinfos.y != NULL)
    522             {
    523                 free((*tiIter)->pTapeInfos.sJinfos.y);
    524                 (*tiIter)->pTapeInfos.sJinfos.y = NULL;
    525             }
    526 
    527             if ((*tiIter)->pTapeInfos.sHinfos.Zppp != NULL)
    528             {
    529                 free((char*) **(*tiIter)->pTapeInfos.sHinfos.Zppp);
    530                 free((char*)  *(*tiIter)->pTapeInfos.sHinfos.Zppp);
    531                 free((char*)   (*tiIter)->pTapeInfos.sHinfos.Zppp);
    532                 (*tiIter)->pTapeInfos.sHinfos.Zppp = NULL;
    533             }
    534             if ((*tiIter)->pTapeInfos.sHinfos.Yppp != NULL)
    535             {
    536                 free((char*) **(*tiIter)->pTapeInfos.sHinfos.Yppp);
    537                 free((char*)  *(*tiIter)->pTapeInfos.sHinfos.Yppp);
    538                 free((char*)   (*tiIter)->pTapeInfos.sHinfos.Yppp);
    539                 (*tiIter)->pTapeInfos.sHinfos.Yppp = NULL;
    540             }
    541             if ((*tiIter)->pTapeInfos.sHinfos.Xppp != NULL)
    542             {
    543                 free((char*) **(*tiIter)->pTapeInfos.sHinfos.Xppp);
    544                 free((char*)  *(*tiIter)->pTapeInfos.sHinfos.Xppp);
    545                 free((char*)   (*tiIter)->pTapeInfos.sHinfos.Xppp);
    546                 (*tiIter)->pTapeInfos.sHinfos.Yppp = NULL;
    547             }
    548             if ((*tiIter)->pTapeInfos.sHinfos.Upp != NULL)
    549             {
    550                 free((char*)  *(*tiIter)->pTapeInfos.sHinfos.Upp);
    551                 free((char*)   (*tiIter)->pTapeInfos.sHinfos.Upp);
    552                 (*tiIter)->pTapeInfos.sHinfos.Upp = NULL;
    553             }
    554             if ((*tiIter)->pTapeInfos.sHinfos.Hcomp != NULL)
    555             {
    556                 free((char*)  *(*tiIter)->pTapeInfos.sHinfos.Hcomp);
    557                 free((char*)   (*tiIter)->pTapeInfos.sHinfos.Hcomp);
    558                 (*tiIter)->pTapeInfos.sHinfos.Hcomp = NULL;
    559             }
     528#ifdef SPARSE
     529            freeSparseJacInfos((*tiIter)->pTapeInfos.sJinfos.y,
     530                               (*tiIter)->pTapeInfos.sJinfos.B,
     531                               (*tiIter)->pTapeInfos.sJinfos.JP,
     532                               (*tiIter)->pTapeInfos.sJinfos.g,
     533                               (*tiIter)->pTapeInfos.sJinfos.jr1d,
     534                               (*tiIter)->pTapeInfos.sJinfos.seed_rows,
     535                               (*tiIter)->pTapeInfos.sJinfos.seed_clms,
     536                               (*tiIter)->pTapeInfos.sJinfos.depen);
     537            freeSparseHessInfos((*tiIter)->pTapeInfos.sHinfos.Hcomp,
     538                                (*tiIter)->pTapeInfos.sHinfos.Xppp,
     539                                (*tiIter)->pTapeInfos.sHinfos.Yppp,
     540                                (*tiIter)->pTapeInfos.sHinfos.Zppp,
     541                                (*tiIter)->pTapeInfos.sHinfos.Upp,
     542                                (*tiIter)->pTapeInfos.sHinfos.HP,
     543                                (*tiIter)->pTapeInfos.sHinfos.g,
     544                                (*tiIter)->pTapeInfos.sHinfos.hr,
     545                                (*tiIter)->pTapeInfos.sHinfos.p,
     546                                (*tiIter)->pTapeInfos.sHinfos.indep);   
     547#endif
    560548
    561549            /* remove "main" tape files if not all three have been written */
     
    651639
    652640    freeTapeResources(tapeInfos);
     641#ifdef SPARSE
     642    freeSparseJacInfos(tapeInfos->pTapeInfos.sJinfos.y,
     643                       tapeInfos->pTapeInfos.sJinfos.B,
     644                       tapeInfos->pTapeInfos.sJinfos.JP,
     645                       tapeInfos->pTapeInfos.sJinfos.g,
     646                       tapeInfos->pTapeInfos.sJinfos.jr1d,
     647                       tapeInfos->pTapeInfos.sJinfos.seed_rows,
     648                       tapeInfos->pTapeInfos.sJinfos.seed_clms,
     649                       tapeInfos->pTapeInfos.sJinfos.depen);
     650    freeSparseHessInfos(tapeInfos->pTapeInfos.sHinfos.Hcomp,
     651                        tapeInfos->pTapeInfos.sHinfos.Xppp,
     652                        tapeInfos->pTapeInfos.sHinfos.Yppp,
     653                        tapeInfos->pTapeInfos.sHinfos.Zppp,
     654                        tapeInfos->pTapeInfos.sHinfos.Upp,
     655                        tapeInfos->pTapeInfos.sHinfos.HP,
     656                        tapeInfos->pTapeInfos.sHinfos.g,
     657                        tapeInfos->pTapeInfos.sHinfos.hr,
     658                        tapeInfos->pTapeInfos.sHinfos.p,
     659                        tapeInfos->pTapeInfos.sHinfos.indep);   
     660#endif
    653661    ADOLC_OPENMP_RESTORE_THREAD_NUMBER;
    654662
  • stable/2.1/ADOL-C/src/taping_p.h

    r116 r157  
    122122/****************************************************************************/
    123123
     124#ifdef SPARSE
    124125typedef struct SparseJacInfos {
    125126  void *g;
     
    149150  int nnz_in, indep, p;
    150151} SparseHessInfos;
     152#endif
    151153
    152154typedef struct PersistantTapeInfos { /* survive tape re-usage */
     
    160162    int jacSolv_nax, jacSolv_modeold, jacSolv_cgd;
    161163
     164#ifdef SPARSE
    162165    /* sparse derivative matrices */
    163166
     
    172175
    173176    SparseHessInfos sHinfos;
     177#endif
    174178
    175179    /* file names */
     
    363367 * and registered if non is found but its state will remain "not in use" */
    364368
     369#ifdef SPARSE
    365370void setTapeInfoJacSparse(short tapeID, SparseJacInfos sJinfos);
    366371/* updates the tape infos on sparse Jac for the given ID */
     
    368373void setTapeInfoHessSparse(short tapeID, SparseHessInfos sHinfos);
    369374/* updates the tape infos n sparse Hess for the given ID */
     375#endif
    370376
    371377void take_stock();
  • stable/2.1/ThirdParty/ColPack/ColPack.vcxproj

    r116 r157  
    120120    <ClCompile Include="utilities\File.cpp" />
    121121    <ClCompile Include="utilities\MatrixDeallocation.cpp" />
     122    <ClCompile Include="Utilities\mmio.cpp" />
    122123    <ClCompile Include="utilities\Pause.cpp" />
    123124    <ClCompile Include="utilities\StringTokenizer.cpp" />
     
    151152    <ClInclude Include="utilities\File.h" />
    152153    <ClInclude Include="utilities\MatrixDeallocation.h" />
     154    <ClInclude Include="Utilities\mmio.h" />
    153155    <ClInclude Include="utilities\Pause.h" />
    154156    <ClInclude Include="utilities\StringTokenizer.h" />
  • stable/2.1/configure

    r130 r157  
    22# From configure.ac Revision.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.65 for adolc 2.1.8-stable.
     4# Generated by GNU Autoconf 2.65 for adolc 2.1.9-stable.
    55#
    66# Report bugs to <adol-c@list.coin-or.org>.
     
    703703PACKAGE_NAME='adolc'
    704704PACKAGE_TARNAME='adolc'
    705 PACKAGE_VERSION='2.1.8-stable'
    706 PACKAGE_STRING='adolc 2.1.8-stable'
     705PACKAGE_VERSION='2.1.9-stable'
     706PACKAGE_STRING='adolc 2.1.9-stable'
    707707PACKAGE_BUGREPORT='adol-c@list.coin-or.org'
    708708PACKAGE_URL=''
     
    14741474  # This message is too long to be a string in the A/UX 3.1 sh.
    14751475  cat <<_ACEOF
    1476 \`configure' configures adolc 2.1.8-stable to adapt to many kinds of systems.
     1476\`configure' configures adolc 2.1.9-stable to adapt to many kinds of systems.
    14771477
    14781478Usage: $0 [OPTION]... [VAR=VALUE]...
     
    15441544if test -n "$ac_init_help"; then
    15451545  case $ac_init_help in
    1546      short | recursive ) echo "Configuration of adolc 2.1.8-stable:";;
     1546     short | recursive ) echo "Configuration of adolc 2.1.9-stable:";;
    15471547   esac
    15481548  cat <<\_ACEOF
     
    16731673if $ac_init_version; then
    16741674  cat <<\_ACEOF
    1675 adolc configure 2.1.8-stable
     1675adolc configure 2.1.9-stable
    16761676generated by GNU Autoconf 2.65
    16771677
     
    23972397running configure, to aid debugging if configure makes a mistake.
    23982398
    2399 It was created by adolc $as_me 2.1.8-stable, which was
     2399It was created by adolc $as_me 2.1.9-stable, which was
    24002400generated by GNU Autoconf 2.65.  Invocation command line was
    24012401
     
    32103210# Define the identity of the package.
    32113211 PACKAGE='adolc'
    3212  VERSION='2.1.8-stable'
     3212 VERSION='2.1.9-stable'
    32133213
    32143214
     
    32513251
    32523252
    3253 if test x$CFLAGS == x ; then
     3253if test "x$CFLAGS" == x ; then
    32543254    ac_shell_cflags="not_set"
    32553255else
    32563256    ac_shell_cflags="$CFLAGS"
    32573257fi
    3258 if test x$CXXFLAGS == x ; then
     3258if test "x$CXXFLAGS" == x ; then
    32593259    ac_shell_cxxflags="not_set"
    32603260else
     
    1512215122
    1512315123
    15124 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sizeof int*" >&5
    15125 $as_echo_n "checking sizeof int*... " >&6; }
    15126 if ac_fn_c_compute_int "$LINENO" "sizeof(int *)" "SIZEOF_INT_P"        ""; then :
    15127 
    15128 fi
    15129 
    15130 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SIZEOF_INT_P bytes" >&5
    15131 $as_echo "$SIZEOF_INT_P bytes" >&6; }
    15132 if test "x$SIZEOF_INT_P" = "x8" ; then
     15124# The cast to long int works around a bug in the HP C Compiler
     15125# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
     15126# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
     15127# This bug is HP SR number 8606223364.
     15128{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
     15129$as_echo_n "checking size of void *... " >&6; }
     15130if test "${ac_cv_sizeof_void_p+set}" = set; then :
     15131  $as_echo_n "(cached) " >&6
     15132else
     15133  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
     15134
     15135else
     15136  if test "$ac_cv_type_void_p" = yes; then
     15137     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     15138$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     15139{ as_fn_set_status 77
     15140as_fn_error "cannot compute sizeof (void *)
     15141See \`config.log' for more details." "$LINENO" 5; }; }
     15142   else
     15143     ac_cv_sizeof_void_p=0
     15144   fi
     15145fi
     15146
     15147fi
     15148{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
     15149$as_echo "$ac_cv_sizeof_void_p" >&6; }
     15150
     15151
     15152
     15153cat >>confdefs.h <<_ACEOF
     15154#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
     15155_ACEOF
     15156
     15157
     15158if test "x$SIZEOF_VOID_P" = "x8" ; then
    1513315159   _lib=lib64
    1513415160else
     
    1578915815
    1579015816
    15791 $as_echo "#define ADOLC_PATCHLEVEL 8" >>confdefs.h
     15817$as_echo "#define ADOLC_PATCHLEVEL 9" >>confdefs.h
    1579215818
    1579315819ADOLC_VERSION=2
    1579415820ADOLC_SUBVERSION=1
    15795 ADOLC_PATCHLEVEL=8
     15821ADOLC_PATCHLEVEL=9
    1579615822
    1579715823
     
    1595715983fi
    1595815984
    15959 CFLAGS=$save_CFLAGS
    15960 LDFLAGS=$save_LDFLAGS
     15985CFLAGS="$save_CFLAGS"
     15986LDFLAGS="$save_LDFLAGS"
     15987if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
     15988   unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
     15989   COLPACK_CFLAGS="-I$colpack/include"
     15990   COLPACK_LIBS="-L$colpack/lib -lColPack -Wl,-rpath,$colpack/build/lib"
     15991   save_CFLAGS="$CFLAGS"
     15992   save_LDFLAGS="$LDFLAGS"
     15993   CFLAGS="$CFLAGS $COLPACK_CFLAGS"
     15994   LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     15995   echo "will test for linking with -lColPack from $colpack/lib"
     15996   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack" >&5
     15997$as_echo_n "checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack... " >&6; }
     15998if test "${ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv+set}" = set; then :
     15999  $as_echo_n "(cached) " >&6
     16000else
     16001  ac_check_lib_save_LIBS=$LIBS
     16002LIBS="-lColPack  $LIBS"
     16003cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     16004/* end confdefs.h.  */
     16005
     16006/* Override any GCC internal prototype to avoid an error.
     16007   Use char because int might match the return type of a GCC
     16008   builtin and then its argument prototype would still apply.  */
     16009#ifdef __cplusplus
     16010extern "C"
     16011#endif
     16012char _ZN7ColPack9GraphCore12GetInputFileEv ();
     16013int
     16014main ()
     16015{
     16016return _ZN7ColPack9GraphCore12GetInputFileEv ();
     16017  ;
     16018  return 0;
     16019}
     16020_ACEOF
     16021if ac_fn_c_try_link "$LINENO"; then :
     16022  ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=yes
     16023else
     16024  ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=no
     16025fi
     16026rm -f core conftest.err conftest.$ac_objext \
     16027    conftest$ac_exeext conftest.$ac_ext
     16028LIBS=$ac_check_lib_save_LIBS
     16029fi
     16030{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&5
     16031$as_echo "$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&6; }
     16032if test "x$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" = x""yes; then :
     16033  have_colpack=yes
     16034else
     16035  have_colpack=no
     16036fi
     16037
     16038   CFLAGS="$save_CFLAGS"
     16039   LDFLAGS="$save_LDFLAGS"
     16040fi
     16041if test x$have_colpack = xno ; then
     16042   unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
     16043   COLPACK_CFLAGS="-I$colpack/build/include"
     16044   COLPACK_LIBS="-L$colpack/build/${_lib} -lColPack -Wl,-rpath,$colpack/build/${_lib}"
     16045   save_CFLAGS="$CFLAGS"
     16046   save_LDFLAGS="$LDFLAGS"
     16047   CFLAGS="$CFLAGS $COLPACK_CFLAGS"
     16048   LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     16049   echo "will test for linking with -lColPack from $colpack/build/${_lib}"
     16050   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack" >&5
     16051$as_echo_n "checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack... " >&6; }
     16052if test "${ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv+set}" = set; then :
     16053  $as_echo_n "(cached) " >&6
     16054else
     16055  ac_check_lib_save_LIBS=$LIBS
     16056LIBS="-lColPack  $LIBS"
     16057cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     16058/* end confdefs.h.  */
     16059
     16060/* Override any GCC internal prototype to avoid an error.
     16061   Use char because int might match the return type of a GCC
     16062   builtin and then its argument prototype would still apply.  */
     16063#ifdef __cplusplus
     16064extern "C"
     16065#endif
     16066char _ZN7ColPack9GraphCore12GetInputFileEv ();
     16067int
     16068main ()
     16069{
     16070return _ZN7ColPack9GraphCore12GetInputFileEv ();
     16071  ;
     16072  return 0;
     16073}
     16074_ACEOF
     16075if ac_fn_c_try_link "$LINENO"; then :
     16076  ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=yes
     16077else
     16078  ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=no
     16079fi
     16080rm -f core conftest.err conftest.$ac_objext \
     16081    conftest$ac_exeext conftest.$ac_ext
     16082LIBS=$ac_check_lib_save_LIBS
     16083fi
     16084{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&5
     16085$as_echo "$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&6; }
     16086if test "x$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" = x""yes; then :
     16087  have_colpack=yes
     16088else
     16089  have_colpack=no
     16090fi
     16091
     16092   CFLAGS="$save_CFLAGS"
     16093   LDFLAGS="$save_LDFLAGS"
     16094fi
     16095if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
     16096   unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
     16097   COLPACK_CFLAGS="-I$colpack/build/include"
     16098   COLPACK_LIBS="-L$colpack/build/lib -lColPack -Wl,-rpath,$colpack/build/lib"
     16099   save_CFLAGS="$CFLAGS"
     16100   save_LDFLAGS="$LDFLAGS"
     16101   CFLAGS="$CFLAGS $COLPACK_CFLAGS"
     16102   LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     16103   echo "will test for linking with -lColPack from $colpack/build/lib"
     16104   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack" >&5
     16105$as_echo_n "checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack... " >&6; }
     16106if test "${ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv+set}" = set; then :
     16107  $as_echo_n "(cached) " >&6
     16108else
     16109  ac_check_lib_save_LIBS=$LIBS
     16110LIBS="-lColPack  $LIBS"
     16111cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     16112/* end confdefs.h.  */
     16113
     16114/* Override any GCC internal prototype to avoid an error.
     16115   Use char because int might match the return type of a GCC
     16116   builtin and then its argument prototype would still apply.  */
     16117#ifdef __cplusplus
     16118extern "C"
     16119#endif
     16120char _ZN7ColPack9GraphCore12GetInputFileEv ();
     16121int
     16122main ()
     16123{
     16124return _ZN7ColPack9GraphCore12GetInputFileEv ();
     16125  ;
     16126  return 0;
     16127}
     16128_ACEOF
     16129if ac_fn_c_try_link "$LINENO"; then :
     16130  ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=yes
     16131else
     16132  ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=no
     16133fi
     16134rm -f core conftest.err conftest.$ac_objext \
     16135    conftest$ac_exeext conftest.$ac_ext
     16136LIBS=$ac_check_lib_save_LIBS
     16137fi
     16138{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&5
     16139$as_echo "$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&6; }
     16140if test "x$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" = x""yes; then :
     16141  have_colpack=yes
     16142else
     16143  have_colpack=no
     16144fi
     16145
     16146   CFLAGS="$save_CFLAGS"
     16147   LDFLAGS="$save_LDFLAGS"
     16148fi
    1596116149 if test x$have_colpack = xyes; then
    1596216150  HAVE_LIBCOLPACK_TRUE=
     
    1596916157if test x$have_colpack = xyes; then
    1597016158   sparse=yes
     16159   echo "will build sparse drivers as -lColPack found"
    1597116160fi
    1597216161 if test x${sparse} = xyes; then
     
    1680016989# values after options handling.
    1680116990ac_log="
    16802 This file was extended by adolc $as_me 2.1.8-stable, which was
     16991This file was extended by adolc $as_me 2.1.9-stable, which was
    1680316992generated by GNU Autoconf 2.65.  Invocation command line was
    1680416993
     
    1686617055ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1686717056ac_cs_version="\\
    16868 adolc config.status 2.1.8-stable
     17057adolc config.status 2.1.9-stable
    1686917058configured by $0, generated by GNU Autoconf 2.65,
    1687017059  with options \\"\$ac_cs_config\\"
  • stable/2.1/configure.ac

    r130 r157  
    1010define([ADOLC_VER], [2])
    1111define([ADOLC_SUB], [1])
    12 define([ADOLC_LVL], [8])
     12define([ADOLC_LVL], [9])
    1313
    1414AC_PREREQ(2.57)
     
    2323AM_INIT_AUTOMAKE
    2424
    25 if test x$CFLAGS == x ; then
     25if test "x$CFLAGS" == x ; then
    2626    ac_shell_cflags="not_set"
    2727else
    2828    ac_shell_cflags="$CFLAGS"
    2929fi
    30 if test x$CXXFLAGS == x ; then
     30if test "x$CXXFLAGS" == x ; then
    3131    ac_shell_cxxflags="not_set"
    3232else
     
    4545DOLT
    4646
    47 AC_MSG_CHECKING([sizeof int*])
    48 AC_COMPUTE_INT(SIZEOF_INT_P,[sizeof(int *)])
    49 AC_MSG_RESULT([$SIZEOF_INT_P bytes])
    50 if test "x$SIZEOF_INT_P" = "x8" ; then
     47AC_CHECK_SIZEOF([void *])
     48if test "x$SIZEOF_VOID_P" = "x8" ; then
    5149   _lib=lib64
    5250else
     
    166164echo "will test for linking with -lColPack from $colpack/${_lib}"
    167165AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
    168 CFLAGS=$save_CFLAGS
    169 LDFLAGS=$save_LDFLAGS
     166CFLAGS="$save_CFLAGS"
     167LDFLAGS="$save_LDFLAGS"
     168if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
     169   unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
     170   COLPACK_CFLAGS="-I$colpack/include"
     171   COLPACK_LIBS="-L$colpack/lib -lColPack -Wl,-rpath,$colpack/build/lib"
     172   save_CFLAGS="$CFLAGS"
     173   save_LDFLAGS="$LDFLAGS"
     174   CFLAGS="$CFLAGS $COLPACK_CFLAGS"
     175   LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     176   echo "will test for linking with -lColPack from $colpack/lib"
     177   AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
     178   CFLAGS="$save_CFLAGS"
     179   LDFLAGS="$save_LDFLAGS"
     180fi
     181if test x$have_colpack = xno ; then
     182   unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
     183   COLPACK_CFLAGS="-I$colpack/build/include"
     184   COLPACK_LIBS="-L$colpack/build/${_lib} -lColPack -Wl,-rpath,$colpack/build/${_lib}"
     185   save_CFLAGS="$CFLAGS"
     186   save_LDFLAGS="$LDFLAGS"
     187   CFLAGS="$CFLAGS $COLPACK_CFLAGS"
     188   LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     189   echo "will test for linking with -lColPack from $colpack/build/${_lib}"
     190   AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
     191   CFLAGS="$save_CFLAGS"
     192   LDFLAGS="$save_LDFLAGS"
     193fi
     194if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
     195   unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
     196   COLPACK_CFLAGS="-I$colpack/build/include"
     197   COLPACK_LIBS="-L$colpack/build/lib -lColPack -Wl,-rpath,$colpack/build/lib"
     198   save_CFLAGS="$CFLAGS"
     199   save_LDFLAGS="$LDFLAGS"
     200   CFLAGS="$CFLAGS $COLPACK_CFLAGS"
     201   LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     202   echo "will test for linking with -lColPack from $colpack/build/lib"
     203   AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
     204   CFLAGS="$save_CFLAGS"
     205   LDFLAGS="$save_LDFLAGS"
     206fi
    170207AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
    171208if test x$have_colpack = xyes; then
    172209   sparse=yes
     210   echo "will build sparse drivers as -lColPack found"
    173211fi
    174212AM_CONDITIONAL(SPARSE,[test x${sparse} = xyes])
  • stable/2.1/windows/adolc.sln

    r116 r157  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColPack", "..\ThirdParty\ColPack\ColPack.vcxproj", "{28A2D8D2-EE47-E3EA-9003-F06045985ECB}"
     4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColPack", "..\ThirdParty\ColPack\ColPack.vcxproj", "{E15FF863-18E9-E567-5F8B-225D07C68E05}"
    55EndProject
    6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adolc", "adolc.vcxproj", "{AFAFEBB2-F23F-6598-0E88-8FDE80540C04}"
     6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adolc", "adolc.vcxproj", "{8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}"
    77        ProjectSection(ProjectDependencies) = postProject
    8                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB} = {28A2D8D2-EE47-E3EA-9003-F06045985ECB}
     8                {E15FF863-18E9-E567-5F8B-225D07C68E05} = {E15FF863-18E9-E567-5F8B-225D07C68E05}
    99        EndProjectSection
    1010EndProject
     
    1717        EndGlobalSection
    1818        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    19                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.nosparse|Win32.ActiveCfg = sparse|Win32
    20                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.nosparse|Win32.Build.0 = sparse|Win32
    21                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.nosparse|x64.ActiveCfg = sparse|x64
    22                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.nosparse|x64.Build.0 = sparse|x64
    23                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.sparse|Win32.ActiveCfg = sparse|Win32
    24                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.sparse|Win32.Build.0 = sparse|Win32
    25                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.sparse|x64.ActiveCfg = sparse|x64
    26                 {28A2D8D2-EE47-E3EA-9003-F06045985ECB}.sparse|x64.Build.0 = sparse|x64
    27                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.nosparse|Win32.ActiveCfg = nosparse|Win32
    28                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.nosparse|Win32.Build.0 = nosparse|Win32
    29                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.nosparse|x64.ActiveCfg = nosparse|x64
    30                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.nosparse|x64.Build.0 = nosparse|x64
    31                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.sparse|Win32.ActiveCfg = sparse|Win32
    32                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.sparse|Win32.Build.0 = sparse|Win32
    33                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.sparse|x64.ActiveCfg = sparse|x64
    34                 {AFAFEBB2-F23F-6598-0E88-8FDE80540C04}.sparse|x64.Build.0 = sparse|x64
     19                {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|Win32.ActiveCfg = sparse|Win32
     20                {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|Win32.Build.0 = sparse|Win32
     21                {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|x64.ActiveCfg = sparse|x64
     22                {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|x64.Build.0 = sparse|x64
     23                {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|Win32.ActiveCfg = sparse|Win32
     24                {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|Win32.Build.0 = sparse|Win32
     25                {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|x64.ActiveCfg = sparse|x64
     26                {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|x64.Build.0 = sparse|x64
     27                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|Win32.ActiveCfg = nosparse|Win32
     28                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|Win32.Build.0 = nosparse|Win32
     29                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|x64.ActiveCfg = nosparse|x64
     30                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|x64.Build.0 = nosparse|x64
     31                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|Win32.ActiveCfg = sparse|Win32
     32                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|Win32.Build.0 = sparse|Win32
     33                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|x64.ActiveCfg = sparse|x64
     34                {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|x64.Build.0 = sparse|x64
    3535        EndGlobalSection
    3636        GlobalSection(SolutionProperties) = preSolution
  • stable/2.1/windows/adolc.vcxproj

    r116 r157  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;../ADOL-C/src/sparse;../ThirdParty/ColPack/$(IntDir)/include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>$(IntDir);../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;../ADOL-C/src/sparse;../ThirdParty/ColPack/$(IntDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8686      <AdditionalDependencies>ColPack.lib;%(AdditionalDependencies)</AdditionalDependencies>
    8787    </Link>
     88    <PreBuildEvent>
     89      <Command>del ..\ADOL-C\src\config.h</Command>
     90    </PreBuildEvent>
    8891  </ItemDefinitionGroup>
    8992  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='sparse|x64'">
    9093    <ClCompile>
    9194      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    92       <AdditionalIncludeDirectories>../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;../ADOL-C/src/sparse;../ThirdParty/ColPack/$(IntDir)/include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     95      <AdditionalIncludeDirectories>$(IntDir);../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;../ADOL-C/src/sparse;../ThirdParty/ColPack/$(IntDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9396      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    9497      <WarningLevel>Level3</WarningLevel>
     
    105108      <AdditionalDependencies>ColPack.lib;%(AdditionalDependencies)</AdditionalDependencies>
    106109    </Link>
     110    <PreBuildEvent>
     111      <Command>del ..\ADOL-C\src\config.h</Command>
     112    </PreBuildEvent>
    107113  </ItemDefinitionGroup>
    108114  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='nosparse|Win32'">
    109115    <ClCompile>
    110116      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    111       <AdditionalIncludeDirectories>../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>$(IntDir);../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    112118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    113119      <WarningLevel>Level3</WarningLevel>
     
    127133      </AdditionalDependencies>
    128134    </Link>
     135    <PreBuildEvent>
     136      <Command>del ..\ADOL-C\src\config.h</Command>
     137    </PreBuildEvent>
    129138  </ItemDefinitionGroup>
    130139  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='nosparse|x64'">
    131140    <ClCompile>
    132141      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133       <AdditionalIncludeDirectories>../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     142      <AdditionalIncludeDirectories>$(IntDir);../ADOL-C/src;../ADOL-C/src/drivers;../ADOL-C/src/tapedoc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    134143      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    135144      <WarningLevel>Level3</WarningLevel>
     
    148157      </AdditionalDependencies>
    149158    </Link>
     159    <PreBuildEvent>
     160      <Command>del ..\ADOL-C\src\config.h</Command>
     161    </PreBuildEvent>
    150162  </ItemDefinitionGroup>
    151163  <ItemGroup>
  • stable/2.1/windows/nosparse/config.h

    r130 r157  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.8-stable"
     119#define PACKAGE_STRING "adolc 2.1.9-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-stable"
     125#define PACKAGE_VERSION "2.1.9-stable"
     126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 4
    126129
    127130/* Define to 1 if you have the ANSI C header files. */
     
    135138
    136139/* Version number of package */
    137 #define VERSION "2.1.8-stable"
     140#define VERSION "2.1.9-stable"
    138141
    139142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/nosparse/config.h.in

    r130 r157  
    125125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 4
     129
    127130/* Define to 1 if you have the ANSI C header files. */
    128131#define STDC_HEADERS 1
  • stable/2.1/windows/sparse/config.h

    r130 r157  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.8-stable"
     119#define PACKAGE_STRING "adolc 2.1.9-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-stable"
     125#define PACKAGE_VERSION "2.1.9-stable"
     126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 4
    126129
    127130/* Define to 1 if you have the ANSI C header files. */
     
    135138
    136139/* Version number of package */
    137 #define VERSION "2.1.8-stable"
     140#define VERSION "2.1.9-stable"
    138141
    139142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/sparse/config.h.in

    r130 r157  
    125125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 4
     129
    127130/* Define to 1 if you have the ANSI C header files. */
    128131#define STDC_HEADERS 1
  • stable/2.1/windows/x64/nosparse/config.h

    r130 r157  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.8-stable"
     119#define PACKAGE_STRING "adolc 2.1.9-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-stable"
     125#define PACKAGE_VERSION "2.1.9-stable"
     126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 8
    126129
    127130/* Define to 1 if you have the ANSI C header files. */
     
    135138
    136139/* Version number of package */
    137 #define VERSION "2.1.8-stable"
     140#define VERSION "2.1.9-stable"
    138141
    139142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/x64/nosparse/config.h.in

    r130 r157  
    125125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 8
     129
    127130/* Define to 1 if you have the ANSI C header files. */
    128131#define STDC_HEADERS 1
  • stable/2.1/windows/x64/sparse/config.h

    r130 r157  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.8-stable"
     119#define PACKAGE_STRING "adolc 2.1.9-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-stable"
     125#define PACKAGE_VERSION "2.1.9-stable"
     126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 8
    126129
    127130/* Define to 1 if you have the ANSI C header files. */
     
    135138
    136139/* Version number of package */
    137 #define VERSION "2.1.8-stable"
     140#define VERSION "2.1.9-stable"
    138141
    139142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/x64/sparse/config.h.in

    r130 r157  
    125125#define PACKAGE_VERSION "@PACKAGE_VERSION@"
    126126
     127/* The size of `void *', as computed by sizeof. */
     128#define SIZEOF_VOID_P 8
     129
    127130/* Define to 1 if you have the ANSI C header files. */
    128131#define STDC_HEADERS 1
Note: See TracChangeset for help on using the changeset viewer.