Changeset 3615


Ignore:
Timestamp:
Jan 25, 2015 1:06:55 PM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 978735a7ae061e368f3df3ba16390458f1b473b2
end hash code: 98eda0b324e6039337838c5e79bcdc7d3b7393ee

commit 98eda0b324e6039337838c5e79bcdc7d3b7393ee
Author: Brad Bell <bradbell@…>
Date: Sun Jan 25 10:05:39 2015 -0700

sparse_hessian.sh: Demonstrate problem with sparse Hessian test.

commit 0d3089d2bf835be4467c7fc16a868e728be1f5f0
Author: Brad Bell <bradbell@…>
Date: Sun Jan 25 08:42:01 2015 -0700

Demonstrate problem with sparse hessian timing test.
template.sh: remove reference to svn.

commit f6353dc462f55ca366dd0b76d0afd306462c6a3d
Author: Brad Bell <bradbell@…>
Date: Sun Jan 25 07:10:39 2015 -0700

uninitialized.sh: This bug has been fixed; see whats new 2015-01-09.

commit ea37add2c2f129102a97902b0622750facb5928f
Author: Brad Bell <bradbell@…>
Date: Sun Jan 25 05:41:10 2015 -0700

run_cmake.sh: add --no_ipopt and --no_documentation for testing installs.
command_line_arg.cmake: remove quotes around values in message.
CMakeLists.txt: change cmake_install_docdir to NOTFOUND when not present, remove check old doc method.

commit c361daa49147946861c7c851ec0b81fe1f29db1b
Author: Brad Bell <bradbell@…>
Date: Sun Jan 25 04:23:34 2015 -0700

CMakeLists.txt: Don't print sacado, eigen, or fadbad flags when not being used.

