From a8cb907d45b9e2150bf75dc37f3c1676eb80492d Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 8 Apr 2020 14:09:55 +0200
Subject: [PATCH] [wip/cppad] Update to v20200000.2
---
cppad/Makefile | 2 +-
cppad/PLIST | 147 ++++++++++++++++++++++++++++++++++++------------
cppad/depend.mk | 15 +----
cppad/distinfo | 6 +-
4 files changed, 118 insertions(+), 52 deletions(-)
diff --git a/cppad/Makefile b/cppad/Makefile
index 03c0a3d7..51ffbb35 100644
--- a/cppad/Makefile
+++ b/cppad/Makefile
@@ -4,7 +4,7 @@
ORG= coin-or
NAME= cppad
-VERSION= 20180000.0
+VERSION= 20200000.2
DISTNAME= ${VERSION}
PKGNAME= ${NAME}-${VERSION}
diff --git a/cppad/PLIST b/cppad/PLIST
index 66501085..7269bf3c 100644
--- a/cppad/PLIST
+++ b/cppad/PLIST
@@ -12,6 +12,7 @@ include/cppad/core/ad_ctor.hpp
include/cppad/core/ad_fun.hpp
include/cppad/core/ad_io.hpp
include/cppad/core/ad_to_string.hpp
+include/cppad/core/ad_type.hpp
include/cppad/core/ad_valued.hpp
include/cppad/core/add.hpp
include/cppad/core/add_eq.hpp
@@ -19,8 +20,30 @@ include/cppad/core/arithmetic.hpp
include/cppad/core/asinh.hpp
include/cppad/core/atan2.hpp
include/cppad/core/atanh.hpp
-include/cppad/core/atomic_base.hpp
+include/cppad/core/atomic/atomic_one.hpp
+include/cppad/core/atomic/atomic_three.hpp
+include/cppad/core/atomic/atomic_two.hpp
+include/cppad/core/atomic/three_afun.hpp
+include/cppad/core/atomic/three_ctor.hpp
+include/cppad/core/atomic/three_for_type.hpp
+include/cppad/core/atomic/three_forward.hpp
+include/cppad/core/atomic/three_hes_sparsity.hpp
+include/cppad/core/atomic/three_jac_sparsity.hpp
+include/cppad/core/atomic/three_rev_depend.hpp
+include/cppad/core/atomic/three_reverse.hpp
+include/cppad/core/atomic/two_afun.hpp
+include/cppad/core/atomic/two_clear.hpp
+include/cppad/core/atomic/two_ctor.hpp
+include/cppad/core/atomic/two_for_sparse_hes.hpp
+include/cppad/core/atomic/two_for_sparse_jac.hpp
+include/cppad/core/atomic/two_forward.hpp
+include/cppad/core/atomic/two_option.hpp
+include/cppad/core/atomic/two_rev_depend.hpp
+include/cppad/core/atomic/two_rev_sparse_hes.hpp
+include/cppad/core/atomic/two_rev_sparse_jac.hpp
+include/cppad/core/atomic/two_reverse.hpp
include/cppad/core/azmul.hpp
+include/cppad/core/base2ad.hpp
include/cppad/core/base_complex.hpp
include/cppad/core/base_cond_exp.hpp
include/cppad/core/base_double.hpp
@@ -34,21 +57,41 @@ include/cppad/core/bool_fun.hpp
include/cppad/core/bool_valued.hpp
include/cppad/core/capacity_order.hpp
include/cppad/core/check_for_nan.hpp
-include/cppad/core/checkpoint.hpp
+include/cppad/core/chkpoint_one/chkpoint_one.hpp
+include/cppad/core/chkpoint_one/ctor.hpp
+include/cppad/core/chkpoint_one/for_sparse_jac.hpp
+include/cppad/core/chkpoint_one/forward.hpp
+include/cppad/core/chkpoint_one/rev_sparse_hes.hpp
+include/cppad/core/chkpoint_one/rev_sparse_jac.hpp
+include/cppad/core/chkpoint_one/reverse.hpp
+include/cppad/core/chkpoint_one/set_hes_sparse_bool.hpp
+include/cppad/core/chkpoint_one/set_hes_sparse_set.hpp
+include/cppad/core/chkpoint_one/set_jac_sparse_bool.hpp
+include/cppad/core/chkpoint_one/set_jac_sparse_set.hpp
+include/cppad/core/chkpoint_two/chkpoint_two.hpp
+include/cppad/core/chkpoint_two/ctor.hpp
+include/cppad/core/chkpoint_two/dynamic.hpp
+include/cppad/core/chkpoint_two/for_type.hpp
+include/cppad/core/chkpoint_two/forward.hpp
+include/cppad/core/chkpoint_two/hes_sparsity.hpp
+include/cppad/core/chkpoint_two/jac_sparsity.hpp
+include/cppad/core/chkpoint_two/rev_depend.hpp
+include/cppad/core/chkpoint_two/reverse.hpp
include/cppad/core/compare.hpp
include/cppad/core/compound_assign.hpp
+include/cppad/core/con_dyn_var.hpp
include/cppad/core/cond_exp.hpp
include/cppad/core/convert.hpp
include/cppad/core/cppad_assert.hpp
-include/cppad/core/define.hpp
include/cppad/core/dependent.hpp
-include/cppad/core/discrete.hpp
+include/cppad/core/discrete/discrete.hpp
include/cppad/core/div.hpp
include/cppad/core/div_eq.hpp
include/cppad/core/drivers.hpp
include/cppad/core/epsilon.hpp
include/cppad/core/equal_op_seq.hpp
include/cppad/core/erf.hpp
+include/cppad/core/erfc.hpp
include/cppad/core/expm1.hpp
include/cppad/core/for_hes_sparsity.hpp
include/cppad/core/for_jac_sparsity.hpp
@@ -56,14 +99,20 @@ include/cppad/core/for_one.hpp
include/cppad/core/for_sparse_hes.hpp
include/cppad/core/for_sparse_jac.hpp
include/cppad/core/for_two.hpp
-include/cppad/core/forward.hpp
+include/cppad/core/forward/forward.hpp
include/cppad/core/fun_check.hpp
include/cppad/core/fun_construct.hpp
include/cppad/core/fun_eval.hpp
+include/cppad/core/graph/cpp_graph.hpp
+include/cppad/core/graph/from_graph.hpp
+include/cppad/core/graph/from_json.hpp
+include/cppad/core/graph/graph_op_enum.hpp
+include/cppad/core/graph/to_graph.hpp
+include/cppad/core/graph/to_json.hpp
include/cppad/core/hash_code.hpp
include/cppad/core/hessian.hpp
include/cppad/core/identical.hpp
-include/cppad/core/independent.hpp
+include/cppad/core/independent/independent.hpp
include/cppad/core/integer.hpp
include/cppad/core/jacobian.hpp
include/cppad/core/log1p.hpp
@@ -71,14 +120,13 @@ include/cppad/core/lu_ratio.hpp
include/cppad/core/mul.hpp
include/cppad/core/mul_eq.hpp
include/cppad/core/near_equal_ext.hpp
+include/cppad/core/new_dynamic.hpp
include/cppad/core/num_skip.hpp
include/cppad/core/numeric_limits.hpp
-include/cppad/core/old_atomic.hpp
include/cppad/core/omp_max_thread.hpp
include/cppad/core/opt_val_hes.hpp
include/cppad/core/optimize.hpp
include/cppad/core/ordered.hpp
-include/cppad/core/par_var.hpp
include/cppad/core/parallel_ad.hpp
include/cppad/core/pow.hpp
include/cppad/core/print_for.hpp
@@ -111,16 +159,16 @@ include/cppad/core/undef.hpp
include/cppad/core/user_ad.hpp
include/cppad/core/value.hpp
include/cppad/core/var2par.hpp
-include/cppad/core/vec_ad.hpp
+include/cppad/core/vec_ad/vec_ad.hpp
include/cppad/core/zdouble.hpp
include/cppad/cppad.hpp
+include/cppad/example/atomic_three/mat_mul.hpp
+include/cppad/example/atomic_two/eigen_cholesky.hpp
+include/cppad/example/atomic_two/eigen_mat_inv.hpp
+include/cppad/example/atomic_two/eigen_mat_mul.hpp
include/cppad/example/base_adolc.hpp
include/cppad/example/cppad_eigen.hpp
-include/cppad/example/eigen_cholesky.hpp
-include/cppad/example/eigen_mat_inv.hpp
-include/cppad/example/eigen_mat_mul.hpp
include/cppad/example/eigen_plugin.hpp
-include/cppad/example/mat_mul.hpp
include/cppad/ipopt/solve.hpp
include/cppad/ipopt/solve_callback.hpp
include/cppad/ipopt/solve_result.hpp
@@ -133,6 +181,8 @@ include/cppad/local/asin_op.hpp
include/cppad/local/asinh_op.hpp
include/cppad/local/atan_op.hpp
include/cppad/local/atanh_op.hpp
+include/cppad/local/atom_state.hpp
+include/cppad/local/atomic_index.hpp
include/cppad/local/color_general.hpp
include/cppad/local/color_symmetric.hpp
include/cppad/local/comp_op.hpp
@@ -143,16 +193,17 @@ include/cppad/local/cppad_colpack.hpp
include/cppad/local/cskip_op.hpp
include/cppad/local/csum_op.hpp
include/cppad/local/declare_ad.hpp
+include/cppad/local/define.hpp
include/cppad/local/discrete_op.hpp
include/cppad/local/div_op.hpp
include/cppad/local/erf_op.hpp
include/cppad/local/exp_op.hpp
include/cppad/local/expm1_op.hpp
-include/cppad/local/for_hes_sweep.hpp
-include/cppad/local/for_jac_sweep.hpp
-include/cppad/local/forward0sweep.hpp
-include/cppad/local/forward1sweep.hpp
-include/cppad/local/forward2sweep.hpp
+include/cppad/local/graph/cpp_graph_itr.hpp
+include/cppad/local/graph/cpp_graph_op.hpp
+include/cppad/local/graph/json_lexer.hpp
+include/cppad/local/graph/json_parser.hpp
+include/cppad/local/graph/json_writer.hpp
include/cppad/local/hash_code.hpp
include/cppad/local/independent.hpp
include/cppad/local/is_pod.hpp
@@ -161,15 +212,18 @@ include/cppad/local/log1p_op.hpp
include/cppad/local/log_op.hpp
include/cppad/local/mul_op.hpp
include/cppad/local/op.hpp
-include/cppad/local/op_code.hpp
+include/cppad/local/op_code_dyn.hpp
+include/cppad/local/op_code_var.hpp
include/cppad/local/optimize/cexp_info.hpp
+include/cppad/local/optimize/csum_op_info.hpp
include/cppad/local/optimize/csum_stacks.hpp
-include/cppad/local/optimize/csum_variable.hpp
-include/cppad/local/optimize/get_opt_op_info.hpp
+include/cppad/local/optimize/get_cexp_info.hpp
+include/cppad/local/optimize/get_dyn_previous.hpp
+include/cppad/local/optimize/get_op_previous.hpp
+include/cppad/local/optimize/get_op_usage.hpp
+include/cppad/local/optimize/get_par_usage.hpp
include/cppad/local/optimize/hash_code.hpp
include/cppad/local/optimize/match_op.hpp
-include/cppad/local/optimize/old2new.hpp
-include/cppad/local/optimize/opt_op_info.hpp
include/cppad/local/optimize/optimize_run.hpp
include/cppad/local/optimize/record_csum.hpp
include/cppad/local/optimize/record_pv.hpp
@@ -178,25 +232,32 @@ include/cppad/local/optimize/record_vv.hpp
include/cppad/local/optimize/size_pair.hpp
include/cppad/local/optimize/usage.hpp
include/cppad/local/parameter_op.hpp
-include/cppad/local/player.hpp
+include/cppad/local/play/addr_enum.hpp
+include/cppad/local/play/atom_op_info.hpp
+include/cppad/local/play/player.hpp
+include/cppad/local/play/random_iterator.hpp
+include/cppad/local/play/random_setup.hpp
+include/cppad/local/play/sequential_iterator.hpp
+include/cppad/local/play/subgraph_iterator.hpp
include/cppad/local/pod_vector.hpp
include/cppad/local/pow_op.hpp
include/cppad/local/print_op.hpp
include/cppad/local/prototype_op.hpp
-include/cppad/local/recorder.hpp
-include/cppad/local/rev_hes_sweep.hpp
-include/cppad/local/rev_jac_sweep.hpp
-include/cppad/local/reverse_sweep.hpp
+include/cppad/local/record/comp_op.hpp
+include/cppad/local/record/cond_exp.hpp
+include/cppad/local/record/put_dyn_atomic.hpp
+include/cppad/local/record/put_var_atomic.hpp
+include/cppad/local/record/recorder.hpp
include/cppad/local/set_get_in_parallel.hpp
include/cppad/local/sign_op.hpp
include/cppad/local/sin_op.hpp
include/cppad/local/sinh_op.hpp
-include/cppad/local/sparse_binary_op.hpp
-include/cppad/local/sparse_internal.hpp
-include/cppad/local/sparse_list.hpp
-include/cppad/local/sparse_pack.hpp
-include/cppad/local/sparse_sizevec.hpp
-include/cppad/local/sparse_unary_op.hpp
+include/cppad/local/sparse/binary_op.hpp
+include/cppad/local/sparse/internal.hpp
+include/cppad/local/sparse/list_setvec.hpp
+include/cppad/local/sparse/pack_setvec.hpp
+include/cppad/local/sparse/svec_setvec.hpp
+include/cppad/local/sparse/unary_op.hpp
include/cppad/local/sqrt_op.hpp
include/cppad/local/std_set.hpp
include/cppad/local/store_op.hpp
@@ -207,9 +268,20 @@ include/cppad/local/subgraph/get_rev.hpp
include/cppad/local/subgraph/info.hpp
include/cppad/local/subgraph/init_rev.hpp
include/cppad/local/subgraph/sparsity.hpp
+include/cppad/local/sweep/call_atomic.hpp
+include/cppad/local/sweep/dynamic.hpp
+include/cppad/local/sweep/for_hes.hpp
+include/cppad/local/sweep/for_jac.hpp
+include/cppad/local/sweep/forward0.hpp
+include/cppad/local/sweep/forward1.hpp
+include/cppad/local/sweep/forward2.hpp
+include/cppad/local/sweep/rev_hes.hpp
+include/cppad/local/sweep/rev_jac.hpp
+include/cppad/local/sweep/reverse.hpp
include/cppad/local/tan_op.hpp
include/cppad/local/tanh_op.hpp
-include/cppad/local/user_state.hpp
+include/cppad/local/utility/cppad_vector_itr.hpp
+include/cppad/local/utility/vector_bool.hpp
include/cppad/local/zmul_op.hpp
include/cppad/speed/det_33.hpp
include/cppad/speed/det_by_lu.hpp
@@ -244,6 +316,7 @@ include/cppad/utility/romberg_one.hpp
include/cppad/utility/rosen_34.hpp
include/cppad/utility/runge_45.hpp
include/cppad/utility/set_union.hpp
+include/cppad/utility/sparse2eigen.hpp
include/cppad/utility/sparse_rc.hpp
include/cppad/utility/sparse_rcv.hpp
include/cppad/utility/speed_test.hpp
@@ -253,5 +326,9 @@ include/cppad/utility/time_test.hpp
include/cppad/utility/to_string.hpp
include/cppad/utility/track_new_del.hpp
include/cppad/utility/vector.hpp
+include/cppad/utility/vector_bool.hpp
include/cppad/wno_conversion.hpp
+lib/libcppad_lib.so
+lib/libcppad_lib.so.340.2
+lib/pkgconfig/cppad.pc
share/pkgconfig/cppad.pc
diff --git a/cppad/depend.mk b/cppad/depend.mk
index 80f49912..4ed3f04f 100644
--- a/cppad/depend.mk
+++ b/cppad/depend.mk
@@ -12,18 +12,7 @@ endif
ifeq (+,$(CPPAD_DEPEND_MK)) # ------------------------------------------
include ../../mk/robotpkg.prefs.mk # for OPSYS
-ifeq (Ubuntu,${OPSYS})
- ifneq (,$(filter 12.04 14.04,${OS_VERSION}))
- PREFER.cppad?= robotpkg
- else
- PREFER.cppad?= system
- endif
-else ifeq (Fedora,${OPSYS})
- PREFER.cppad?= system
-else ifeq (Debian,${OPSYS})
- PREFER.cppad?= system
-endif
-PREFER.cppad?= robotpkg
+PREFER.cppad?= robotpkg
SYSTEM_SEARCH.cppad=\
'include/cppad/configure.hpp:' \
@@ -35,7 +24,7 @@ SYSTEM_PKG.Fedora.cppad=cppad-devel
DEPEND_USE+= cppad
-DEPEND_ABI.cppad?= cppad>=20140000.3
+DEPEND_ABI.cppad?= cppad>=20200000.2
DEPEND_DIR.cppad?= ../../wip/cppad
endif # CPPAD_DEPEND_MK ------------------------------------------------
diff --git a/cppad/distinfo b/cppad/distinfo
index 8f6087ba..1a09a825 100644
--- a/cppad/distinfo
+++ b/cppad/distinfo
@@ -1,3 +1,3 @@
-SHA1 (20180000.0.tar.gz) = 962308a5ea77254f7af8f6b50ab6807dfe6d1122
-RMD160 (20180000.0.tar.gz) = 5cf25a318461d55d5ac4cc5928619f7b94da9a6c
-Size (20180000.0.tar.gz) = 1337643 bytes
+SHA1 (20200000.2.tar.gz) = 940b75d166f93e3383fdc4302a94b1a8c0f3298e
+RMD160 (20200000.2.tar.gz) = ee1b541ab82e7591bc256a9228ca580621b0b3ff
+Size (20200000.2.tar.gz) = 1636214 bytes
--
GitLab