Ignore:
Timestamp:
Mar 27, 2016 9:00:39 AM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: f77cd2e443b8d14f354f97efc4c26369227dfe81
end hash code: 33d1f5b8d837d83c8baf656045d85d8b45f0b297

commit 33d1f5b8d837d83c8baf656045d85d8b45f0b297
Author: Brad Bell <bradbell@…>
Date: Sun Mar 27 04:01:14 2016 -0700

  1. Test non-symmetric reverse mode in eigen_mat_inv (and fix this example).
  2. Advance version to cppad-20160327.

commit 238e214ff36ca835efca615c609576dc8bf5038d
Author: Brad Bell <bradbell@…>
Date: Sat Mar 26 18:10:59 2016 -0700

eigen_mat_inv.hpp: use inverse matrix (since we are computing it).
eigen_mat_mul.hpp: comment seperator.
eigen_mat_inv.cpp: matrix during recording is non-singular.
eigen_mat_inv.cpp: test first and second order forward.

commit fc918b0476cc8ea66abdf2904a71fc93472d279d
Author: Brad Bell <bradbell@…>
Date: Sat Mar 26 16:26:51 2016 -0700

Add test_more/eigen_mat_inv.cpp.


eigen_mat_inv.hpp: fix calculation of vy.
eigen_mat_inv.cpp: fix section title.
CMakeLists.txt: no longer necessary to have special library for eigen tests.
eigen_mat_inv.cpp: Test with non-symmetric matrix.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/CMakeLists.txt

    r3803 r3811  
    2121# ADD_DEFINITIONS("-DCPPAD_MAX_NUM_THREADS=1")
    2222
    23 # adolc_prefix
     23# adolc_sources, adolc_libs and CPPAD_ADOLC_TEST
    2424SET(sources base_adolc.cpp)
    2525sources_libs_define(adolc "${sources}" adolc ADOLC_TEST)
     26
     27# eigen_sources and CPPAD_EIGEN_TEST
     28SET(sources cppad_eigen.cpp eigen_mat_inv.cpp)
     29sources_libs_define(eigen "${sources}" "" EIGEN_TEST)
    2630
    2731# ipopt_prefix
     
    2933sources_libs_define(ipopt "${sources}" "${ipopt_LIBRARIES}" IPOPT_TEST)
    3034
    31 # sources that use eigen
    32 IF ( eigen_prefix )
    33         # compile eigen library separately so can use different compiler flags
    34         ADD_LIBRARY(test_more_eigen_lib EXCLUDE_FROM_ALL
    35                 cppad_eigen.cpp
    36         )
    37         # Adds -D define flags to the compilation of source files.
    38         ADD_DEFINITIONS("-DCPPAD_EIGEN_TEST")
    39         # Add other compiler flags
    40         add_cppad_cxx_flags(test_more_eigen_lib)
    41         #
    42         # Add eigen to list of libraries
    43         SET(eigen_libs test_more_eigen_lib)
    44 ELSE ( eigen_prefix )
    45         SET(eigen_sources "")
    46         SET(eigen_libs "")
    47 ENDIF ( eigen_prefix )
    48 
    49 # add_executable(<name> [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL]
    50 #                 source1 source2 ... sourceN
    5135# )
    5236ADD_EXECUTABLE(test_more EXCLUDE_FROM_ALL test_more.cpp
     37        ${adolc_sources}
     38        ${eigen_sources}
     39        ${ipopt_sources}
    5340        old_usead_2.cpp
    5441        old_usead_1.cpp
     
    5643        old_reciprocal.cpp
    5744        old_mat_mul.cpp
    58         ${adolc_sources}
    59         ${ipopt_sources}
    6045        abs.cpp
    6146        acos.cpp
     
    161146        ${adolc_libs}
    162147        ${ipopt_libs}
    163         ${eigen_libs}
    164148        ${colpack_libs}
    165149)
Note: See TracChangeset for help on using the changeset viewer.