Location:
trunk
Files:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3533 r3615  
    7676# -----------------------------------------------------------------------------
    7777# cmake_install_docdir
    78 command_line_arg(cmake_install_docdir "" STRING
     78command_line_arg(cmake_install_docdir NOTFOUND STRING
    7979        "directory, below prefix, where cmake installs cppad documentation files"
    8080)
     
    107107        "extra flags used with cppad source (besides debug and release flags)"
    108108)
    109 # -----------------------------------------------------------------------------
    110 # cppad_documentation
    111 command_line_arg(cppad_documentation "" STRING
    112         "install cppad documentation: use camke_install_docdir instead"
    113 )
    114 STRING(COMPARE NOTEQUAL "${cppad_documentation}" "" cppad_documentation_error)
    115 IF( cppad_documentation_error )
    116         MESSAGE(FATAL_ERROR
    117 "cppad_documentation is no longer an option, use cmake_install_docdir instead"
    118         )
    119 ENDIF( cppad_documentation_error )
    120109# -----------------------------------------------------------------------------
    121110# External package prefixes
     
    171160        SET(cppad_cxx_flags_sacado ${cppad_cxx_flags} )
    172161ENDIF( ${cppad_cxx_flags} MATCHES ".*-std=c[+][+]11.*" )
    173 MESSAGE(STATUS "cppad_cxx_flags_sacado = ${cppad_cxx_flags_sacado}")
    174 # -----------------------------------------------------------------------------
    175 # cppad_cxx_flags_skip_eigen
     162IF( sacado_prefix )
     163        MESSAGE(STATUS "cppad_cxx_flags_sacado = ${cppad_cxx_flags_sacado}")
     164ENDIF( sacado_prefix )
     165# -----------------------------------------------------------------------------
     166# cppad_cxx_flags_eigen
    176167STRING(REGEX REPLACE
    177168        "(.*)-Wshadow(.*)"         "\\1-Wno-shadow\\2"
    178169        cppad_cxx_flags_eigen "${cppad_cxx_flags}"
    179170)
    180 MESSAGE(STATUS "cppad_cxx_flags_eigen = ${cppad_cxx_flags_eigen}")
    181 # -----------------------------------------------------------------------------
    182 # cppad_cxx_flags_skip_fadbad
     171IF( eigen_prefix )
     172        MESSAGE(STATUS "cppad_cxx_flags_eigen = ${cppad_cxx_flags_eigen}")
     173ENDIF( eigen_prefix )
     174# -----------------------------------------------------------------------------
     175# cppad_cxx_flags_fadbad
    183176STRING(REGEX REPLACE
    184177        "(.*)-Wshadow(.*)"         "\\1-Wno-shadow\\2"
    185178        cppad_cxx_flags_fadbad "${cppad_cxx_flags}"
    186179)
    187 MESSAGE(STATUS "cppad_cxx_flags_fadbad = ${cppad_cxx_flags_fadbad}")
     180IF( fadbad_prefix )
     181        MESSAGE(STATUS "cppad_cxx_flags_fadbad = ${cppad_cxx_flags_fadbad}")
     182ENDIF( fadbad_prefix )
    188183# -----------------------------------------------------------------------------
    189184# cppad_abs_includedir, cppad_abs_libdir, cppad_abs_datadir, cppad_abs_docdir
     
    368363#
    369364# During install copy doc direcrory to cppad_abs_docdir/cppad
    370 STRING( COMPARE NOTEQUAL "${cmake_install_docdir}" "" cppad_documentation )
    371 IF ( cppad_documentation )
     365IF ( cmake_install_docdir )
    372366        INSTALL( DIRECTORY "doc/" DESTINATION ${cppad_abs_docdir}/cppad )
    373 ENDIF ( cppad_documentation )
     367ENDIF ( cmake_install_docdir )
  • trunk/bin/run_cmake.sh

    r3614 r3615  
    2929clang='no'
    3030no_colpack='no'
     31no_ipopt='no'
    3132no_sparse_list='no'
     33no_documentation='no'
    3234testvector='boost'
    3335while [ "$1" != "" ]
     
    4446        [--clang ] \\
    4547        [--no_colpack] \\
     48        [--no_ipopt] \\
    4649        [--no_sparse_list] \\
     50        [--no_documentation] \\
    4751        [--<package>_vector]
    4852The --help option just prints this message and exits.
     
    7175        then
    7276                no_colpack='yes'
     77        elif [ "$1" == '--no_ipopt' ]
     78        then
     79                no_ipopt='yes'
    7380        elif [ "$1" == '--no_sparse_list' ]
    7481        then
    7582                no_sparse_list='yes'
     83        elif [ "$1" == '--no_documentation' ]
     84        then
     85                no_documentation='yes'
    7686        elif [ "$1" == '--cppad_vector' ]
    7787        then
     
    131141then
    132142        cmake_args="$cmake_args -D cmake_install_datadir=share"
     143fi
     144#
     145# cmake_install_docdir
     146if [ -d '/usr/share' ] && [ "$no_documentation" == 'no' ]
     147then
    133148        cmake_args="$cmake_args -D cmake_install_docdir=share/doc"
    134149fi
     
    144159#
    145160# {package}_prefix
    146 package_list='fadbad adolc eigen ipopt sacado'
     161package_list='fadbad adolc eigen sacado'
    147162if [ "$no_colpack" == 'no' ]
    148163then
    149164        package_list="$package_list colpack"
     165fi
     166if [ "$no_ipopt" == 'no' ]
     167then
     168        package_list="$package_list ipopt"
    150169fi
    151170for package in $package_list
  • trunk/bug/template.sh

    r3370 r3615  
    2020        using std::cout;
    2121
    22         cout << "1. svn copy template.sh <name>.sh\n";
     22        cout << "1. copy template.sh to <name>.sh\n";
    2323        cout << "2. Edit <name>.sh replacing description and C++ source code\n";
    2424        cout << "3. Run ./<name>.sh\n";
  • trunk/cmake/command_line_arg.cmake

    r3530 r3615  
    4040        #
    4141        SET(${variable} "${default}" CACHE ${type} "${description}")
    42         MESSAGE(STATUS "${variable} = \"${${variable}}\"")
     42        MESSAGE(STATUS "${variable} = ${${variable}}")
    4343ENDMACRO( command_line_arg )
  • trunk/cppad/time_test.hpp

    r3232 r3615  
    145145# include <cppad/local/define.hpp>
    146146
     147# define CPPAD_EXTRA_RUN_BEFORE_TIMING 1
     148
    147149namespace CppAD { // BEGIN_CPPAD_NAMESPACE
    148150/*!
     
    170172double time_test(Test test, double time_min )
    171173{
     174# if CPPAD_EXTRA_RUN_BEFORE_TIMING
     175        test(1);
     176# endif
    172177        size_t repeat = 0;
    173178        double s0     = elapsed_seconds();
     
    207212double time_test(Test test, double time_min, size_t test_size)
    208213{
     214# if CPPAD_EXTRA_RUN_BEFORE_TIMING
     215        test(test_size, 1);
     216# endif
    209217        size_t repeat = 0;
    210218        double s0     = elapsed_seconds();
     
    222230} // END_CPPAD_NAMESPACE
    223231
     232# undef CPPAD_EXTRA_RUN_BEFORE_TIMING
    224233// END PROGRAM
    225234# endif
Note: See TracChangeset for help on using the changeset viewer.