Changeset 3633


Ignore:
Timestamp:
Feb 6, 2015 8:44:51 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 7b37fbf0edb9d6ff11efec836f52d1246b4370e5
end hash code: fd0eb43ee368470823d047016d455bcc074c73e2

commit fd0eb43ee368470823d047016d455bcc074c73e2
Author: Brad Bell <bradbell@…>
Date: Fri Feb 6 06:28:55 2015 -0700

Fix bug in clear of work.color_method for sparse hessians.


configure.hpp.in: doxygen requires \def next to corresponding # define.

commit 646039533471f45a0232613c3eefb282ff0c6546
Author: Brad Bell <bradbell@…>
Date: Wed Feb 4 20:20:28 2015 -0700

Document new requirement that cmake verison >= 2.8.

commit 30f11546b6ea7dc8a3e540232584efa11f377a61
Author: Brad Bell <bradbell@…>
Date: Wed Feb 4 20:12:49 2015 -0700

Allow for use of installed version with and without c++11 features.
CMakeLists.txt: requrie cmake >= 2.8.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3632 r3633  
    1414# =============================================================================
    1515# Set the minimum required version of cmake for this project.
    16 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
     16# see http://www.cmake.org/pipermail/cmake/2013-January/053213.html
     17CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
    1718
    1819# cppad_version is used by set_version.sh to get the version number.
  • trunk/cppad/configure.hpp.in

    r3630 r3633  
    3939*/
    4040
     41# if __cplusplus >= 201100
    4142/*!
    4243\def CPPAD_HAS_RVALUE
     
    4445*/
    4546# define CPPAD_HAS_RVALUE @cppad_has_rvalue@
     47# endif
    4648
     49# if __cplusplus >= 201100
    4750/*!
    4851def CPPAD_HAS_NULLPTR
     
    5053*/
    5154# define CPPAD_HAS_NULLPTR @cppad_has_nullptr@
     55# endif
    5256
     57# if __cplusplus >= 201100
    5358/*!
    5459\def CPPAD_HAS_CSTDINT_8_TO_64
     
    5661*/
    5762# define CPPAD_HAS_CSTDINT_8_TO_64 @cppad_has_cstdint_8_to_64@
     63# endif
    5864
     65# if __cplusplus >= 201100
    5966/*!
    6067\def CPPAD_COMPILER_HAS_ERF
     
    6269*/
    6370# define CPPAD_COMPILER_HAS_ERF @cppad_compiler_has_erf@
     71# endif
    6472
    6573/*!
  • trunk/cppad/local/sparse_hessian.hpp

    r3565 r3633  
    313313                /// inform CppAD that this information needs to be recomputed
    314314                void clear(void)
    315                 {       color_method = "cppad";
     315                {       color_method = "cppad.symmetric";
    316316                        row.clear();
    317317                        col.clear();
  • trunk/example/colpack_hes.cpp

    r3565 r3633  
    123123
    124124        // contrast and check results using both cppad and colpack
     125        CppAD::sparse_hessian_work work;
    125126        for(size_t i_method = 0; i_method < 3; i_method++)
    126127        {       // empty work structure
    127                 CppAD::sparse_hessian_work work;
    128128                ok &= work.color_method == "cppad.symmetric";
    129                 if( i_method == 1 )
    130                         work.color_method = "cppad.general";
    131129                if( i_method == 2 )
    132130                        work.color_method = "colpack.star";
     
    146144                else
    147145                        ok &= n_sweep == 5;
     146                //
     147                // check that clear resets color_method to cppad.symmetric
     148                work.clear();
     149                ok &= work.color_method == "cppad.symmetric";
    148150        }
    149151
  • trunk/omh/install/cmake.omh

    r3631 r3633  
    11$Id$
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    7878$index cppad, configure$$
    7979The command below assumes that $code cmake$$ is in your execution
    80 path. If not, you can put the path to $code cmake$$ in font the command.
     80path with version greater than or equal 2.8.
     81If not, you can put the path to the version of $code cmake$$
     82in font the command.
    8183Only the $code cmake$$ command and the path to the distribution directory
    8284($code ..$$ at the end of the command below) are required.
     
    263265For example, if you are using $code g++$$ you could specify
    264266$codep
    265         -D cppad_cxx_flags="-Wall -ansi -pedantic-errors -std=c++98 -Wshadow"
     267        -D cppad_cxx_flags="-Wall -ansi -pedantic-errors -std=c++11 -Wshadow"
    266268$$
     269$subhead C++11$$
     270In order for the compiler to take advantage of features that are new in C++11,
     271the $icode cppad_cxx_flags$$ must enable these features.
     272The compiler may still be used with a flag that disables the new features.
     273
     274$subhead Eigen and Fadbad$$
    267275The packages
    268276$cref/eigen/eigen_prefix/$$ and $cref/fadbad/fadbad_prefix/$$
    269277currently generate a lot of shadowed variable warnings.
    270 Hence the $code -Wshadow$$ flag is automatically removed when
     278If the $code -Wshadow$$ flag is present, it is automatically removed when
    271279compiling examples and test that use these packages.
    272280
  • trunk/omh/whats_new/whats_new_15.omh

    r3632 r3633  
    2929        datadir
    3030        docdir
     31        std
     32        cxx
    3133$$
    3234
     
    3941assist you in learning about changes between various versions of CppAD.
    4042
     43$head 02-06$$
     44There was a bug in the coloring method change on
     45$cref/2015-01-07/whats_new_15/01-07/$$.
     46To be specific, $icode%work%.color_method%$$ was not being set
     47to $code "cppad.symmetric"$$ after $icode%work%.color_method.clear()%$$.
     48This has been fixed.
     49
     50$head 02-04$$
     51$list number$$
     52Enable the same install of CppAD to be used both with and without C++11
     53features; e.g., with both $code g++ --std=c++11$$ and with
     54$code g++ --std=c++98$$. Previously if the
     55$cref/cppad_cxx_flags/cmake/cppad_cxx_flags/$$ specified C++11,
     56then it could only be used in that way.
     57$lnext
     58The $cref/cmake command/cmake/CMake Command/$$ now requires the version
     59of $code cmake$$ to be greater than or equal 2.8
     60(due a bug in $code cmake$$ version 2.6).
     61$lend
     62
    4163$head 02-03$$
    4264Improved the searching for the boost multi-threading library
    4365which is used for by the $cref team_bthread.cpp$$ case of the
    4466$cref thread_test.cpp$$ example and test.
    45 
    4667
    4768$head 02-02$$
Note: See TracChangeset for help on using the changeset viewer.