Changeset 639


Ignore:
Timestamp:
Dec 2, 2015 5:48:01 AM (4 years ago)
Author:
kulshres
Message:

Merge branch 'pwsmooth' via 'master' into 'svn'

The following commits were merged:

commit 69054894c6c15baf4f1a4cb2670a4d1b7fd282b6
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 18 15:08:46 2015 +0200

add psdriversf.c to Makefile

commit b0ffeb28a7f7ae2beb592cc6bc8e45cdc8660dbb
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 18 15:05:28 2015 +0200

small bugfixes in fortran abs_normal

commit 4854bd634767c497e8b95a62e300865082302d3d
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 18 14:54:44 2015 +0200

create the fortran interface for abs_normal

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

commit 3b56c7cefacc9aeef6cac1ab5eeb6c5ff778392c
Author: Andrea Walther <awalther@…>
Date: Fri Sep 18 12:52:52 2015 +0200

-m"first version of directional_active_gradient working"

commit 8493b945b5d74ff80506e3f3040b28c3445db1cc
Author: Andrea Walther <awalther@…>
Date: Fri Sep 18 12:30:41 2015 +0200

zos_pl_reverse in directional_active_gradient

commit 1da8f554589718c4dac9ada0771668b6c850715f
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 18 12:30:24 2015 +0200

add a sanity check for number of switches

commit a274e10ab191f6029951bf015e206e1a6fc4c2dc
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 18 11:48:36 2015 +0200

added return to avoid "no return in non-void" error in pedantic compilers

commit 96f861841ac0d163626502fd7edd6deb6acd927c
Author: Andrea Walther <awalther@…>
Date: Fri Sep 18 11:44:42 2015 +0200

-m"fos_pl_sig_reverse call in psdrivers"

commit 0a9765bb9b6e80772596cb0c0b561184e1a4da67
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 18 11:41:22 2015 +0200

reduce memory usage in abs_normal() and also number of loops

commit 49b3675904683db4ce983d8d038e114da6c09fa3
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 18 11:01:30 2015 +0200

corrected usage of memset

commit 26a209a4f80e57757ec39bb62c85f6f04704ed1c
Author: Andrea Walther <awalther@…>
Date: Fri Sep 18 10:55:22 2015 +0200

fov_pl_sig without keep
new fos_pl_sig_reverse

commit f1720bfcd347a5f2e3917009a63a1e2ce1ed9749
Author: Andrea Walther <awalther@…>
Date: Fri Sep 18 09:43:03 2015 +0200

fov_pl_sig with keep

commit 08629c0f66e024729f05f55eaa2297ea7d5456ec
Author: Andrea Walther <awalther@…>
Date: Fri Sep 18 09:36:34 2015 +0200

next version psdrivers

commit f10b9debd97f14896294f09404ceb1e5d529ffed
Author: Andrea Walther <awalther@…>
Date: Thu Sep 17 15:49:48 2015 +0200

next version psdrivers

commit 76510d9940be38dd6dc0c81df6a82db0573fb39d
Author: Andrea Walther <awalther@…>
Date: Sat Sep 12 17:08:52 2015 +0200

psdriver first version

Location:
trunk/ADOL-C
Files:
4 added
7 edited

