Changeset 251


Ignore:
Timestamp:
Jun 19, 2011 4:36:37 PM (8 years ago)
Author:
awalther
Message:

nlf: handling of eq_*_prod => extension of tape stats

Location:
trunk
Files:
10 edited

Legend:

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

    r211 r251  
    11\newcommand{\packagename}{adolc}
    2 \newcommand{\packageversion}{2.2.0-trunk}
     2\newcommand{\packageversion}{2.2.1-trunk}
    33\newcommand{\packagetar}{\packagename-\packageversion}
  • trunk/ADOL-C/src/adouble.cpp

    r198 r251  
    571571    int upd = 0;
    572572    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag)
     573      {
    573574        upd = upd_resloc_inc_prod(a_loc,location,eq_plus_prod);
     575        ++ADOLC_CURRENT_TAPE_INFOS.num_eq_prod;
     576      }
    574577    if (upd) {
    575578        ADOLC_GLOBAL_TAPE_VARS.store[location] += ADOLC_GLOBAL_TAPE_VARS.store[a_loc];
     
    621624    int upd = 0;
    622625    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag)
     626      {
    623627        upd = upd_resloc_inc_prod(a_loc,location,eq_min_prod);
     628        ++ADOLC_CURRENT_TAPE_INFOS.num_eq_prod;
     629      }
    624630    if (upd) {
    625631        ADOLC_GLOBAL_TAPE_VARS.store[location] -= ADOLC_GLOBAL_TAPE_VARS.store[a_loc];
  • trunk/ADOL-C/src/taping.c

    r249 r251  
    10431043    ADOLC_CURRENT_TAPE_INFOS.currLoc = ADOLC_CURRENT_TAPE_INFOS.locBuffer;
    10441044    ADOLC_CURRENT_TAPE_INFOS.currVal = ADOLC_CURRENT_TAPE_INFOS.valBuffer;
    1045 
     1045    ADOLC_CURRENT_TAPE_INFOS.num_eq_prod = 0;
    10461046    /* Put operation denoting the start_of_the tape */
    10471047    put_op(start_of_tape);
     
    10751075    ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] =
    10761076        ADOLC_GLOBAL_TAPE_VARS.storeSize;
     1077    ADOLC_CURRENT_TAPE_INFOS.stats[NUM_EQ_PROD] =
     1078        ADOLC_CURRENT_TAPE_INFOS.num_eq_prod;
    10771079
    10781080    taylor_close(ADOLC_CURRENT_TAPE_INFOS.stats[TAY_BUFFER_SIZE]);
  • trunk/ADOL-C/src/taping.h

    r106 r251  
    3636    VAL_BUFFER_SIZE,      /* # of values per buffer == CBUFSIZE (usrparms.h) */
    3737    TAY_BUFFER_SIZE,     /* # of taylors per buffer <= TBUFSIZE (usrparms.h) */
     38    NUM_EQ_PROD,                       /* # of eq_prod_* for nlf computation */
    3839    STAT_SIZE                     /* represents the size of the stats vector */
    3940};
  • trunk/ADOL-C/src/taping_p.h

    r199 r251  
    208208    unsigned char *lastOpP1;    /* pointer to element following the buffer */
    209209    uint numOps_Tape;           /* overall number of opcodes */
     210    uint num_eq_prod;           /* overall number of eq_prod_* for nlf */
    210211
    211212    /* values (real) tape */
  • trunk/MSVisualStudio/v10/nosparse/config.h

    r211 r251  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 0
     14#define ADOLC_PATCHLEVEL 1
    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.2.0-trunk"
     119#define PACKAGE_STRING "adolc 2.2.1-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    126126
    127127/* Define to the version of this package. */
    128 #define PACKAGE_VERSION "2.2.0-trunk"
     128#define PACKAGE_VERSION "2.2.1-trunk"
    129129
    130130/* The size of `void *', as computed by sizeof. */
     
    141141
    142142/* Version number of package */
    143 #define VERSION "2.2.0-trunk"
     143#define VERSION "2.2.1-trunk"
    144144
    145145/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/MSVisualStudio/v10/sparse/config.h

    r211 r251  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 0
     14#define ADOLC_PATCHLEVEL 1
    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.2.0-trunk"
     119#define PACKAGE_STRING "adolc 2.2.1-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    126126
    127127/* Define to the version of this package. */
    128 #define PACKAGE_VERSION "2.2.0-trunk"
     128#define PACKAGE_VERSION "2.2.1-trunk"
    129129
    130130/* The size of `void *', as computed by sizeof. */
     
    141141
    142142/* Version number of package */
    143 #define VERSION "2.2.0-trunk"
     143#define VERSION "2.2.1-trunk"
    144144
    145145/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/MSVisualStudio/v10/x64/nosparse/config.h

    r211 r251  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 0
     14#define ADOLC_PATCHLEVEL 1
    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.2.0-trunk"
     119#define PACKAGE_STRING "adolc 2.2.1-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    126126
    127127/* Define to the version of this package. */
    128 #define PACKAGE_VERSION "2.2.0-trunk"
     128#define PACKAGE_VERSION "2.2.1-trunk"
    129129
    130130/* The size of `void *', as computed by sizeof. */
     
    141141
    142142/* Version number of package */
    143 #define VERSION "2.2.0-trunk"
     143#define VERSION "2.2.1-trunk"
    144144
    145145/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/MSVisualStudio/v10/x64/sparse/config.h

    r211 r251  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 0
     14#define ADOLC_PATCHLEVEL 1
    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.2.0-trunk"
     119#define PACKAGE_STRING "adolc 2.2.1-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    126126
    127127/* Define to the version of this package. */
    128 #define PACKAGE_VERSION "2.2.0-trunk"
     128#define PACKAGE_VERSION "2.2.1-trunk"
    129129
    130130/* The size of `void *', as computed by sizeof. */
     
    141141
    142142/* Version number of package */
    143 #define VERSION "2.2.0-trunk"
     143#define VERSION "2.2.1-trunk"
    144144
    145145/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/adolc.spec

    r211 r251  
    1 # spec file for package adolc (Version 2.2.0)
     1# spec file for package adolc (Version 2.2.1)
    22
    33# norootforbuild
    44
    5 %define packver 2.2.0-trunk
     5%define packver 2.2.1-trunk
    66
    77Name:           adolc
    8 Version:        2.2.0
     8Version:        2.2.1
    99Release:        0.1
    1010License:        GPLv2 or CPL
Note: See TracChangeset for help on using the changeset viewer.