Changeset 3067


Ignore:
Timestamp:
Dec 29, 2013 12:35:34 PM (6 years ago)
Author:
bradbell
Message:

merge in trunk changes, fix auto-tools install, improve run_cmake.sh

Location:
stable/20140000
Files:
1 added
2 deleted
36 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable/20140000

  • stable/20140000/bin/check_all.sh

    r2873 r3067  
    2626        fi
    2727        msg=`cat $top_srcdir/check_all.err`
    28         cat $top_srcdir/check_all.err
    29         rm $top_srcdir/check_all.err
    3028        if [ "$msg" != '' ]
    3129        then
     30                echo "$msg"
     31                echo 'Warning: see check_all.err'
    3232                exit 1
    3333        fi
     34        rm $top_srcdir/check_all.err
    3435}
    3536log_eval() {
     
    8586        fi
    8687done
    87 echo_log_eval bin/run_cmake.sh
     88echo_log_eval bin/run_cmake.sh --boost_vector
    8889echo_log_eval cd build
    8990# -----------------------------------------------------------------------------
  • stable/20140000/bin/jenkins.sh

    r3018 r3067  
    123123        $build_type \\
    124124        --disable-silent-rules \\
     125        --with-implicit_ctor \\
    125126        ADOLC_DIR="$trunk_dir/build/prefix" \\
    126127        SACADO_DIR="$trunk_dir/build/prefix" \\
     
    132133if ! $trunk_dir/configure $build_type \
    133134        --disable-silent-rules \
     135        --with-implicit_ctor \
    134136        ADOLC_DIR="$trunk_dir/build/prefix" \
    135137        SACADO_DIR="$trunk_dir/build/prefix" \
  • stable/20140000/bin/run_cmake.sh

    r3064 r3067  
    2222        eval $*
    2323}
    24 # ---------------------------------------------------------------------------
    25 # clean all variables in cmake cache
    26 cmake_args='-U .+'
    27 if [ "$1" != "" ]
    28 then
     24# -----------------------------------------------
     25verbose='no'
     26testvector='boost'
     27while [ "$1" != "" ]
     28do
    2929        if [ "$1" == '--verbose' ]
    3030        then
    31                 # echo each command that make executes
    32                 cmake_args="$cmake_args  -D CMAKE_VERBOSE_MAKEFILE=1"
     31                verbose='yes'
     32        elif [ "$1" == '--cppad_vector' ]
     33        then
     34                testvector='cppad'
     35        elif [ "$1" == '--boost_vector' ]
     36        then
     37                testvector='boost'
     38        elif [ "$1" == '--eigen_vector' ]
     39        then
     40                testvector='eigen'
    3341        else
    34                 echo 'usage: bin/run_cmake.sh: [--verbose]'
     42                options='[--verbose] [--<package>_vector]'
     43                echo "usage: bin/run_cmake.sh: $options"
     44                echo 'where <package> is cppad, boost, or eigen'
    3545                exit 1
    3646        fi
    37 fi
     47        shift
     48done
    3849if [ ! -e build ]
    3950then
     
    4152fi
    4253echo_eval cd build
     54# ---------------------------------------------------------------------------
     55# clean all variables in cmake cache
     56cmake_args='-U .+'
     57#
     58if [ "$verbose" == 'yes' ]
     59then
     60        # echo each command that make executes
     61        cmake_args="$cmake_args  -D CMAKE_VERBOSE_MAKEFILE=1"
     62fi
    4363# -----------------------------------------------------------------------------
    4464# cmake_install_prefix
     
    7797#
    7898# cppad_cxx_flags
    79 cmake_args="$cmake_args -D cppad_cxx_flags=\
    80 '-Wall -pedantic-errors -std=c++11 -Wshadow'"
     99cmake_args="$cmake_args -D cppad_cxx_flags='-Wall -pedantic-errors -std=c++11'"
     100if [ "$testvector" != 'eigen' ]
     101then
     102        cmake_args="$cmake_args -Wshadow"
     103fi
    81104#
    82105# simple options
     
    84107cmake_args="$cmake_args -D cppad_documentation=YES"
    85108cmake_args="$cmake_args -D cppad_sparse_list=YES"
    86 cmake_args="$cmake_args -D cppad_testvector=cppad"
     109cmake_args="$cmake_args -D cppad_testvector=$testvector"
    87110cmake_args="$cmake_args -D cppad_tape_id_type='int'"
    88111cmake_args="$cmake_args -D cppad_tape_addr_type=int"
  • stable/20140000/bin/svn_merge.sh

    r3064 r3067  
    3636#
    3737# Version of the repository corresponding to from_branch just before changes
    38 Start=3062
     38Start=3064
    3939#
    4040# Version of the repository corresponding to from_branch after the changes
    41 End=3063
     41End=3066
    4242#
    4343# the svn merge command
  • stable/20140000/build.sh

    r3030 r3067  
    227227CXX_FLAGS=\"$cxx_flags\" \\
    228228$special_types OPENMP_FLAGS=-fopenmp \\
    229 --with-sparse_list --with-Documentation
     229--with-sparse_list --with-Documentation \\
     230--with-implicit_ctor
    230231EOF
    231232        #
     
    234235                CXX_FLAGS="$cxx_flags" \
    235236                $special_types OPENMP_FLAGS=-fopenmp \
    236                 --with-sparse_list --with-Documentation
     237                --with-sparse_list --with-Documentation \
     238                --with-implicit_ctor
    237239        #
    238240        for file in $configure_file_list
  • stable/20140000/compare_c/makefile.in

    r2885 r3067  
    208208cppad_has_gettimeofday = @cppad_has_gettimeofday@
    209209cppad_has_nullptr = @cppad_has_nullptr@
     210cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    210211cppad_internal_sparse_set = @cppad_internal_sparse_set@
    211212cppad_libs = @cppad_libs@
  • stable/20140000/configure

    r3030 r3067  
    724724CppAD_POSTFIX_TRUE
    725725POSTFIX_DIR
     726cppad_implicit_ctor_from_any_type
    726727cppad_internal_sparse_set
    727728cppad_eigenvector
     
    799800with_sparse_set
    800801with_sparse_list
     802with_implicit_ctor
    801803enable_dependency_tracking
    802804'
     
    14661468  --with-sparse_set       default is not specified
    14671469  --with-sparse_list      default is not specified
     1470  --with-implicit_ctor    include an implicit AD<Base> constructor from any
     1471                          type
    14681472
    14691473Some influential environment variables:
     
    25432547yes) AM_DEFAULT_VERBOSITY=0;;
    25442548no)  AM_DEFAULT_VERBOSITY=1;;
    2545 *)   AM_DEFAULT_VERBOSITY=0;;
     2549*)   AM_DEFAULT_VERBOSITY=1;;
    25462550esac
    25472551am_make=${MAKE-make}
     
    29322936else
    29332937        cppad_internal_sparse_set=sparse_list
     2938
     2939fi
     2940
     2941
     2942{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-implicit_ctor" >&5
     2943$as_echo_n "checking --with-implicit_ctor... " >&6; }
     2944
     2945# Check whether --with-implicit_ctor was given.
     2946if test "${with_implicit_ctor+set}" = set; then :
     2947  withval=$with_implicit_ctor; implicit_ctor="yes"
     2948else
     2949  implicit_ctor="no"
     2950
     2951fi
     2952
     2953{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $implicit_ctor" >&5
     2954$as_echo "$implicit_ctor" >&6; }
     2955if test "$implicit_ctor" = "yes" ; then
     2956        cppad_implicit_ctor_from_any_type="1"
     2957
     2958else
     2959        cppad_implicit_ctor_from_any_type="0"
    29342960
    29352961fi
  • stable/20140000/configure.ac

    r3030 r3067  
    201201else
    202202        AC_SUBST(cppad_internal_sparse_set, sparse_list)
     203fi
     204
     205
     206dnl Are we including an implicit constructor from any type -----------
     207AC_MSG_CHECKING([--with-implicit_ctor])
     208AC_ARG_WITH(implicit_ctor,
     209        AC_HELP_STRING(
     210                [--with-implicit_ctor],
     211                [include an implicit AD<Base> constructor from any type]
     212        ),
     213        [implicit_ctor="yes"],
     214        [implicit_ctor="no"]
     215)
     216AC_MSG_RESULT([$implicit_ctor])
     217if test "$implicit_ctor" = "yes" ; then
     218        AC_SUBST(cppad_implicit_ctor_from_any_type, "1")
     219else
     220        AC_SUBST(cppad_implicit_ctor_from_any_type, "0")
    203221fi
    204222
  • stable/20140000/cppad/example/cppad_eigen.hpp

    r3041 r3067  
    7070$cref/simple vectors/SimpleVector/$$.
    7171$codep */
    72 # include <cppad/cppad.hpp>
    7372# define EIGEN_MATRIXBASE_PLUGIN <cppad/example/eigen_plugin.hpp>
    7473# include <Eigen/Core>
     74# include <cppad/cppad.hpp>
    7575/* $$
    7676$head Eigen NumTraits$$
  • stable/20140000/cppad/local/undef.hpp

    r3064 r3067  
    5151# undef CppADTrackNewVec      deprecated version of CPPAD_TRACK_NEW_VEC
    5252# undef CppADvector           deprecated version of CPPAD_TEST_VECTOR
     53
     54// for conditional testing when implicit conversion is not present
     55# undef CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
    5356-----------------------------------------------------------------------------
    5457*/
     
    6770# undef CPPAD_HAS_GETTIMEOFDAY
    6871# undef CPPAD_HAS_NULLPTR
    69 # undef CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
    7072# undef CPPAD_INLINE_FRIEND_TEMPLATE_FUNCTION
    7173# undef CPPAD_MAX_NUM_CAPACITY
  • stable/20140000/cppad_ipopt/example/makefile.in

    r2885 r3067  
    224224cppad_has_gettimeofday = @cppad_has_gettimeofday@
    225225cppad_has_nullptr = @cppad_has_nullptr@
     226cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    226227cppad_internal_sparse_set = @cppad_internal_sparse_set@
    227228cppad_libs = @cppad_libs@
  • stable/20140000/cppad_ipopt/speed/makefile.in

    r2885 r3067  
    228228cppad_has_gettimeofday = @cppad_has_gettimeofday@
    229229cppad_has_nullptr = @cppad_has_nullptr@
     230cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    230231cppad_internal_sparse_set = @cppad_internal_sparse_set@
    231232cppad_libs = @cppad_libs@
  • stable/20140000/cppad_ipopt/src/makefile.in

    r2885 r3067  
    261261cppad_has_gettimeofday = @cppad_has_gettimeofday@
    262262cppad_has_nullptr = @cppad_has_nullptr@
     263cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    263264cppad_internal_sparse_set = @cppad_internal_sparse_set@
    264265cppad_libs = @cppad_libs@
  • stable/20140000/cppad_ipopt/test/makefile.in

    r2885 r3067  
    214214cppad_has_gettimeofday = @cppad_has_gettimeofday@
    215215cppad_has_nullptr = @cppad_has_nullptr@
     216cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    216217cppad_internal_sparse_set = @cppad_internal_sparse_set@
    217218cppad_libs = @cppad_libs@
  • stable/20140000/example/atomic/makefile.in

    r3015 r3067  
    222222cppad_has_gettimeofday = @cppad_has_gettimeofday@
    223223cppad_has_nullptr = @cppad_has_nullptr@
     224cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    224225cppad_internal_sparse_set = @cppad_internal_sparse_set@
    225226cppad_libs = @cppad_libs@
  • stable/20140000/example/ipopt_solve/makefile.in

    r2885 r3067  
    213213cppad_has_gettimeofday = @cppad_has_gettimeofday@
    214214cppad_has_nullptr = @cppad_has_nullptr@
     215cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    215216cppad_internal_sparse_set = @cppad_internal_sparse_set@
    216217cppad_libs = @cppad_libs@
  • stable/20140000/example/makefile.in

    r2995 r3067  
    324324cppad_has_gettimeofday = @cppad_has_gettimeofday@
    325325cppad_has_nullptr = @cppad_has_nullptr@
     326cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    326327cppad_internal_sparse_set = @cppad_internal_sparse_set@
    327328cppad_libs = @cppad_libs@
  • stable/20140000/introduction/exp_apx/makefile.in

    r2885 r3067  
    224224cppad_has_gettimeofday = @cppad_has_gettimeofday@
    225225cppad_has_nullptr = @cppad_has_nullptr@
     226cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    226227cppad_internal_sparse_set = @cppad_internal_sparse_set@
    227228cppad_libs = @cppad_libs@
  • stable/20140000/introduction/get_started/makefile.in

    r2885 r3067  
    209209cppad_has_gettimeofday = @cppad_has_gettimeofday@
    210210cppad_has_nullptr = @cppad_has_nullptr@
     211cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    211212cppad_internal_sparse_set = @cppad_internal_sparse_set@
    212213cppad_libs = @cppad_libs@
  • stable/20140000/makefile.in

    r2995 r3067  
    274274cppad_has_gettimeofday = @cppad_has_gettimeofday@
    275275cppad_has_nullptr = @cppad_has_nullptr@
     276cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    276277cppad_internal_sparse_set = @cppad_internal_sparse_set@
    277278cppad_libs = @cppad_libs@
  • stable/20140000/multi_thread/makefile.in

    r2885 r3067  
    249249cppad_has_gettimeofday = @cppad_has_gettimeofday@
    250250cppad_has_nullptr = @cppad_has_nullptr@
     251cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    251252cppad_internal_sparse_set = @cppad_internal_sparse_set@
    252253cppad_libs = @cppad_libs@
  • stable/20140000/multi_thread/test_multi/makefile.in

    r2885 r3067  
    208208cppad_has_gettimeofday = @cppad_has_gettimeofday@
    209209cppad_has_nullptr = @cppad_has_nullptr@
     210cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    210211cppad_internal_sparse_set = @cppad_internal_sparse_set@
    211212cppad_libs = @cppad_libs@
  • stable/20140000/omh/install/unix.omh

    r2740 r3067  
    1515$dollar ^$$
    1616$spell
     17        ctor
    1718        testvector
    1819        Eigen
     
    105106        --with-%test%vector                       \ 
    106107        --with-sparse_%option%                    \
     108        --with-implicit_ctor                    \
    107109        MAX_NUM_THREADS=%max_num_threads%         \
    108110        CXX_FLAGS=%cxx_flags%                     \
     
    313315$cref sparse_jacobian$$, $cref sparse_hessian$$, and the
    314316$cref/sparse drivers/sparse/$$.
     317
     318$head --with-implicit_ctor$$
     319$index ctor, implicit or explicit$$
     320$index implicit, ctor$$
     321$index explicit, ctor$$
     322If this configure argument is present, there is a
     323$cref/deprecated/ad_ctor/x/deprecated/$$
     324implicit type constructor (type conversion)
     325from any type to $codei%AD<%Base%>%$$.
     326Otherwise this constructor is
     327$cref/explicit/ad_ctor/x/explicit/$$.
     328
    315329
    316330$head max_num_threads$$
  • stable/20140000/omh/whats_new/whats_new_13.omh

    r3064 r3067  
    6363assist you in learning about changes between various versions of CppAD.
    6464
     65$head 12-29$$
     66$list number$$
     67The include file
     68$cref cppad_eigen.hpp$$ now automatically includes $code cppad.hpp$$.
     69There was a problem with this automation
     70when $code eigen$$ was used for the cppad
     71$cref testvector$$.
     72This has been fixed.
     73$lnext
     74There was a problem with deprecated $cref InstallUnix$$
     75(created when optional implicit constructor from any type was added).
     76This has been fixed by adding the
     77$cref/--with-implicit_ctor/InstallUnix/--with-implicit_ctor/$$ option.
     78$lend
     79
    6580$head 12-27$$
    6681The constructor from an arbitrary type to $codei%AD<%Base%>%$$ was
  • stable/20140000/print_for/makefile.in

    r2885 r3067  
    208208cppad_has_gettimeofday = @cppad_has_gettimeofday@
    209209cppad_has_nullptr = @cppad_has_nullptr@
     210cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    210211cppad_internal_sparse_set = @cppad_internal_sparse_set@
    211212cppad_libs = @cppad_libs@
  • stable/20140000/speed/adolc/makefile.in

    r2941 r3067  
    226226cppad_has_gettimeofday = @cppad_has_gettimeofday@
    227227cppad_has_nullptr = @cppad_has_nullptr@
     228cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    228229cppad_internal_sparse_set = @cppad_internal_sparse_set@
    229230cppad_libs = @cppad_libs@
  • stable/20140000/speed/cppad/makefile.in

    r2885 r3067  
    226226cppad_has_gettimeofday = @cppad_has_gettimeofday@
    227227cppad_has_nullptr = @cppad_has_nullptr@
     228cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    228229cppad_internal_sparse_set = @cppad_internal_sparse_set@
    229230cppad_libs = @cppad_libs@
  • stable/20140000/speed/double/makefile.in

    r2885 r3067  
    216216cppad_has_gettimeofday = @cppad_has_gettimeofday@
    217217cppad_has_nullptr = @cppad_has_nullptr@
     218cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    218219cppad_internal_sparse_set = @cppad_internal_sparse_set@
    219220cppad_libs = @cppad_libs@
  • stable/20140000/speed/example/makefile.in

    r2885 r3067  
    217217cppad_has_gettimeofday = @cppad_has_gettimeofday@
    218218cppad_has_nullptr = @cppad_has_nullptr@
     219cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    219220cppad_internal_sparse_set = @cppad_internal_sparse_set@
    220221cppad_libs = @cppad_libs@
  • stable/20140000/speed/fadbad/makefile.in

    r2885 r3067  
    216216cppad_has_gettimeofday = @cppad_has_gettimeofday@
    217217cppad_has_nullptr = @cppad_has_nullptr@
     218cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    218219cppad_internal_sparse_set = @cppad_internal_sparse_set@
    219220cppad_libs = @cppad_libs@
  • stable/20140000/speed/profile/makefile.in

    r2885 r3067  
    230230cppad_has_gettimeofday = @cppad_has_gettimeofday@
    231231cppad_has_nullptr = @cppad_has_nullptr@
     232cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    232233cppad_internal_sparse_set = @cppad_internal_sparse_set@
    233234cppad_libs = @cppad_libs@
  • stable/20140000/speed/sacado/makefile.in

    r2885 r3067  
    216216cppad_has_gettimeofday = @cppad_has_gettimeofday@
    217217cppad_has_nullptr = @cppad_has_nullptr@
     218cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    218219cppad_internal_sparse_set = @cppad_internal_sparse_set@
    219220cppad_libs = @cppad_libs@
  • stable/20140000/speed/src/makefile.in

    r2885 r3067  
    218218cppad_has_gettimeofday = @cppad_has_gettimeofday@
    219219cppad_has_nullptr = @cppad_has_nullptr@
     220cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    220221cppad_internal_sparse_set = @cppad_internal_sparse_set@
    221222cppad_libs = @cppad_libs@
  • stable/20140000/test_more/cppad_eigen.cpp

    r3062 r3067  
    1616*/
    1717# include <cppad/example/cppad_eigen.hpp>
    18 # include <cppad/cppad.hpp>
    1918
    2019bool cppad_eigen(void)
     
    5756        ok &= "1" == stream_out.str();
    5857
     58# if ! CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
    5959        // multiplying three matrices together used to cause warning
    6060        // before making ctor from arbitrary type to AD<Base> explicit.
     
    6666        D      = A * B * C;
    6767        ok    &= D(0,0) == 6.0 ;
     68# endif
    6869       
    6970        return ok;
  • stable/20140000/test_more/makefile.in

    r2940 r3067  
    292292cppad_has_gettimeofday = @cppad_has_gettimeofday@
    293293cppad_has_nullptr = @cppad_has_nullptr@
     294cppad_implicit_ctor_from_any_type = @cppad_implicit_ctor_from_any_type@
    294295cppad_internal_sparse_set = @cppad_internal_sparse_set@
    295296cppad_libs = @cppad_libs@
Note: See TracChangeset for help on using the changeset viewer.