Changeset 441 for trunk/ADOL-C/include


Ignore:
Timestamp:
Dec 2, 2013 10:44:53 AM (6 years ago)
Author:
kulshres
Message:

Merge branch 'abs-normal' of 'gitclone' into svn

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

The following changes were merged:

commit cc9e28194c6c4ed02242752f2c77474c8d22479a
Merge: 78f3e25 4ca940a
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Dec 2 16:37:30 2013 +0100

Merge branch 'master' into abs-normal

Conflicts: (solved)

ADOL-C/include/adolc/taping.h
ADOL-C/src/Makefile.am
ADOL-C/src/tape_handling.cpp
ADOL-C/src/uni5_for.c

commit 78f3e252cf2c646a36507b9edc5b7e137db95b3e
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Oct 31 15:22:28 2013 +0100

return the switch arguments themselves

and rename the function to zos_an_forward instead of get_signature

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

commit 5b17a4e47cf939203a72978c34ab1b0591c4cd99
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Oct 30 17:20:01 2013 +0100

Add fos_an_reverse() to compute one abs-normal row at a time

interface is
enableMinMaxUsingAbs();
trace_on(tag,...);
...
trace_off();

sw = get_num_switches(tag);
get_signature(tag,m,n,sw,x,y,sig);
fo_an_reverse(tag,m,n,sw,rownum,rowvals);

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

commit 0bf35bd968d6f6a638ad3ce3dc89808b9cda4a9d
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Oct 30 15:22:21 2013 +0100

allocate and deallocate signature for a tape only once.

the number of switches remains the same always. Also the switch
locations need not be stored extra at all.

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

commit 6a60313b3c17367c0d47a9f5bc8b52888c0c4c8d
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Tue Oct 29 14:22:34 2013 +0100

Setting the signature is unnecessary it seems.

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

commit 096a33a6063d0eca4c6f137561f518c28390721b
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Oct 25 16:30:02 2013 +0200

Add interface for getting and setting of signature vectors

this takes into account that min and max should be computed using
abs but does not handle discontinuous elementary functions
only forward mode takes the user set signatures into account right now

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

Location:
trunk/ADOL-C/include/adolc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/include/adolc/interfaces.h

    r372 r441  
    433433(short, int, int, int, unsigned long int**, unsigned long int**);
    434434
     435/*--------------------------------------------------------------------------*/
     436ADOLC_DLL_EXPORT int get_num_switches(short);
     437ADOLC_DLL_EXPORT int zos_an_forward(short,int,int,int,double*,double*,double*);
     438/*--------------------------------------------------------------------------*/
     439ADOLC_DLL_EXPORT int fos_an_reverse(short,int,int,int,int,double*);
     440
    435441END_C_DECLS
    436442
  • trunk/ADOL-C/include/adolc/taping.h

    r439 r441  
    3737    TAY_BUFFER_SIZE,     /* # of taylors per buffer <= TBUFSIZE (usrparms.h) */
    3838    NUM_EQ_PROD,                      /* # of eq_*_prod for sparsity pattern */
     39    NO_MIN_MAX,  /* no use of min_op, deferred to abs_op for piecewise stuff */
     40    NUM_SWITCHES,                   /* # of abs calls that can switch branch */
    3941    STAT_SIZE                     /* represents the size of the stats vector */
    4042};
     
    5961ADOLC_DLL_EXPORT void ensureContiguousLocations(size_t n);
    6062
     63ADOLC_DLL_EXPORT void enableMinMaxUsingAbs();
     64ADOLC_DLL_EXPORT void disableMinMaxUsingAbs();
    6165/*
    6266 * free location block sorting/consolidation upon calls to ensureContiguousLocations
Note: See TracChangeset for help on using the changeset viewer.