Changeset 160


Ignore:
Timestamp:
Sep 15, 2010 1:30:57 PM (9 years ago)
Author:
kulshres
Message:

Squashed merge branch 'master' of 'gitclone' into svn

  • 'master' of 'gitclone': (4 commits) use unmanaged functions for recovery from colpack too fix test for sizeof_void_p in configure.ac wrap set_HP in #ifdef SPARSE for windows nosparse compilation version update after release

Details of the commits:

commit 7913137aacaca89674b60f5f858017e135201427
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Sep 15 16:01:44 2010 +0200

use unmanaged functions for recovery from colpack too

these pointers are returned to the user, and he may delete them when
he wishes, so we cannot expect ColPack? to memory manage them.

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

commit 66999f6a57b452498e2dc75162f02a2778b9ed89
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 10 15:32:02 2010 +0200

fix test for sizeof_void_p in configure.ac

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

commit 50ba17a10bb0141f6f15a332f4945230074d2d23
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Sep 8 14:05:40 2010 +0200

wrap set_HP in #ifdef SPARSE for windows nosparse compilation

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

commit b798110feb848e56e60d8092fd225ffd2cc19e34
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Sep 6 13:58:07 2010 +0200

version update after release

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

Location:
trunk
Files:
10 edited

Legend:

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

    r134 r160  
    11\newcommand{\packagename}{adolc}
    2 \newcommand{\packageversion}{2.1.8-trunk}
     2\newcommand{\packageversion}{2.1.9-trunk}
    33\newcommand{\packagetar}{\packagename-\packageversion}
  • trunk/ADOL-C/examples/additional_examples/sparse/sparse_hessian.cpp

    r147 r160  
    8989        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    9090
     91    delete[] rind;
     92    delete[] cind;
     93    delete[] values;
     94
    9195    options[0] = 0;          /*                               safe mode (default) */
    9296    options[1] = 1;          /*                                   direct recovery */
     
    98102        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    99103
     104    delete[] rind;
     105    delete[] cind;
     106    delete[] values;
     107
    100108/*--------------------------------------------------------------------------*/
    101109/*  change value of x, but not the sparsity pattern                         */
     
    120128        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    121129
     130    delete[] rind;
     131    delete[] cind;
     132    delete[] values;
    122133
    123134/****************************************************************************/
  • trunk/ADOL-C/examples/additional_examples/sparse/sparse_jacobian.cpp

    r147 r160  
    9494        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    9595
     96    delete[] rind;
     97    delete[] cind;
     98    delete[] values;
    9699/*--------------------------------------------------------------------------*/
    97100/*  same approach but using row compression                                 */
     
    108111        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    109112
     113    delete[] rind;
     114    delete[] cind;
     115    delete[] values;
    110116/*--------------------------------------------------------------------------*/
    111117/*  change value of x, but not the sparsity pattern                         */
     
    130136        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    131137
    132 
     138    delete[] rind;
     139    delete[] cind;
     140    delete[] values;
    133141/*--------------------------------------------------------------------------*/
    134142/*  same approach but using row compression                                 */
     
    145153        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    146154
     155    delete[] rind;
     156    delete[] cind;
     157    delete[] values;
    147158/****************************************************************************/
    148159/*******       sparse Jacobians, separate drivers             ***************/
  • trunk/ADOL-C/src/sparse/sparsedrivers.cpp

    r147 r160  
    367367 
    368368      if (options[3] == 1)
    369        jr1d->RecoverD2Row_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     369       jr1d->RecoverD2Row_CoordinateFormat_unmanaged(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    370370     else
    371        jr1d->RecoverD2Cln_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     371       jr1d->RecoverD2Cln_CoordinateFormat_unmanaged(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    372372
    373373    return ret_val;
     
    572572 
    573573     if (options[1] == 0)
    574        hr->IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     574       hr->IndirectRecover_CoordinateFormat_unmanaged(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    575575     else
    576        hr->DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     576       hr->DirectRecover_CoordinateFormat_unmanaged(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    577577 
    578578    return ret_val;
     
    595595    int            indep,      /* number of independent variables         */
    596596    unsigned int ** HP)
     597#ifdef SPARSE
    597598{
    598599    SparseHessInfos sHinfos;
     
    611612    setTapeInfoHessSparse(tag, sHinfos);
    612613}
    613 
     614#else
     615{
     616    fprintf(DIAG_OUT, "ADOL-C error: function %s can only be used if sparse configuration option was used\n", __FUNCTION__);
     617    exit(-1);
     618}
     619#endif
    614620/*****************************************************************************/
    615621/*                                                    JACOBIAN BLOCK PATTERN */
  • trunk/configure

    r153 r160  
    22# From configure.ac Revision.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.65 for adolc 2.1.8-trunk.
     4# Generated by GNU Autoconf 2.65 for adolc 2.1.9-trunk.
    55#
    66# Report bugs to <adol-c@list.coin-or.org>.
     
    703703PACKAGE_NAME='adolc'
    704704PACKAGE_TARNAME='adolc'
    705 PACKAGE_VERSION='2.1.8-trunk'
    706 PACKAGE_STRING='adolc 2.1.8-trunk'
     705PACKAGE_VERSION='2.1.9-trunk'
     706PACKAGE_STRING='adolc 2.1.9-trunk'
    707707PACKAGE_BUGREPORT='adol-c@list.coin-or.org'
    708708PACKAGE_URL=''
     
    14741474  # This message is too long to be a string in the A/UX 3.1 sh.
    14751475  cat <<_ACEOF
    1476 \`configure' configures adolc 2.1.8-trunk to adapt to many kinds of systems.
     1476\`configure' configures adolc 2.1.9-trunk to adapt to many kinds of systems.
    14771477
    14781478Usage: $0 [OPTION]... [VAR=VALUE]...
     
    15441544if test -n "$ac_init_help"; then
    15451545  case $ac_init_help in
    1546      short | recursive ) echo "Configuration of adolc 2.1.8-trunk:";;
     1546     short | recursive ) echo "Configuration of adolc 2.1.9-trunk:";;
    15471547   esac
    15481548  cat <<\_ACEOF
     
    16731673if $ac_init_version; then
    16741674  cat <<\_ACEOF
    1675 adolc configure 2.1.8-trunk
     1675adolc configure 2.1.9-trunk
    16761676generated by GNU Autoconf 2.65
    16771677
     
    23972397running configure, to aid debugging if configure makes a mistake.
    23982398
    2399 It was created by adolc $as_me 2.1.8-trunk, which was
     2399It was created by adolc $as_me 2.1.9-trunk, which was
    24002400generated by GNU Autoconf 2.65.  Invocation command line was
    24012401
     
    32103210# Define the identity of the package.
    32113211 PACKAGE='adolc'
    3212  VERSION='2.1.8-trunk'
     3212 VERSION='2.1.9-trunk'
    32133213
    32143214
     
    1515615156
    1515715157
    15158 if test "x$SIZEOF_VOID_P" = "x8" ; then
     15158if test "x$ac_cv_sizeof_void_p" = "x8" ; then
    1515915159   _lib=lib64
    1516015160else
     
    1581515815
    1581615816
    15817 $as_echo "#define ADOLC_PATCHLEVEL 8" >>confdefs.h
     15817$as_echo "#define ADOLC_PATCHLEVEL 9" >>confdefs.h
    1581815818
    1581915819ADOLC_VERSION=2
    1582015820ADOLC_SUBVERSION=1
    15821 ADOLC_PATCHLEVEL=8
     15821ADOLC_PATCHLEVEL=9
    1582215822
    1582315823
     
    1698916989# values after options handling.
    1699016990ac_log="
    16991 This file was extended by adolc $as_me 2.1.8-trunk, which was
     16991This file was extended by adolc $as_me 2.1.9-trunk, which was
    1699216992generated by GNU Autoconf 2.65.  Invocation command line was
    1699316993
     
    1705517055ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1705617056ac_cs_version="\\
    17057 adolc config.status 2.1.8-trunk
     17057adolc config.status 2.1.9-trunk
    1705817058configured by $0, generated by GNU Autoconf 2.65,
    1705917059  with options \\"\$ac_cs_config\\"
  • trunk/configure.ac

    r153 r160  
    1010define([ADOLC_VER], [2])
    1111define([ADOLC_SUB], [1])
    12 define([ADOLC_LVL], [8])
     12define([ADOLC_LVL], [9])
    1313
    1414AC_PREREQ(2.57)
     
    4646
    4747AC_CHECK_SIZEOF([void *])
    48 if test "x$SIZEOF_VOID_P" = "x8" ; then
     48if test "x$ac_cv_sizeof_void_p" = "x8" ; then
    4949   _lib=lib64
    5050else
  • trunk/windows/nosparse/config.h

    r153 r160  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    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.1.8-trunk"
     119#define PACKAGE_STRING "adolc 2.1.9-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-trunk"
     125#define PACKAGE_VERSION "2.1.9-trunk"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.8-trunk"
     140#define VERSION "2.1.9-trunk"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/windows/sparse/config.h

    r153 r160  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    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.1.8-trunk"
     119#define PACKAGE_STRING "adolc 2.1.9-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-trunk"
     125#define PACKAGE_VERSION "2.1.9-trunk"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.8-trunk"
     140#define VERSION "2.1.9-trunk"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/windows/x64/nosparse/config.h

    r153 r160  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    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.1.8-trunk"
     119#define PACKAGE_STRING "adolc 2.1.9-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-trunk"
     125#define PACKAGE_VERSION "2.1.9-trunk"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.8-trunk"
     140#define VERSION "2.1.9-trunk"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • trunk/windows/x64/sparse/config.h

    r153 r160  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 8
     14#define ADOLC_PATCHLEVEL 9
    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.1.8-trunk"
     119#define PACKAGE_STRING "adolc 2.1.9-trunk"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.8-trunk"
     125#define PACKAGE_VERSION "2.1.9-trunk"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.8-trunk"
     140#define VERSION "2.1.9-trunk"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
Note: See TracChangeset for help on using the changeset viewer.