Changeset 375 for trunk/ADOL-C/include


Ignore:
Timestamp:
Dec 14, 2012 6:22:48 AM (7 years ago)
Author:
kulshres
Message:

Move some options out of usrparms.h

These should be set using the configure script arguments and are
now in a new generated header file that will be installed via
make install. This include ATRIG_ERF, and the typedefs for locint/revreal
A new option ADOLC_ADVANCED_BRANCHING is also created.

ADOLC_USE_CALLOC goes into config.h as this is only required for build
but not after installation

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

Location:
trunk/ADOL-C/include/adolc
Files:
1 added
3 edited

Legend:

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

    r354 r375  
    1616                       externfcts.h checkpointing.h fixpoint.h\
    1717                       adolc_sparse.h adolc_openmp.h \
    18                        revolve.h advector.h
     18                       revolve.h advector.h adolc_settings.h
    1919
    2020SUBDIRS = drivers tapedoc
     21
     22EXTRA_DIST = adolc_settings.h.in
    2123
    2224if SPARSE
  • trunk/ADOL-C/include/adolc/common.h

    r354 r375  
    1717#define ADOLC_COMMON_H 1
    1818
     19#include <stdint.h>
    1920/*--------------------------------------------------------------------------*/
    2021/* standard includes */
     
    7980#include <adolc/dvlparms.h>
    8081#include <adolc/usrparms.h>
     82#include <adolc/adolc_settings.h>
    8183
    8284/*--------------------------------------------------------------------------*/
  • trunk/ADOL-C/include/adolc/usrparms.h

    r354 r375  
    3535
    3636/*--------------------------------------------------------------------------*/
    37 /* ADOL-C data types */
    38 #define locint     unsigned int                /* ensure locint is unsigned */
    39 #define revreal    double
    40 
    41 /*--------------------------------------------------------------------------*/
    4237/* Data types used by Fortran callable versions of functions */
    4338#define fint       long
     
    5247#define ADOLC_EPS  10E-20  /* for test on zero                            */
    5348
    54 /*--------------------------------------------------------------------------*/
    55 /* Enable/disable asinh, acosh,atanh, erf */
    56 #undef ATRIG_ERF
    57 /* #define ATRIG_ERF 1 */
    58 
    5949/****************************************************************************/
    6050/* Standard output used for diagnostics by ADOL-C,                          */
    6151/* e.g. stdout or stderr or whatever file identifier                        */
    6252#define DIAG_OUT stderr
    63 
    64 /*--------------------------------------------------------------------------*/
    65 /* Use 'calloc' instead of 'malloc' in ADOL-C allocation routines. If you   */
    66 /* have any trouble with uninitialized memory, then define ADOLC_USE_CALLOC.*/
    67 #define ADOLC_USE_CALLOC 1
    6853
    6954/*--------------------------------------------------------------------------*/
Note: See TracChangeset for help on using the changeset viewer.