From b2d3b855f12d8701e9cc59ab112da70c1f228053 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Fri, 19 Apr 2024 04:03:26 -0700 Subject: [PATCH] master: update to new xrst using --replace_spell_commands. git_commit.sh: make more like xrst version of git_commit.sh. --- CMakeLists.txt | 2 +- bin/git_commit.sh | 8 ++++++-- configure | 3 +-- include/cppad/core/chkpoint_one/chkpoint_one.hpp | 3 +-- include/cppad/core/fun_property.xrst | 5 +---- include/cppad/local/val_graph/binary_op.hpp | 5 +---- include/cppad/local/val_graph/call_op.hpp | 5 +---- include/cppad/local/val_graph/cexp_op.hpp | 3 +-- include/cppad/local/val_graph/comp_op.hpp | 3 +-- include/cppad/local/val_graph/compress.hpp | 1 - include/cppad/local/val_graph/con_op.hpp | 5 +---- include/cppad/local/val_graph/csum_op.hpp | 5 +---- include/cppad/local/val_graph/dead_code.hpp | 3 +-- include/cppad/local/val_graph/dis_op.hpp | 5 +---- include/cppad/local/val_graph/fold_con.hpp | 3 +-- include/cppad/local/val_graph/pri_op.hpp | 3 +-- include/cppad/local/val_graph/renumber.hpp | 3 +-- include/cppad/local/val_graph/unary_op.hpp | 1 - include/cppad/local/val_graph/vector_op.hpp | 3 +-- include/cppad/utility/thread_alloc.hpp | 7 ------- user_guide.xrst | 2 +- 21 files changed, 23 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c105aba5..91816584c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ IF( POLICY CMP0054 ) ENDIF( POLICY CMP0054 ) # # cppad_version is used by version.sh to get the version number. -SET(cppad_version "20240405") +SET(cppad_version "20240419") SET(cppad_url "https://coin-or.github.io/CppAD" ) SET(cppad_description "Differentiation of C++ Algorithms" ) IF( NOT DEFINED CMAKE_BUILD_TYPE) diff --git a/bin/git_commit.sh b/bin/git_commit.sh index a8226cde4..b1b6777cd 100755 --- a/bin/git_commit.sh +++ b/bin/git_commit.sh @@ -37,28 +37,32 @@ fi set -u # ----------------------------------------------------------------------------- # new files +# convert spaces in file names to @@ list=$( git status --porcelain | sed -n -e '/^?? /p' | \ sed -e 's|^?? ||' -e 's|"||g' -e 's| |@@|g' ) for file in $list do + # convert @@ in file names back to spaces file=$(echo $file | sed -e 's|@@| |g') res='' while [ "$res" != 'delete' ] && [ "$res" != 'add' ] && [ "$res" != 'abort' ] do - read -p "'$file' is uknown to git, [delete/add/abort] ?" res + read -p "'$file' is unknown to git, [delete/add/abort] ?" res done if [ "$res" == 'delete' ] then + # may be spaces in file name so do not use echo_eval echo "rm '$file'" rm "$file" elif [ "$res" == 'abort' ] then echo 'bin/git_commit.sh: aborting' exit 1 + else + git add "$file" fi - git add "$file" done # ----------------------------------------------------------------------------- # temp.log diff --git a/configure b/configure index 8fb6c2282..270463eba 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /usr/bin/env bash # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later # SPDX-FileCopyrightText: Bradley M. Bell -# SPDX-FileContributor: 2003-23 Bradley M. Bell +# SPDX-FileContributor: 2003-24 Bradley M. Bell set -e -u # # ---------------------------------------------------------------------------- # {xrst_begin configure app} @@ -22,7 +22,6 @@ set -e -u # nmake # stdvector # sys -# testvector # ublas # usr # } diff --git a/include/cppad/core/chkpoint_one/chkpoint_one.hpp b/include/cppad/core/chkpoint_one/chkpoint_one.hpp index 2e1a8ddd6..c3a2e660c 100644 --- a/include/cppad/core/chkpoint_one/chkpoint_one.hpp +++ b/include/cppad/core/chkpoint_one/chkpoint_one.hpp @@ -2,7 +2,7 @@ # define CPPAD_CORE_CHKPOINT_ONE_CHKPOINT_ONE_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2003-23 Bradley M. Bell +// SPDX-FileContributor: 2003-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include # include @@ -17,7 +17,6 @@ First generation checkpoint functions. {xrst_begin chkpoint_one app} {xrst_spell algo - inuse sv } diff --git a/include/cppad/core/fun_property.xrst b/include/cppad/core/fun_property.xrst index f67d16af4..6eda3ddf4 100644 --- a/include/cppad/core/fun_property.xrst +++ b/include/cppad/core/fun_property.xrst @@ -1,12 +1,9 @@ # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later # SPDX-FileCopyrightText: Bradley M. Bell -# SPDX-FileContributor: 2003-23 Bradley M. Bell +# SPDX-FileContributor: 2003-24 Bradley M. Bell # ---------------------------------------------------------------------------- {xrst_begin fun_property} -{xrst_spell - inuse -} ADFun Function Properties ######################### diff --git a/include/cppad/local/val_graph/binary_op.hpp b/include/cppad/local/val_graph/binary_op.hpp index eff746b94..e00293674 100644 --- a/include/cppad/local/val_graph/binary_op.hpp +++ b/include/cppad/local/val_graph/binary_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_BINARY_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include # include @@ -167,9 +167,6 @@ class binary_op_t : public base_op_t { /* ------------------------------------------------------------------------------ {xrst_begin val_binary_op_derived dev} -{xrst_spell - xam -} The Binary Value Operator Derived Classes ######################################### diff --git a/include/cppad/local/val_graph/call_op.hpp b/include/cppad/local/val_graph/call_op.hpp index b578622e6..2baa333c8 100644 --- a/include/cppad/local/val_graph/call_op.hpp +++ b/include/cppad/local/val_graph/call_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_CALL_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include # include @@ -17,9 +17,6 @@ namespace CppAD { namespace local { namespace val_graph { /* {xrst_begin val_call_op dev} -{xrst_spell - xam -} The Call Value Operator ####################### diff --git a/include/cppad/local/val_graph/cexp_op.hpp b/include/cppad/local/val_graph/cexp_op.hpp index 5ee9eef5c..89d1536a1 100644 --- a/include/cppad/local/val_graph/cexp_op.hpp +++ b/include/cppad/local/val_graph/cexp_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_CEXP_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include @@ -14,7 +14,6 @@ namespace CppAD { namespace local { namespace val_graph { {xrst_begin val_cexp_op dev} {xrst_spell com - xam } The Conditional Expression Value Operator diff --git a/include/cppad/local/val_graph/comp_op.hpp b/include/cppad/local/val_graph/comp_op.hpp index 4f2e258b2..94297c7bb 100644 --- a/include/cppad/local/val_graph/comp_op.hpp +++ b/include/cppad/local/val_graph/comp_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_COMP_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include # include @@ -15,7 +15,6 @@ namespace CppAD { namespace local { namespace val_graph { {xrst_begin val_comp_op dev} {xrst_spell com - xam } The Compare Value Operator diff --git a/include/cppad/local/val_graph/compress.hpp b/include/cppad/local/val_graph/compress.hpp index 78a936343..e135440c6 100644 --- a/include/cppad/local/val_graph/compress.hpp +++ b/include/cppad/local/val_graph/compress.hpp @@ -12,7 +12,6 @@ namespace CppAD { namespace local { namespace val_graph { {xrst_begin val_tape_compress dev} {xrst_spell dep - xam } Tape Compression diff --git a/include/cppad/local/val_graph/con_op.hpp b/include/cppad/local/val_graph/con_op.hpp index 43ffe2781..ddb9d8369 100644 --- a/include/cppad/local/val_graph/con_op.hpp +++ b/include/cppad/local/val_graph/con_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_CON_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include @@ -12,9 +12,6 @@ namespace CppAD { namespace local { namespace val_graph { /* {xrst_begin val_con_op dev} -{xrst_spell - xam -} The Constant Value Operator ########################### diff --git a/include/cppad/local/val_graph/csum_op.hpp b/include/cppad/local/val_graph/csum_op.hpp index caef2a577..d22a529a4 100644 --- a/include/cppad/local/val_graph/csum_op.hpp +++ b/include/cppad/local/val_graph/csum_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_CSUM_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include # include @@ -17,9 +17,6 @@ namespace CppAD { namespace local { namespace val_graph { /* {xrst_begin val_csum_op dev} -{xrst_spell - xam -} The Cumulative Summation Value Operator ####################################### diff --git a/include/cppad/local/val_graph/dead_code.hpp b/include/cppad/local/val_graph/dead_code.hpp index 588d238ae..716032042 100644 --- a/include/cppad/local/val_graph/dead_code.hpp +++ b/include/cppad/local/val_graph/dead_code.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_DEAD_CODE_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // --------------------------------------------------------------------------- # include # include @@ -12,7 +12,6 @@ namespace CppAD { namespace local { namespace val_graph { {xrst_spell comp dep - xam } Dead Code Elimination diff --git a/include/cppad/local/val_graph/dis_op.hpp b/include/cppad/local/val_graph/dis_op.hpp index 91da3fa49..7203172b3 100644 --- a/include/cppad/local/val_graph/dis_op.hpp +++ b/include/cppad/local/val_graph/dis_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_DIS_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include # include @@ -14,9 +14,6 @@ namespace CppAD { namespace local { namespace val_graph { /* {xrst_begin val_dis_op dev} -{xrst_spell - xam -} The Discrete Value Operator ########################### diff --git a/include/cppad/local/val_graph/fold_con.hpp b/include/cppad/local/val_graph/fold_con.hpp index 615027995..bd2bf5bb3 100644 --- a/include/cppad/local/val_graph/fold_con.hpp +++ b/include/cppad/local/val_graph/fold_con.hpp @@ -2,13 +2,12 @@ # define CPPAD_LOCAL_VAL_GRAPH_FOLD_CON_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell /* ------------------------------------------------------------------------------- {xrst_begin val_tape_fold_con dev} {xrst_spell dep - xam } Constant Folding diff --git a/include/cppad/local/val_graph/pri_op.hpp b/include/cppad/local/val_graph/pri_op.hpp index 7d5920d79..3e4718a7b 100644 --- a/include/cppad/local/val_graph/pri_op.hpp +++ b/include/cppad/local/val_graph/pri_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_PRI_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include @@ -14,7 +14,6 @@ namespace CppAD { namespace local { namespace val_graph { {xrst_begin val_pri_op dev} {xrst_spell str - xam } The Print Value Operator diff --git a/include/cppad/local/val_graph/renumber.hpp b/include/cppad/local/val_graph/renumber.hpp index 3716761d5..b8403b132 100644 --- a/include/cppad/local/val_graph/renumber.hpp +++ b/include/cppad/local/val_graph/renumber.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_RENUMBER_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // --------------------------------------------------------------------------- # include @@ -11,7 +11,6 @@ {xrst_begin val_tape_renumber dev} {xrst_spell dep - xam } Value Re-Numbering diff --git a/include/cppad/local/val_graph/unary_op.hpp b/include/cppad/local/val_graph/unary_op.hpp index 560dec3d9..42d43d26c 100644 --- a/include/cppad/local/val_graph/unary_op.hpp +++ b/include/cppad/local/val_graph/unary_op.hpp @@ -163,7 +163,6 @@ class unary_op_t : public base_op_t { {xrst_begin val_unary_op_derived dev} {xrst_spell neg - xam } The Unary Value Operator Derived Classes diff --git a/include/cppad/local/val_graph/vector_op.hpp b/include/cppad/local/val_graph/vector_op.hpp index 23c453ea7..3c66c47c5 100644 --- a/include/cppad/local/val_graph/vector_op.hpp +++ b/include/cppad/local/val_graph/vector_op.hpp @@ -2,7 +2,7 @@ # define CPPAD_LOCAL_VAL_GRAPH_VECTOR_OP_HPP // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later // SPDX-FileCopyrightText: Bradley M. Bell -// SPDX-FileContributor: 2023-23 Bradley M. Bell +// SPDX-FileContributor: 2023-24 Bradley M. Bell // ---------------------------------------------------------------------------- # include # include @@ -15,7 +15,6 @@ namespace CppAD { namespace local { namespace val_graph { {xrst_begin_parent val_vector_op dev} {xrst_spell com - xam } The Dynamic Vector Value Operators diff --git a/include/cppad/utility/thread_alloc.hpp b/include/cppad/utility/thread_alloc.hpp index 5a284fa0d..f57bd2bd0 100644 --- a/include/cppad/utility/thread_alloc.hpp +++ b/include/cppad/utility/thread_alloc.hpp @@ -1252,9 +1252,6 @@ Example } /* ----------------------------------------------------------------------- {xrst_begin ta_create_array} -{xrst_spell - inuse -} Allocate An Array and Call Default Constructor for its Elements ############################################################### @@ -1378,7 +1375,6 @@ Example {xrst_begin ta_delete_array} {xrst_spell deallocate - inuse } Deallocate An Array and Call Destructor for its Elements @@ -1460,9 +1456,6 @@ Example } /* ----------------------------------------------------------------------- {xrst_begin ta_free_all} -{xrst_spell - inuse -} Free All Memory That Was Allocated for Use by thread_alloc ########################################################## diff --git a/user_guide.xrst b/user_guide.xrst index 9f3792dd9..741b3e865 100644 --- a/user_guide.xrst +++ b/user_guide.xrst @@ -13,7 +13,7 @@ {xrst_comment BEGIN: Before changing see new_release.sh and check_version.sh} -cppad-20240405: CppAD User's Manual +cppad-20240419: CppAD User's Manual ################################### .. image:: {xrst_dir coin.png}