Changeset 3992


Ignore:
Timestamp:
Dec 14, 2017 8:36:17 AM (20 months ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 101ba63b38aebfa1f31d6c58b181d8643e0eb104
end hash code: 9344e3b04e68f8ad944de0f146388e690c43aca3

commit 9344e3b04e68f8ad944de0f146388e690c43aca3
Author: Brad Bell <bradbell@…>
Date: Thu Dec 14 06:09:40 2017 -0700

Sort some lists.

commit 21e44331c64ec7e136f251e4c16cb0b499610951
Author: Brad Bell <bradbell@…>
Date: Thu Dec 14 05:56:46 2017 -0700

Advance to cppad-20171214.

commit e6111dd8b9c59b6753ca61b3f6f436b4cd063fe2
Author: Brad Bell <bradbell@…>
Date: Thu Dec 14 05:56:02 2017 -0700

Add the subtraph_hes2jac.cpp example.
Add comments used by sort.sh to sort sections of a file.


gh_pages.sh: replaced by ~bradbell/bin/gh_pages (for multiple packages).
run_omhelp.sh: no longer special for gh_pages case.
subgraph_jac_rev.hpp: fix white space in syntax.

Location:
trunk
Files:
1 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3991 r3992  
    2525#
    2626# cppad_version is used by set_version.sh to get the version number.
    27 SET(cppad_version      "20171208" )
     27SET(cppad_version      "20171214" )
    2828SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2929SET(cppad_description  "Differentiation of C++ Algorithms" )
  • trunk/bin/run_omhelp.sh

    r3991 r3992  
    11#! /bin/bash -e
    2 # $Id$
    32# -----------------------------------------------------------------------------
    43# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-17 Bradley M. Bell
     
    2726xml='no'
    2827printable='no'
    29 gh_pages='no'
    3028while [ "$1" != '' ]
    3129do
     
    4846                ;;
    4947
    50                 gh_pages)
    51                 gh_pages='yes'
    52                 ;;
    53 
    5448                *)
    5549                echo "$1 is not a valid bin/run_omhelp.sh option"
     
    6054if [ "$htm" == "$xml" ]
    6155then
    62         echo 'usage: bin/run_omhelp.sh [clean] [htm] [xml] [printable] [gh_pages]'
     56        echo 'usage: bin/run_omhelp.sh [clean] [htm] [xml] [printable]'
    6357        echo 'order does not matter and htm or xml is present (but not both).'
    6458        exit 1
     
    8377# -----------------------------------------------------------------------------
    8478cmd='omhelp ../doc.omh -noframe -debug'
    85 if [ "$gh_pages" == 'yes' ]
    86 then
    87         cmd="$cmd -image_link http://coin-or.github.io/CppAD/doc/index.html"
    88 else
    89         cmd="$cmd -image_link http://www.coin-or.org/CppAD/"
    90 fi
     79cmd="$cmd -image_link http://www.coin-or.org/CppAD/"
     80#
    9181if [ "$ext" == "xml" ]
    9282then
  • trunk/configure

    r3991 r3992  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for cppad 20171208.
     3# Generated by GNU Autoconf 2.69 for cppad 20171214.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    580580PACKAGE_NAME='cppad'
    581581PACKAGE_TARNAME='cppad'
    582 PACKAGE_VERSION='20171208'
    583 PACKAGE_STRING='cppad 20171208'
     582PACKAGE_VERSION='20171214'
     583PACKAGE_STRING='cppad 20171214'
    584584PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    585585PACKAGE_URL=''
     
    13751375  # This message is too long to be a string in the A/UX 3.1 sh.
    13761376  cat <<_ACEOF
    1377 \`configure' configures cppad 20171208 to adapt to many kinds of systems.
     1377\`configure' configures cppad 20171214 to adapt to many kinds of systems.
    13781378
    13791379Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14451445if test -n "$ac_init_help"; then
    14461446  case $ac_init_help in
    1447      short | recursive ) echo "Configuration of cppad 20171208:";;
     1447     short | recursive ) echo "Configuration of cppad 20171214:";;
    14481448   esac
    14491449  cat <<\_ACEOF
     
    15791579if $ac_init_version; then
    15801580  cat <<\_ACEOF
    1581 cppad configure 20171208
     1581cppad configure 20171214
    15821582generated by GNU Autoconf 2.69
    15831583
     
    19521952running configure, to aid debugging if configure makes a mistake.
    19531953
    1954 It was created by cppad $as_me 20171208, which was
     1954It was created by cppad $as_me 20171214, which was
    19551955generated by GNU Autoconf 2.69.  Invocation command line was
    19561956
     
    28422842# Define the identity of the package.
    28432843 PACKAGE='cppad'
    2844  VERSION='20171208'
     2844 VERSION='20171214'
    28452845
    28462846
     
    78257825# values after options handling.
    78267826ac_log="
    7827 This file was extended by cppad $as_me 20171208, which was
     7827This file was extended by cppad $as_me 20171214, which was
    78287828generated by GNU Autoconf 2.69.  Invocation command line was
    78297829
     
    78827882ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    78837883ac_cs_version="\\
    7884 cppad config.status 20171208
     7884cppad config.status 20171214
    78857885configured by $0, generated by GNU Autoconf 2.69,
    78867886  with options \\"\$ac_cs_config\\"
  • trunk/configure.ac

    r3991 r3992  
    1212dnl Process this file with autoconf to produce a configure script.
    1313dnl   package   version              bug-report
    14 AC_INIT([cppad], [20171208], [cppad@list.coin-or.org])
     14AC_INIT([cppad], [20171214], [cppad@list.coin-or.org])
    1515AM_SILENT_RULES([yes])
    1616
  • trunk/cppad/core/subgraph_jac_rev.hpp

    r3980 r3992  
    3333
    3434$head Syntax$$
    35 $icode%f%.subgraph_jac_rev(%x%, %subset%
    36 )%$$
     35$icode%f%.subgraph_jac_rev(%x%, %subset%)
     36%$$
    3737$icode%f%.subgraph_jac_rev(
    3838        %select_domain%, %select_range%, %x%, %matrix_out%
     
    159159$head Example$$
    160160$children%
    161         example/sparse/subgraph_jac_rev.cpp
    162 %$$
    163 The file $cref subgraph_jac_rev.cpp$$
    164 is an example and test of $code subgraph_jac_rev$$.
    165 It returns $code true$$, if it succeeds, and $code false$$ otherwise.
    166 
     161        example/sparse/subgraph_jac_rev.cpp%
     162        example/sparse/subgraph_hes2jac.cpp
     163%$$
     164The files $cref subgraph_jac_rev.cpp$$ and $cref subgraph_hes2jac.cpp$$
     165are examples and tests using $code subgraph_jac_rev$$.
     166They returns $code true$$ for success and $code false$$ for failure.
    167167
    168168$end
  • trunk/doc.omh

    r3991 r3992  
    9191$comment bin/version assumes that : follows cppad version number here$$
    9292$section
    93 cppad-20171208: A Package for Differentiation of C++ Algorithms
     93cppad-20171214: A Package for Differentiation of C++ Algorithms
    9494$$
    9595$mindex AD algorithmic differentiation automatic C++ algorithm derivative CppAD version cppad.hpp$$
  • trunk/example/sparse/CMakeLists.txt

    r3980 r3992  
    1010# -----------------------------------------------------------------------------
    1111#
     12# BEGIN_SORT_THIS_LINE_PLUS_2
    1213SET(source_list sparse.cpp
    1314        colpack_hes.cpp
     
    2627        rev_sparse_hes.cpp
    2728        rev_sparse_jac.cpp
    28         subgraph_reverse.cpp
    2929        sparse_hes.cpp
    3030        sparse_hessian.cpp
     
    3434        sparse_sub_hes.cpp
    3535        sparsity_sub.cpp
     36        subgraph_hes2jac.cpp
     37        subgraph_jac_rev.cpp
     38        subgraph_reverse.cpp
     39        subgraph_sparsity.cpp
    3640        sub_sparse_hes.cpp
    37         subgraph_jac_rev.cpp
    38         subgraph_sparsity.cpp
    3941)
     42# END_SORT_THIS_LINE_MINUS_2
    4043
    4144set_compile_flags( example_sparse "${cppad_debug_which}" "${source_list}" )
  • trunk/example/sparse/makefile.am

    r3980 r3992  
    4545        sparsity_sub.cpp \
    4646        sub_sparse_hes.cpp \
     47        subgraph_hes2jac.cpp \
    4748        subgraph_jac_rev.cpp \
    4849        subgraph_sparsity.cpp
  • trunk/example/sparse/sparse.cpp

    r3990 r3992  
    2525# include <cppad/utility/test_boolofvoid.hpp>
    2626
     27// BEGIN_SORT_THIS_LINE_PLUS_2
    2728// external compiled tests
     29extern bool colpack_hessian(void);
     30extern bool colpack_hes(void);
     31extern bool colpack_jacobian(void);
     32extern bool colpack_jac(void);
     33extern bool conj_grad(void);
     34extern bool dependency(void);
     35extern bool for_hes_sparsity(void);
     36extern bool for_jac_sparsity(void);
     37extern bool for_sparse_hes(void);
     38extern bool ForSparseJac(void);
     39extern bool rc_sparsity(void);
     40extern bool rev_hes_sparsity(void);
     41extern bool rev_jac_sparsity(void);
     42extern bool rev_sparse_hes(void);
     43extern bool RevSparseJac(void);
     44extern bool sparse_hessian(void);
     45extern bool sparse_hes(void);
     46extern bool sparse_jac_for(void);
     47extern bool sparse_jacobian(void);
     48extern bool sparse_jac_rev(void);
     49extern bool sparse_sub_hes(void);
     50extern bool sparsity_sub(void);
     51extern bool subgraph_hes2jac(void);
    2852extern bool subgraph_jac_rev(void);
     53extern bool subgraph_reverse(void);
    2954extern bool subgraph_sparsity(void);
    3055extern bool sub_sparse_hes(void);
    31 extern bool sparsity_sub(void);
    32 extern bool sparse_sub_hes(void);
    33 extern bool sparse_hes(void);
    34 extern bool sparse_jac_for(void);
    35 extern bool sparse_jac_rev(void);
    36 extern bool sparse_jacobian(void);
    37 extern bool sparse_hessian(void);
    38 extern bool rev_hes_sparsity(void);
    39 extern bool rev_jac_sparsity(void);
    40 extern bool RevSparseJac(void);
    41 extern bool rev_sparse_hes(void);
    42 extern bool subgraph_reverse(void);
    43 extern bool for_hes_sparsity(void);
    44 extern bool for_jac_sparsity(void);
    45 extern bool ForSparseJac(void);
    46 extern bool for_sparse_hes(void);
    47 extern bool dependency(void);
    48 extern bool conj_grad(void);
    49 extern bool colpack_jac(void);
    50 extern bool colpack_jacobian(void);
    51 extern bool colpack_hes(void);
    52 extern bool colpack_hessian(void);
    53 extern bool rc_sparsity(void);
     56// END_SORT_THIS_LINE_MINUS_1
    5457
    5558// main program that runs all the tests
     
    6164        // This line is used by test_one.sh
    6265
     66        // BEGIN_SORT_THIS_LINE_PLUS_2
    6367        // external compiled tests
     68        Run( conj_grad,                 "conj_grad" );
     69        Run( dependency,                "dependency" );
     70        Run( for_hes_sparsity,          "for_hes_sparsity" );
     71        Run( for_jac_sparsity,          "for_jac_sparsity" );
     72        Run( for_sparse_hes,            "for_sparse_hes" );
     73        Run( ForSparseJac,              "ForSparseJac" );
     74        Run( rc_sparsity,               "rc_sparsity" );
     75        Run( rev_hes_sparsity,          "rev_hes_sparsity" );
     76        Run( rev_jac_sparsity,          "rev_jac_sparsity" );
     77        Run( rev_sparse_hes,            "rev_sparse_hes" );
     78        Run( RevSparseJac,              "RevSparseJac" );
     79        Run( sparse_hessian,            "sparse_hessian" );
     80        Run( sparse_hes,                "sparse_hes" );
     81        Run( sparse_jac_for,            "sparse_jac_for" );
     82        Run( sparse_jacobian,           "sparse_jacobian" );
     83        Run( sparse_jac_rev,            "sparse_jac_rev" );
     84        Run( sparse_sub_hes,            "sparse_sub_hes" );
     85        Run( sparsity_sub,              "sparsity_sub" );
     86        Run( subgraph_hes2jac,          "subgraph_hes2jac" );
    6487        Run( subgraph_jac_rev,          "subgraph_jac_rev" );
     88        Run( subgraph_reverse,          "reverse_subgraph");
    6589        Run( subgraph_sparsity,         "subgraph_sparsity" );
    6690        Run( sub_sparse_hes,            "sub_sparse_hes" );
    67         Run( sparsity_sub,              "sparsity_sub" );
    68         Run( sparse_sub_hes,            "sparse_sub_hes" );
    69         Run( sparse_hes,                "sparse_hes" );
    70         Run( sparse_jac_for,            "sparse_jac_for" );
    71         Run( sparse_jac_rev,            "sparse_jac_rev" );
    72         Run( sparse_jacobian,           "sparse_jacobian" );
    73         Run( sparse_hessian,            "sparse_hessian" );
    74         Run( rev_hes_sparsity,          "rev_hes_sparsity" );
    75         Run( rev_jac_sparsity,          "rev_jac_sparsity" );
    76         Run( RevSparseJac,              "RevSparseJac" );
    77         Run( rev_sparse_hes,            "rev_sparse_hes" );
    78         Run( subgraph_reverse,          "reverse_subgraph");
    79         Run( for_hes_sparsity,          "for_hes_sparsity" );
    80         Run( for_jac_sparsity,          "for_jac_sparsity" );
    81         Run( ForSparseJac,              "ForSparseJac" );
    82         Run( for_sparse_hes,            "for_sparse_hes" );
    83         Run( dependency,                "dependency" );
    84         Run( conj_grad,                 "conj_grad" );
    85         Run( rc_sparsity,               "rc_sparsity" );
     91        // END_SORT_THIS_LINE_MINUS_1
     92        //
    8693# if CPPAD_HAS_COLPACK
    8794        Run( colpack_jac,               "colpack_jac" );
  • trunk/omh/appendix/whats_new/whats_new_17.omh

    r3991 r3992  
    5252        subgraph
    5353        optimizer
     54        subgraphs
    5455$$
    5556
     
    5960Speed tests no longer automatically compile in release mode; see
    6061$cref/debug_which/speed/debug_which/$$
     62
     63$head 12-14$$
     64Add the $cref subgraph_hes2jac.cpp$$ example
     65which computes sparse Hessians using subgraphs and Jacobians.
    6166
    6267$head 12-08$$
  • trunk/omh/example_list.omh

    r3990 r3992  
    7474$$
    7575
     76$comment BEGIN_SORT_THIS_LINE_PLUS_2$$
    7677$table
    7778$rref a11c_bthread.cpp$$
     
    254255$rref reverse_one.cpp$$
    255256$rref reverse_three.cpp$$
    256 $rref subgraph_reverse.cpp$$
    257257$rref reverse_two.cpp$$
    258258$rref rev_hes_sparsity.cpp$$
     
    295295$rref sub.cpp$$
    296296$rref sub_eq.cpp$$
     297$rref subgraph_hes2jac.cpp$$
    297298$rref subgraph_jac_rev.cpp$$
     299$rref subgraph_reverse.cpp$$
    298300$rref subgraph_sparsity.cpp$$
    299301$rref sub_sparse_hes.cpp$$
     
    317319$rref vector_bool.cpp$$
    318320$tend
     321$comment END_SORT_THIS_LINE_MINUS_2$$
    319322
    320323$end
Note: See TracChangeset for help on using the changeset viewer.