Ignore:
Timestamp:
Jul 12, 2016 4:18:44 AM (3 years ago)
Author:
kulshres
Message:

Merge branch 'master' of 'gitclone' into 'svn'

The following changes have been merged:

commit e2291bde44a282a133894b0db350aeb0b92a87db
Author: Mladen Banovic <mladenbanovic2705@…>
Date: Fri Jul 8 10:15:51 2016 +0200

Add methods getNumLiveVar and getNumDir in adtl.h, change counter type in FOR_I_EQ_0_LT_NUMDIR macro to size_t (instead of int). Update chunk size of BOOST pool in adouble_tl.cpp according to adouble::numDir.

commit 2ffb294465b973bfd4bf1f73d84478f8233c0d2f
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jun 23 12:32:14 2016 +0200

implement missing ref_eq_mult_p und ref_eq_min_p in ho_rev.c

somehow these were left out when parameters were being implemented.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 8cf0e5c1bd36f1dcf3be72cd67de631b2e1d0ee6
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jun 23 12:31:04 2016 +0200

make sure the result is the last locint written in trace for each operation

since we're trying to generate ascii traces in the future, we'll need this
convention that the last location is the result, and previous locations
are arguments. This has been the case for almost all operations anyway
except for a few new one's that I wrote without keeping this in mind.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 9ae0ff220f37463f2ed85cafc8a626c24e472f2f
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Tue Jun 21 14:16:27 2016 +0200

on some compilers newer boost interferes with AC_FUNC_MALLOC test

so do AC_FUNC_MALLOC and AC_FUNC_REALLOC as usual and check for boost
library later.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit b746f620772cc8cce53e8f350adc6281279caf72
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Jun 20 15:32:22 2016 +0200

make Klaus Röbenack's name UTF-8 instead of ISO-8859-1

These are the only places where we're not simple ASCII or UTF-8 already

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 1171aa3961b5eb46a5d2ee64751c02a393a8a6f5
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Jun 17 10:42:39 2016 +0200

correct short_ref document about include file

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 2c6b2aac2ef04431ece2c6ff80e574aa2e58814b
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Jun 17 10:40:34 2016 +0200

correct error message to new semantics

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 506cde73451740bf0a15eff7d4abb158ee719ab0
Author: mflehmig <martin.flehmig@…>
Date: Fri Jun 17 10:14:26 2016 +0200

Fixed include of ADOL-C header.

ADOL-C header was included in old fashion (without adolc directory) for this example.

commit 2a023d3281d3d6d9824bad724a5768e3ee2fff94
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jun 16 13:50:39 2016 +0200

Try to use boost::pool for allocating advals in traceless vector mode

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 80f1e2019ac1faab96fe06f3e9da47efcc1bcd23
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon May 23 15:13:22 2016 +0200

correct a reference in doc and rebuild

commit d7ab5283afe58bacb2e8739d72ede4e17f4c8081
Author: Mladen Banovic <mladenbanovic2705@…>
Date: Fri May 20 16:42:13 2016 +0200

Update section 7 of adolc-manual related to the Traceless forward differentiation.

commit bedb8e36f959c5272e4610fe504acc83208e5e9d
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Tue May 17 16:09:36 2016 +0200

macro name correction

commit 92ff596a0331776901df7f172ca347572e3daafd
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Tue May 17 15:56:17 2016 +0200

Add a warning about using static build of ADOL-C

static build of ADOL-C does not call constructors
for internal global objects, thereby causing
segmentation faults.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/src/param.cpp

    r605 r708  
    9090    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) {
    9191        put_op(assign_p);
    92         ADOLC_PUT_LOCINT(location);
    9392        ADOLC_PUT_LOCINT(_idx);
     93        ADOLC_PUT_LOCINT(location);
    9494
    9595        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    150150    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) {
    151151        put_op(eq_plus_p);
     152        ADOLC_PUT_LOCINT(p._idx);
    152153        ADOLC_PUT_LOCINT(loc);
    153         ADOLC_PUT_LOCINT(p._idx);
    154154       
    155155        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    168168    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) {
    169169        put_op(ref_eq_plus_p);
    170         ADOLC_PUT_LOCINT(location);
    171         ADOLC_PUT_LOCINT(p._idx);
     170        ADOLC_PUT_LOCINT(p._idx);
     171        ADOLC_PUT_LOCINT(location);
    172172
    173173        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    185185    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) { // old: write_d_same_arg(eq_min_d,loc(),coval);
    186186        put_op(eq_min_p);
     187        ADOLC_PUT_LOCINT(p._idx);
    187188        ADOLC_PUT_LOCINT(loc());
    188         ADOLC_PUT_LOCINT(p._idx);
    189189
    190190        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    202202    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) { // old: write_d_same_arg(eq_min_d,location,coval);
    203203        put_op(ref_eq_min_p);
    204         ADOLC_PUT_LOCINT(location);
    205         ADOLC_PUT_LOCINT(p._idx);
     204        ADOLC_PUT_LOCINT(p._idx);
     205        ADOLC_PUT_LOCINT(location);
    206206
    207207        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    219219    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) { // old: write_d_same_arg(eq_mult_d,loc(),coval);
    220220        put_op(eq_mult_p);
     221        ADOLC_PUT_LOCINT(p._idx);       // = coval
    221222        ADOLC_PUT_LOCINT(loc()); // = res
    222         ADOLC_PUT_LOCINT(p._idx);       // = coval
    223223
    224224        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    236236    if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) { // old: write_d_same_arg(eq_mult_d,location,coval);
    237237        put_op(ref_eq_mult_p);
    238         ADOLC_PUT_LOCINT(location);
    239         ADOLC_PUT_LOCINT(p._idx);
     238        ADOLC_PUT_LOCINT(p._idx);
     239        ADOLC_PUT_LOCINT(location);
    240240
    241241        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    278278        put_op(min_a_p);
    279279        ADOLC_PUT_LOCINT(a.loc());
     280        ADOLC_PUT_LOCINT(p._idx);
    280281        ADOLC_PUT_LOCINT(locat);
    281         ADOLC_PUT_LOCINT(p._idx);
    282282
    283283        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    299299        put_op(mult_a_p);
    300300        ADOLC_PUT_LOCINT(a.loc());
     301        ADOLC_PUT_LOCINT(p._idx);
    301302        ADOLC_PUT_LOCINT(locat);
    302         ADOLC_PUT_LOCINT(p._idx);
    303303
    304304        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    320320        put_op(div_p_a);
    321321        ADOLC_PUT_LOCINT(a.loc());
     322        ADOLC_PUT_LOCINT(p._idx);
    322323        ADOLC_PUT_LOCINT(locat);
    323         ADOLC_PUT_LOCINT(p._idx);
    324324
    325325        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
     
    340340        put_op(pow_op_p);
    341341        ADOLC_PUT_LOCINT(x.loc()); // = arg
     342        ADOLC_PUT_LOCINT(p._idx);         // = coval
    342343        ADOLC_PUT_LOCINT(locat);      // = res
    343         ADOLC_PUT_LOCINT(p._idx);         // = coval
    344344
    345345        ++ADOLC_CURRENT_TAPE_INFOS.numTays_Tape;
Note: See TracChangeset for help on using the changeset viewer.