Legend:

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

    r562 r639  
    4444#include <adolc/drivers/taylor.h>     /* higher order tensors & inverse/implicit functions */
    4545#include <adolc/drivers/odedrivers.h> /* ordinary differential equations */
     46#include <adolc/drivers/psdrivers.h> /* piecewise smooth functions */
    4647
    4748/*--------------------------------------------------------------------------*/
  • trunk/ADOL-C/include/adolc/drivers/Makefile.am

    r354 r639  
    1313libdriversincludedir      = $(pkgincludedir)/drivers
    1414
    15 libdriversinclude_HEADERS = drivers.h odedrivers.h taylor.h
     15libdriversinclude_HEADERS = drivers.h odedrivers.h psdrivers.h taylor.h
    1616
  • trunk/ADOL-C/include/adolc/interfaces.h

    r591 r639  
    446446/*--------------------------------------------------------------------------*/
    447447ADOLC_DLL_EXPORT int fos_pl_reverse(short,int,int,int,int,double*);
     448ADOLC_DLL_EXPORT int fos_pl_sig_reverse(short,int,int,int,short*,double*,double*);
    448449
    449450END_C_DECLS
  • trunk/ADOL-C/src/Makefile.am

    r623 r639  
    4646                       fos_reverse.c fov_reverse.c \
    4747                       hos_reverse.c hos_ov_reverse.c hov_reverse.c \
    48                        forward_partx.c zos_pl_forward.c fos_pl_reverse.c \
     48                       forward_partx.c zos_pl_forward.c fos_pl_reverse.c fos_pl_sig_reverse.c \
    4949                       fos_pl_forward.c fov_pl_forward.c fos_pl_sig_forward.c \
    5050                       fov_pl_sig_forward.c externfcts.cpp checkpointing.cpp \
  • trunk/ADOL-C/src/drivers/Makefile.am

    r439 r639  
    2121
    2222libdrivers_la_SOURCES     = drivers.c driversf.c odedrivers.c odedriversf.c \
    23                             taylor.c
     23                            psdrivers.c psdriversf.c taylor.c
  • trunk/ADOL-C/src/fo_rev.c

    r615 r639  
    6767#define GENERATED_FILENAME "fos_pl_reverse"
    6868#else
     69#ifdef _ABS_NORM_SIG_
     70#define GENERATED_FILENAME "fos_pl_sig_reverse"
     71#else
    6972#define GENERATED_FILENAME "fos_reverse"
     73#endif
    7074#endif
    7175
     
    233237                   int    rownum,   /* required row no. of abs-normal form */
    234238                   double *results) /*  coefficient vectors */
     239#elif defined(_ABS_NORM_SIG_)
     240/****************************************************************************/
     241/* Abs-Normal extended adjoint row computation.                             */
     242/****************************************************************************/
     243int fos_pl_sig_reverse(short  tnum,     /* tape id */
     244                   int    depen,     /* consistency chk on # of deps */
     245                   int    indep,     /* consistency chk on # of indeps */
     246                   int    swchk,    /* consistency chk on # of switches */
     247                   short   *siggrad,
     248                   double  *lagrange,
     249                   double *results) /*  coefficient vectors */
    235250#else
    236251int fos_reverse(short   tnum,       /* tape id */
     
    301316
    302317    int indexi = 0,  indexd = 0;
    303 #if defined(_ABS_NORM_)
     318#if defined(_ABS_NORM_) || defined(_ABS_NORM_SIG_)
    304319    int switchnum;
    305320#endif
     
    439454    indexd = ADOLC_CURRENT_TAPE_INFOS.stats[NUM_DEPENDENTS] - 1;
    440455
    441 #if defined(_ABS_NORM_)
     456#if defined(_ABS_NORM_) || defined(_ABS_NORM_SIG_)
    442457    if (! ADOLC_CURRENT_TAPE_INFOS.stats[NO_MIN_MAX] ) {
    443458        fprintf(DIAG_OUT, "ADOL-C error: Tape %d was not created compatible "
     
    17341749
    17351750                /*--------------------------------------------------------------------------*/
    1736             case abs_val:                                              /* abs_val */
     1751            case abs_val:                                                        /* abs_val */
    17371752                res   = get_locint_r();
    17381753                arg   = get_locint_r();
     
    17541769                        ARES = 0.0;
    17551770                    }
     1771                    switchnum--;
     1772#elif defined(_ABS_NORM_SIG_)
     1773                    aTmp = ARES;
     1774                    ARES_INC = 0.0;
     1775                    AARG_INC += siggrad[switchnum]*aTmp;
    17561776                    switchnum--;
    17571777#else
  • trunk/ADOL-C/src/uni5_for.c

    r608 r639  
    6161#if defined(_ABS_NORM_)
    6262#  define GENERATED_FILENAME "zos_pl_forward"
     63#elif defined(_ABS_NORM_SIG_)
     64#  define GENERATED_FILENAME "zos_pl_sig_forward"
    6365#else
    6466#  define GENERATED_FILENAME "zos_forward"
Note: See TracChangeset for help on using the changeset viewer.