Changeset 3859


Ignore:
Timestamp:
Jan 1, 2017 5:59:24 AM (3 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: b20ce87227484f883f98510781da6823d164a85a
end hash code: 0b916203422e362a7c090b57b1866ee6fd733758

commit 0b916203422e362a7c090b57b1866ee6fd733758
Author: Brad Bell <bradbell@…>
Date: Sun Jan 1 03:32:08 2017 -0700

  1. The swig directory has been moved to the following separate project:

https://github.com/bradbell/cppad_swig

  1. advance to cppad-20170101.

commit 3e4d40f697a3ade82679b3fc46b31bbd15db74e0
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 19:16:22 2016 -0700

  1. Remve check_swig files (not that all its tests have been extracted).
  2. Fix perl extensions for packages (pl -> pm). check_all.pl.in: change so runns all *.pm tests in swig/perl.

commit 0a1fee2c0b565b4a3adbefd653258e5f16a783d4
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 18:28:56 2016 -0700

Extract a_fun_xam from check_swig.

commit 1e2553377b7c1c716cf83492b19d2b293c1a3427
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 10:34:15 2016 -0700

Extract vector_ad_xam from check_swig.

commit 982f7c1e74c2ffbec74090d59bb48afedb3eca3f
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 10:23:43 2016 -0700

Extract a_double_xam from check_swig.

commit af737f59961cb5c6333aec2d299102f97905dbfa
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 10:04:32 2016 -0700

make member_fun_0_ a sepeate function (instead of emtpy argument case).

commit fb077ba876fedd04a8c0468fbcb3cd984b1b60ad
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 09:42:11 2016 -0700

Change generate_output_file_ -> header_.
Move overall comment above function definition.

commit 90545651b3e2c2454fed33df8b9deb5844b8bb26
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 09:20:13 2016 -0700

Advance to cppad-20161230.

commit fa1282080a95d88c8aad7f55429bed9db7cb2873
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 09:10:48 2016 -0700

  1. Extract xam/vector_double_xam.mr from check_swig.
  2. Make some corrections to the m4 language macros.

commit 9280ed7b264ec244f4619833ba076d26f7411445
Author: Brad Bell <bradbell@…>
Date: Fri Dec 30 07:07:49 2016 -0700

Use m4 to construct octave, perl, python example from a single source
(under construction).

commit 5a7db64fa6e0117ae0b54509ee6f552a3b7c2f63
Author: Brad Bell <bradbell@…>
Date: Thu Dec 29 18:55:57 2016 -0700

CMakeLists.txt: add to comments about suppressed warnings.
CMakeLists.txt: ignore warnings for *= and /=.

commit c391a262b8dd2144b7125ac55374446c73d70160
Author: Brad Bell <bradbell@…>
Date: Thu Dec 29 18:13:40 2016 -0700

Add perl to (octave, python) as one of the languages that will be supported.

commit 8248387afa2ad45342409bcd88e4ff5ba489e367
Author: Brad Bell <bradbell@…>
Date: Thu Dec 29 05:50:56 2016 -0700

Remove some svn $Id commands that were not properly formed.
check_svn_id.sh: will now automatically remove proper $Id$ commands.

commit 437ac47988ef7d97145878630921b59480f8fb8f
Author: Brad Bell <bradbell@…>
Date: Thu Dec 29 05:09:44 2016 -0700

Change swig module name so different for python and octave.,


CMakeLists.txt: remove a debugging print.

commit e8ac9cbe4b6de4c2a3c428092efb9227450da8b0
Author: Brad Bell <bradbell@…>
Date: Thu Dec 29 04:45:04 2016 -0700

  1. Add a an example of using swig with perl.
  2. Advance to cppad-20161229.
  3. Add missing Id at top of check_all.*.in files.

commit 6eb514493a8c38c6b768409c5f78d3ec2f53ba47
Author: Brad Bell <bradbell@…>
Date: Wed Dec 28 13:31:58 2016 -0700

Give octave and python modules different names to avoid cmake target confusion.

commit 83a2c29a13df2c8ec1588e5d50bd5999eea655bc
Author: Brad Bell <bradbell@…>
Date: Wed Dec 28 09:56:05 2016 -0700

Add script that coverts a python test to an octave test.

commit fdedf49579ff3887a8f65b26e58ac9bb2b8f7fd5
Author: Brad Bell <bradbell@…>
Date: Tue Dec 27 17:34:51 2016 -0700

Split out check_all as a simple driver for tests in a directory.
.gitignore: ignore *.pyc files where they are expected
check_copyright.sh: ignore .gitignore.

commit 8ee5ec65839db4ace33be7c368a1b66f9e7fca8f
Author: Brad Bell <bradbell@…>
Date: Tue Dec 27 11:32:03 2016 -0700

Initial testing of R + swig (R swig inteface not yet fully functional).

commit ed4afdc08b86f1cdfd3bd5be0d04fada2114ef05
Author: Brad Bell <bradbell@…>
Date: Tue Dec 27 05:27:54 2016 -0700

Advance to cppad-20161227.

commit aa8a3fe8844e1a8beb0edccaa84489dd8eaf5b92
Author: Brad Bell <bradbell@…>
Date: Tue Dec 27 05:26:53 2016 -0700

Use print_variable macro to simplify code.

commit 08d124752405de9c672bdb0d815c6d7beba7abf7
Author: Brad Bell <bradbell@…>
Date: Tue Dec 27 05:04:58 2016 -0700

  1. Return to using standard UseSWIG.cmake (uses .cxx for C++ files). print_variable.cmake: new utility for printing a variable. CMakeLists.txt: remove debugging print of a variable.

commit b83b26be7daa08521a8e61537987da065d9b1eab
Author: Brad Bell <bradbell@…>
Date: Mon Dec 26 15:12:06 2016 -0700

Simplify by changing extension used for c++ wrapper files.
use_swig.cmake: modified UseSWIG.cmake so uses .cpp (not .cxx) for wrappers.

commit 64a7c8b84583a24e67ceb7283b1cc485b50dccf0
Author: Brad Bell <bradbell@…>
Date: Mon Dec 26 09:36:32 2016 -0700

Advanced to cppad-20161226.

Location:
trunk
Files:
1 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r3855 r3859  
    1 # top directory only
     1# only one file
    22git_commit.sh
    33aclocal.m4
    44ar-lib
    55autom4te.cache
     6bin/test_one.sh
    67commit.sh.old
    7 doc
    8 doxydoc
    98cppad/configure.hpp
    109test_one.cpp
    1110test_one.exe
    12 bin/test_one.sh
     11# only one directory
     12doc
     13doxydoc
    1314# all directories
    1415*.err
  • trunk/AUTHORS

    r3858 r3859  
    22             ===========================================
    33
    4 To date, 2016-12-25, Bradley M. Bell is the sole author of CppAD.
     4To date, 2017-01-01, 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

    r3858 r3859  
    1 # $Id$
    21# -----------------------------------------------------------------------------
    32# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     
    1817
    1918# cppad_version is used by set_version.sh to get the version number.
    20 SET(cppad_version      "20161225" )
     19SET(cppad_version      "20170101" )
    2120SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2221SET(cppad_description  "Differentiation of C++ Algorithms" )
     
    3231# include_directories([AFTER|BEFORE] [SYSTEM] dir1 dir2 ...)
    3332INCLUDE_DIRECTORIES( ${cppad_SOURCE_DIR} )
    34 
    35 
    3633
    3734# =============================================================================
     
    6966INCLUDE(cmake/check_source_runs.cmake)
    7067#
    71 # macro that acts for cmake like assert acts for C
     68# assert(variable)
    7269INCLUDE(cmake/assert.cmake)
     70#
     71# print_variable(variable)
     72INCLUDE(cmake/print_variable.cmake)
    7373# =============================================================================
    7474# command line arguments
     
    170170        STRING( REGEX REPLACE "/W[0-9]" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
    171171ENDIF ( cppad_cxx_flags MATCHES "/W[0-9]" )
    172 MESSAGE(STATUS "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
     172print_variable(CMAKE_CXX_FLAGS)
    173173# -----------------------------------------------------------------------------
    174174# set cppad_abs_${middle_name} for middle_name equal to:
     
    210210                boost_prefix "${boost_include_dir}"
    211211        )
    212         MESSAGE(STATUS "boost_prefix = ${boost_prefix}")
     212        print_variable(boost_prefix)
    213213        #
    214214        # add boost include directories
     
    280280#
    281281# directories with check depends entries
    282 ADD_SUBDIRECTORY(swig)
    283282ADD_SUBDIRECTORY(example)
    284283ADD_SUBDIRECTORY(compare_c)
  • trunk/bin/check_cmake.sh

    r3858 r3859  
    11#! /bin/bash -e
    2 # $Id$
    32# -----------------------------------------------------------------------------
    43# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     
    7574                multi_thread/CMakeLists.txt | \
    7675                print_for/CMakeLists.txt | \
    77                 swig/CMakeLists.txt | \
    78                 swig/example/CMakeLists.txt | \
    79                 swig/python/CMakeLists.txt | \
    80                 swig/octave/CMakeLists.txt | \
    8176                test_more/CMakeLists.txt )
    8277                check="CMAKE_BUILD_TYPE DEBUG"
  • trunk/bin/check_copyright.sh

    r3858 r3859  
    11#! /bin/bash -e
    2 # $Id$
    32# -----------------------------------------------------------------------------
    43# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     
    2928        -e '/^[#\t ]*new file:/p' | \
    3029            sed -e 's/^.*: *//' -e 's/ -> /\n/' | \
    31                         sed -e '/makefile.in$/d' \
     30                        sed -e '/^makefile.in$/d' \
     31                                -e '/^.gitignore$/d' \
     32                                -e '/\/makefile.in$/d' \
    3233                                -e '/\/check_copyright.sh$/d' \
    33                                 -e '/\/empty.cpp$/d' \
    3434                                -e '/AUTHORS/d' \
    3535                                -e '/COPYING/d' |
  • trunk/bin/check_svn_id.sh

    r3781 r3859  
    11#! /bin/bash -e
    2 # $Id$
    32# -----------------------------------------------------------------------------
    43# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     
    1716fi
    1817# -----------------------------------------------------------------------------
    19 echo "Checking for \$Id.*\$ in beginning of source code"
    20 echo "-------------------------------------------------------"
     18list=`git status | sed -n \
     19        -e '/^[#\t ]*deleted:/p' \
     20        -e '/^[#\t ]*modified:/p' \
     21        -e '/^[#\t ]*both modified:/p' \
     22        -e '/^[#\t ]*renamed:/p' \
     23        -e '/^[#\t ]*new file:/p' | \
     24                        sed -e 's/^.*: *//' -e 's/ -> /\n/' | \
     25                        sed -e '/^makefile.in$/d' \
     26                                -e '/^.gitignore$/d' \
     27                                -e '/\/makefile.in$/d' \
     28                                -e '/bin\/check_svn_id.sh$/d' \
     29                                -e '/AUTHORS/d' \
     30                                -e '/COPYING/d' |
     31                sort -u`
    2132ok="yes"
    22 list=`bin/ls_files.sh | sed -n \
    23         -e '/^gpl-3.0.txt$/d' \
    24         -e '/^epl-v10.txt$/d' \
    25         -e '/cppad\/local\/config.h.in$/d' \
    26         -e '/^makefile.in$/d' \
    27         -e '/^svn_commit.sh$/d' \
    28         -e '/^git_commit.sh$/d' \
    29         -e '/\/makefile.in$/d'  \
    30         -e '/\.hpp$/p' \
    31         -e '/\.cpp$/p' \
    32         -e '/\.omh$/p' \
    33         -e '/\.txt$/p' \
    34         -e '/\.sh$/p'  \
    35         -e '/\.in$/p'  \
    36         -e '/\.am$/p'`
    37 #
    3833for file in $list
    3934do
    40         # deprecated link files have just one line
    41         lines=`cat $file | wc -l`
    42         if [ "$lines" != 1 ]
     35        if [ -e $file ]
    4336        then
    44                 if ! head -2 $file | grep '$Id.*\$' > /dev/null
     37                sed $file -e '/$Id.*\$/d' > check_svn_id.$$
     38                if ! diff $file check_svn_id.$$ > /dev/null
    4539                then
    46                         echo "$file does not have '\$Id.*\$' in first two lines"
    47                         ok="no"
     40                        echo '----------------------------------------------------'
     41                        echo "check_svn_id.sh: automatic changes to $file:"
     42                        if diff $file check_svn_id.$$
     43                        then
     44                                echo 'bin/check_svn_id.sh: program error'
     45                                rm check_svn_id.$$
     46                                exit 1
     47                        fi
     48                        ok='no'
     49                        if [ -x $file ]
     50                        then
     51                                mv check_svn_id.$$ $file
     52                                chmod +x $file
     53                        else
     54                                mv check_svn_id.$$ $file
     55                        fi
    4856                fi
    4957        fi
    5058done
    51 echo "-------------------------------------------------------"
    52 if [ "$ok" = "no" ]
     59if [ -e check_svn_id.$$ ]
    5360then
    54         echo "Error: nothing should be between the two dashed lines above"
     61        rm check_svn_id.$$
     62fi
     63if [ "$ok" == 'no' ]
     64then
    5565        exit 1
    56 else
    57         echo "Ok: nothing is between the two dashed lines above"
    58         exit 0
    5966fi
     67# ----------------------------------------------------------------------------
     68echo "$0: OK"
     69exit 0
  • trunk/configure

    r3858 r3859  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for cppad 20161225.
     3# Generated by GNU Autoconf 2.69 for cppad 20170101.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    581581PACKAGE_NAME='cppad'
    582582PACKAGE_TARNAME='cppad'
    583 PACKAGE_VERSION='20161225'
    584 PACKAGE_STRING='cppad 20161225'
     583PACKAGE_VERSION='20170101'
     584PACKAGE_STRING='cppad 20170101'
    585585PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    586586PACKAGE_URL=''
     
    14101410  # This message is too long to be a string in the A/UX 3.1 sh.
    14111411  cat <<_ACEOF
    1412 \`configure' configures cppad 20161225 to adapt to many kinds of systems.
     1412\`configure' configures cppad 20170101 to adapt to many kinds of systems.
    14131413
    14141414Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14801480if test -n "$ac_init_help"; then
    14811481  case $ac_init_help in
    1482      short | recursive ) echo "Configuration of cppad 20161225:";;
     1482     short | recursive ) echo "Configuration of cppad 20170101:";;
    14831483   esac
    14841484  cat <<\_ACEOF
     
    16141614if $ac_init_version; then
    16151615  cat <<\_ACEOF
    1616 cppad configure 20161225
     1616cppad configure 20170101
    16171617generated by GNU Autoconf 2.69
    16181618
     
    22432243running configure, to aid debugging if configure makes a mistake.
    22442244
    2245 It was created by cppad $as_me 20161225, which was
     2245It was created by cppad $as_me 20170101, which was
    22462246generated by GNU Autoconf 2.69.  Invocation command line was
    22472247
     
    31333133# Define the identity of the package.
    31343134 PACKAGE='cppad'
    3135  VERSION='20161225'
     3135 VERSION='20170101'
    31363136
    31373137
     
    85738573# values after options handling.
    85748574ac_log="
    8575 This file was extended by cppad $as_me 20161225, which was
     8575This file was extended by cppad $as_me 20170101, which was
    85768576generated by GNU Autoconf 2.69.  Invocation command line was
    85778577
     
    86308630ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    86318631ac_cs_version="\\
    8632 cppad config.status 20161225
     8632cppad config.status 20170101
    86338633configured by $0, generated by GNU Autoconf 2.69,
    86348634  with options \\"\$ac_cs_config\\"
  • trunk/configure.ac

    r3858 r3859  
    1 dnl $Id$
    21dnl ---------------------------------------------------------------------------
    32dnl CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     
    1312dnl Process this file with autoconf to produce a configure script.
    1413dnl   package   version              bug-report
    15 AC_INIT([cppad], [20161225], [cppad@list.coin-or.org])
     14AC_INIT([cppad], [20170101], [cppad@list.coin-or.org])
    1615AM_SILENT_RULES([yes])
    1716
  • trunk/cppad/CMakeLists.txt

    r3839 r3859  
    2020                SET(${output_variable} 0)
    2121        ENDIF( match_flag )
    22         MESSAGE(STATUS "${output_variable} = ${${output_variable}}" )
     22        print_variable(${output_variable})
    2323ENDMACRO(check_match)
    2424# -----------------------------------------------------------------------------
     
    212212# End C++11 features
    213213#
    214 MESSAGE(STATUS "cppad_cplusplus_201100_ok = ${cppad_cplusplus_201100_ok}")
     214print_variable(cppad_cplusplus_201100_ok)
    215215# -----------------------------------------------------------------------------
    216216# cppad_has_gettimeofday
  • trunk/cppad_lib/CMakeLists.txt

    r3790 r3859  
    3333        ${soversion}
    3434)
    35 MESSAGE(STATUS "soversion=${soversion}")
     35print_variable(soversion)
    3636#
    3737#  add_library(<name> [STATIC | SHARED | MODULE] [EXCLUDE_FROM_ALL]
  • trunk/doc.omh

    r3858 r3859  
    1 $Id$
    21/* --------------------------------------------------------------------------
    32CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     
    9291$comment bin/version assumes that : follows cppad version number here$$
    9392$section
    94 cppad-20161225: A Package for Differentiation of C++ Algorithms
     93cppad-20170101: A Package for Differentiation of C++ Algorithms
    9594$$
    9695$mindex AD algorithmic differentiation automatic C++ algorithm derivative CppAD version cppad.hpp$$
  • trunk/omh/install/download.omh

    r3858 r3859  
    1 $Id$
    21/* --------------------------------------------------------------------------
    32CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     
    9796$rnext
    9897current  $cnext EPL $cnext $href%
    99 http://www.coin-or.org/download/source/CppAD/cppad-20161225.epl.tgz%
    100 cppad-20161225.epl.tgz%$$
     98http://www.coin-or.org/download/source/CppAD/cppad-20170101.epl.tgz%
     99cppad-20170101.epl.tgz%$$
    101100$rnext
    102101current  $cnext GPL $cnext $href%
    103 http://www.coin-or.org/download/source/CppAD/cppad-20161225.gpl.tgz%
    104 cppad-20161225.gpl.tgz%$$
     102http://www.coin-or.org/download/source/CppAD/cppad-20170101.gpl.tgz%
     103cppad-20170101.gpl.tgz%$$
    105104$tend
    106105
  • trunk/pkgconfig/CMakeLists.txt

    r3608 r3859  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    3131        FOREACH(dir ${cmake_install_libdirs})
    3232                IF(IS_DIRECTORY ${colpack_prefix}/${dir} )
    33                         SET(cppad_pkgconfig_libs 
     33                        SET(cppad_pkgconfig_libs
    3434                                "${cppad_pkgconfig_libs} -L${colpack_prefix}/${dir}"
    3535                        )
     
    3838        FOREACH(dir ${cmake_install_includedirs})
    3939                IF(IS_DIRECTORY ${colpack_prefix}/${dir} )
    40                         SET(cppad_pkgconfig_cflags 
     40                        SET(cppad_pkgconfig_cflags
    4141                                "${cppad_pkgconfig_cflags} -I${colpack_prefix}/${dir}"
    4242                        )
     
    4545ENDIF( colpack_prefix )
    4646#
    47 MESSAGE(STATUS "cppad_pkgconfig_cflags = ${cppad_pkgconfig_cflags}")
    48 MESSAGE(STATUS "cppad_pkgconfig_libs = ${cppad_pkgconfig_libs}")
    49 MESSAGE(STATUS "cppad_pkgconfig_requires = ${cppad_pkgconfig_requires}")
     47print_variable(cppad_pkgconfig_cflags)
     48print_variable(cppad_pkgconfig_libs)
     49print_variable(cppad_pkgconfig_requires)
    5050#
    5151# Copy a file to another location and modify its contents.
    5252# configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
    5353CONFIGURE_FILE(
    54         ${CMAKE_CURRENT_SOURCE_DIR}/cppad.pc.in             
    55         ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc 
     54        ${CMAKE_CURRENT_SOURCE_DIR}/cppad.pc.in
     55        ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc
    5656)
    5757CONFIGURE_FILE(
    58         ${CMAKE_CURRENT_SOURCE_DIR}/cppad-uninstalled.pc.in 
     58        ${CMAKE_CURRENT_SOURCE_DIR}/cppad-uninstalled.pc.in
    5959        ${CMAKE_CURRENT_BINARY_DIR}/cppad-uninstalled.pc
    6060)
Note: See TracChangeset for help on using the changeset viewer.