Changeset 2754


Ignore:
Timestamp:
Feb 20, 2013 11:55:55 PM (7 years ago)
Author:
bradbell
Message:
  1. Advance version number to 20130220.
  2. Add the cppad_c11_flag to cmake command, and CPPAD_CPP11 preprocessor symbol.
  3. Use cppad_c11_flag during cmake testing, not avaialble through auto-tools.
  4. Fix checking to configure.hpp in makefile.am (create by configure/make).
  5. Fix places where add_cppad_cxx_flags was missing.
  6. Surpress c++11 when compiling Sacado speed tests.

team_bthread.cpp: Correct CPPAD_NULL that should be a zero.

Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/AUTHORS

    r2709 r2754  
    22             ===========================================
    33
    4 To date, 2013-01-02, Bradley M. Bell is the sole author of CppAD.
     4To date, 2013-02-20, Bradley M. Bell is the sole author of CppAD.
    55While Bradley M. Bell worked for the University of Washington during
    66the development of CppAD, the following are also true:
  • trunk/CMakeLists.txt

    r2752 r2754  
    1717
    1818# cppad_version is used by set_version.sh to get the version number.
    19 SET(cppad_version      "20130102" )
     19SET(cppad_version      "20130220" )
    2020SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2121SET(cppad_description  "Differentiation of C++ Algorithms" )
     
    116116                SET(cxx_flags "${cppad_cxx_flags}")
    117117        ENDIF( no_shadow )
     118        # sacado does not compile under c++11
     119        IF( NOT ( ${target_name} STREQUAL speed_sacado) )
     120                IF( cppad_c11_flag )
     121                        IF( cxx_flags )
     122                                SET(cxx_flags "${cppad_c11_flag} ${cxx_flags}" )
     123                        ELSE( cxx_flags )
     124                                SET(cxx_flags "${cppad_c11_flag}" )
     125                        ENDIF( cxx_flags )
     126                ENDIF( cppad_c11_flag )
     127        ENDIF( NOT ( ${target_name} STREQUAL speed_sacado) )
    118128        IF( cxx_flags )
    119129                SET_TARGET_PROPERTIES(
     
    153163)
    154164# -----------------------------------------------------------------------------
     165# cppad_use_c11_flag
     166command_line_arg(cppad_c11_flag NOTFOUND STRING
     167        "If this flag is present, it gets get c++11 complinace from compiler"
     168)
     169# -----------------------------------------------------------------------------
    155170# cppad_cxx_flags
    156171command_line_arg(cppad_cxx_flags NOTFOUND STRING
    157         "extra flags used with cppad source (besides debug and release flags)"
     172        "extra flags used with cppad source (besides debug, release, c11 flags)"
    158173)
    159174# -----------------------------------------------------------------------------
  • trunk/bin/check_all.sh

    r2752 r2754  
    118118        fi
    119119done
    120 cmake_args="$cmake_args -D cppad_cxx_flags=\
    121 '-Wall -ansi -pedantic-errors -std=c++98 -Wshadow'"
     120cmake_args="$cmake_args -D cppad_c11_flag='-std=c++11'"
     121cmake_args="$cmake_args -D cppad_cxx_flags='-Wall -pedantic-errors -Wshadow'"
    122122cmake_args="$cmake_args -D cppad_documentation=YES"
    123123#
  • trunk/bin/check_makefile.sh

    r2683 r2754  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
     
    2626        cppad/ipopt/*.hpp \
    2727        cppad/speed/*.hpp  | \
    28         sed -e '/^cppad\/config\.h$/d' | \
     28        sed -e '/^cppad\/configure.hpp/d' -e '/^cppad\/config\.h$/d' | \
    2929        sort > check_makefile1.$$
    3030#
  • trunk/configure

    r2709 r2754  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.68 for cppad 20130102.
     3# Generated by GNU Autoconf 2.68 for cppad 20130220.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    561561PACKAGE_NAME='cppad'
    562562PACKAGE_TARNAME='cppad'
    563 PACKAGE_VERSION='20130102'
    564 PACKAGE_STRING='cppad 20130102'
     563PACKAGE_VERSION='20130220'
     564PACKAGE_STRING='cppad 20130220'
    565565PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    566566PACKAGE_URL=''
     
    688688CFLAGS
    689689CC
     690CPPAD_CPP11
    690691CPPAD_TAPE_ID_TYPE
    691692TAPE_ID_TYPE
     
    13631364  # This message is too long to be a string in the A/UX 3.1 sh.
    13641365  cat <<_ACEOF
    1365 \`configure' configures cppad 20130102 to adapt to many kinds of systems.
     1366\`configure' configures cppad 20130220 to adapt to many kinds of systems.
    13661367
    13671368Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14291430if test -n "$ac_init_help"; then
    14301431  case $ac_init_help in
    1431      short | recursive ) echo "Configuration of cppad 20130102:";;
     1432     short | recursive ) echo "Configuration of cppad 20130220:";;
    14321433   esac
    14331434  cat <<\_ACEOF
     
    15551556if $ac_init_version; then
    15561557  cat <<\_ACEOF
    1557 cppad configure 20130102
     1558cppad configure 20130220
    15581559generated by GNU Autoconf 2.68
    15591560
     
    21792180running configure, to aid debugging if configure makes a mistake.
    21802181
    2181 It was created by cppad $as_me 20130102, which was
     2182It was created by cppad $as_me 20130220, which was
    21822183generated by GNU Autoconf 2.68.  Invocation command line was
    21832184
     
    31683169$as_echo "$as_me: ********** End Checking Command Line arguments ***************" >&6;}
    31693170
     3171CPPAD_CPP11=0
     3172
     3173
    31703174ac_ext=c
    31713175ac_cpp='$CPP $CPPFLAGS'
     
    49844988# Define the identity of the package.
    49854989 PACKAGE='cppad'
    4986  VERSION='20130102'
     4990 VERSION='20130220'
    49874991
    49884992
     
    80368040# values after options handling.
    80378041ac_log="
    8038 This file was extended by cppad $as_me 20130102, which was
     8042This file was extended by cppad $as_me 20130220, which was
    80398043generated by GNU Autoconf 2.68.  Invocation command line was
    80408044
     
    80938097ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    80948098ac_cs_version="\\
    8095 cppad config.status 20130102
     8099cppad config.status 20130220
    80968100configured by $0, generated by GNU Autoconf 2.68,
    80978101  with options \\"\$ac_cs_config\\"
  • trunk/configure.ac

    r2709 r2754  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT(cppad, 20130102, cppad@list.coin-or.org)
     15AC_INIT(cppad, 20130220, cppad@list.coin-or.org)
    1616
    1717dnl By defalut disable maintainer mode when running configure;
     
    417417fi
    418418AC_MSG_NOTICE([********** End Checking Command Line arguments ***************])
     419
     420dnl auto-tools version cannot use c++11 compiler
     421AC_SUBST(CPPAD_CPP11, 0)
    419422
    420423dnl Determine if size_t has same size as unsigned int
  • trunk/cppad/CMakeLists.txt

    r2752 r2754  
    2828# command line arguments
    2929#
    30 #
    3130# cppad_testvector
    3231command_line_arg(cppad_testvector cppad STRING
     
    5251"type used to identify variables on one tape, size must be <= sizeof(size_t)"
    5352)
     53# ----------------------------------------------------------------------------
     54# CPPAD_CPP11
     55#
     56IF( cppad_c11_flag )
     57        SET(CPPAD_CPP11  1)
     58ELSE( cppad_c11_flag )
     59        SET(CPPAD_CPP11  0)
     60ENDIF( cppad_c11_flag )
    5461# -----------------------------------------------------------------------------
    5562# CPPAD_INTERNAL_SPARSE_SET
  • trunk/cppad/configure.hpp.in

    r2625 r2754  
    44
    55/* --------------------------------------------------------------------------
    6 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     6CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    77
    88CppAD is distributed under multiple licenses. This distribution is under
     
    4646*/
    4747# define CPPAD_PACKAGE_STRING "cppad-@cppad_version@"
     48
     49/*!
     50def CPPAD_CPP11
     51is this a c++11 compliant compiler, 1 (yes) or 0 (no).
     52CPPAD_NO_CPP11 is used by the Sacado speed test to surpress using c++11
     53because Sacado does not support it.
     54*/
     55# ifdef CPPAD_NO_CPP11
     56# define CPPAD_CPP11 0
     57# else
     58# define CPPAD_CPP11 @CPPAD_CPP11@
     59# endif
    4860 
    4961 /*!
  • trunk/cppad/local/define.hpp

    r2625 r2754  
    44
    55/* --------------------------------------------------------------------------
    6 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     6CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    77
    88CppAD is distributed under multiple licenses. This distribution is under
     
    9292*/
    9393# ifndef CPPAD_NULL
     94# if CPPAD_CPP11
     95# define CPPAD_NULL     nullptr 
     96# else
    9497# define CPPAD_NULL     0
     98# endif
    9599# endif
    96100 
  • trunk/cppad_ipopt/test/CMakeLists.txt

    r2683 r2754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    3232        retape_k1_l2.cpp
    3333)
     34add_cppad_cxx_flags(test_more_ipopt_nlp)
    3435
    3536# List of libraries to be linked into the specified target
  • trunk/doc.omh

    r2709 r2754  
    5151$comment bin/version assumes that : follows cppad version number here$$
    5252$section
    53 cppad-20130102: A Package for Differentiation of C++ Algorithms
     53cppad-20130220: A Package for Differentiation of C++ Algorithms
    5454$$
    5555
  • trunk/multi_thread/bthread/team_bthread.cpp

    r2506 r2754  
    11// $Id$
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    9393        {       bool ok = wait_for_work_ != CPPAD_NULL;
    9494                ok     &= wait_for_job_  != CPPAD_NULL;
    95                 ok     &= thread_num     != CPPAD_NULL;
     95                ok     &= thread_num     != 0;
    9696
    9797                // thread specific storage of thread number for this thread
  • trunk/omh/install/cmake.omh

    r2752 r2754  
    9797        -D sacado_prefix=%sacado_prefix%                             \
    9898        \
     99        -D cppad_c11_flag=%cppad_c11_flag%                         \
    99100        -D cppad_cxx_flags=%cppad_cxx_flags%                         \
    100101        -D cppad_documentation=%cppad_documentation%                 \
     
    221222$rref sacado_prefix$$
    222223$tend
     224
     225$head cppad_c11_flag$$
     226$index c++11, compile flag$$
     227$index compile, c++11 flag$$
     228$index flags, c++11 compile$$
     229This specifies the compiler flag that gives c++11 compliance.
     230For example, if you are using $code g++$$ you could specify
     231$codep
     232        -D cppad_c11_flag='-std=c++11'
     233$$
     234If you have partial compliance, using this flag may or many not work.
     235If you get an error because the compiler only partially implements this
     236standard, omit this flag.
     237There is once exception to this run,
     238Sacado does not support c++11 so this flags is suppressed
     239when compiling the routines used by $cref speed_sacado$$.
    223240
    224241$head cppad_cxx_flags$$
  • trunk/omh/install/download.omh

    r2740 r2754  
    6161
    6262$table
    63 EPL License $pre  $$ $cnext $href%cppad-20130102.epl.tgz%$$
     63EPL License $pre  $$ $cnext $href%cppad-20130220.epl.tgz%$$
    6464$rnext
    65 GPL License $pre  $$ $cnext $href%cppad-20130102.gpl.tgz%$$
     65GPL License $pre  $$ $cnext $href%cppad-20130220.gpl.tgz%$$
    6666$tend
    6767
  • trunk/omh/whats_new/whats_new_13.omh

    r2752 r2754  
    3636
    3737$head 02-20$$
     38$list number$$
    3839The documentation for the $cref cmake$$ install option
    3940$code cppad_test_vector_namespace$$ was fixed to be
     
    4142This was also fixed for the
    4243$cref/eigen test vector/eigen_prefix/Test Vector/$$ documentation.
    43 
     44$lnext
     45An option to specify that the compiler supports c++11 constructs,
     46$cref/cppad_c11_flag/cmake/cppad_c11_flag/$$, was added
     47to the $code cmake$$ command line.
     48$lend
    4449$head 01-07$$
    4550Fix undefined $code microsoft_timer$$ when building the
  • trunk/speed/sacado/CMakeLists.txt

    r2572 r2754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    2727# and below. This command can be used to add any flags, but it was originally
    2828# intended to add preprocessor definitions.
    29 ADD_DEFINITIONS("-DSPEED_SACADO -DRAD_AUTO_AD_Const")
     29#
     30# sacado does not support c++11 so make sure it does not get used
     31ADD_DEFINITIONS("-DSPEED_SACADO -DRAD_AUTO_AD_Const -DCPPAD_NO_CPP11")
    3032
    3133# Local include directories to search (not in package_prefix/includdir)
Note: See TracChangeset for help on using the changeset viewer.