Skip to content

Commit

Permalink
master: update to new xrst using --replace_spell_commands.
Browse files Browse the repository at this point in the history
git_commit.sh: make more like xrst version of git_commit.sh.
  • Loading branch information
bradbell committed Apr 19, 2024
1 parent bcb9870 commit b2d3b85
Show file tree
Hide file tree
Showing 21 changed files with 23 additions and 55 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 6 additions & 2 deletions bin/git_commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
# SPDX-FileContributor: 2003-23 Bradley M. Bell
# SPDX-FileContributor: 2003-24 Bradley M. Bell
set -e -u
# # ----------------------------------------------------------------------------
# {xrst_begin configure app}
Expand All @@ -22,7 +22,6 @@ set -e -u
# nmake
# stdvector
# sys
# testvector
# ublas
# usr
# }
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/core/chkpoint_one/chkpoint_one.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2003-23 Bradley M. Bell
// SPDX-FileContributor: 2003-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/sparse/list_setvec.hpp>
# include <cppad/local/sparse/pack_setvec.hpp>
Expand All @@ -17,7 +17,6 @@ First generation checkpoint functions.
{xrst_begin chkpoint_one app}
{xrst_spell
algo
inuse
sv
}
Expand Down
5 changes: 1 addition & 4 deletions include/cppad/core/fun_property.xrst
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
# SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
# SPDX-FileContributor: 2003-23 Bradley M. Bell
# SPDX-FileContributor: 2003-24 Bradley M. Bell
# ----------------------------------------------------------------------------

{xrst_begin fun_property}
{xrst_spell
inuse
}

ADFun Function Properties
#########################
Expand Down
5 changes: 1 addition & 4 deletions include/cppad/local/val_graph/binary_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/val_graph/base_op.hpp>
# include <cppad/local/val_graph/print_op.hpp>
Expand Down Expand Up @@ -167,9 +167,6 @@ class binary_op_t : public base_op_t<Value> {
/*
------------------------------------------------------------------------------
{xrst_begin val_binary_op_derived dev}
{xrst_spell
xam
}
The Binary Value Operator Derived Classes
#########################################
Expand Down
5 changes: 1 addition & 4 deletions include/cppad/local/val_graph/call_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cstdio>
# include <cppad/local/val_graph/base_op.hpp>
Expand All @@ -17,9 +17,6 @@
namespace CppAD { namespace local { namespace val_graph {
/*
{xrst_begin val_call_op dev}
{xrst_spell
xam
}
The Call Value Operator
#######################
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/local/val_graph/cexp_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/val_graph/base_op.hpp>

Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/local/val_graph/comp_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/val_graph/base_op.hpp>
# include <cppad/local/val_graph/print_op.hpp>
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion include/cppad/local/val_graph/compress.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace CppAD { namespace local { namespace val_graph {
{xrst_begin val_tape_compress dev}
{xrst_spell
dep
xam
}
Tape Compression
Expand Down
5 changes: 1 addition & 4 deletions include/cppad/local/val_graph/con_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/val_graph/base_op.hpp>

Expand All @@ -12,9 +12,6 @@
namespace CppAD { namespace local { namespace val_graph {
/*
{xrst_begin val_con_op dev}
{xrst_spell
xam
}
The Constant Value Operator
###########################
Expand Down
5 changes: 1 addition & 4 deletions include/cppad/local/val_graph/csum_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cstdio>
# include <cppad/local/val_graph/base_op.hpp>
Expand All @@ -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
#######################################
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/local/val_graph/dead_code.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ---------------------------------------------------------------------------
# include <cppad/local/val_graph/tape.hpp>
# include <cppad/local/val_graph/rev_depend.hpp>
Expand All @@ -12,7 +12,6 @@ namespace CppAD { namespace local { namespace val_graph {
{xrst_spell
comp
dep
xam
}
Dead Code Elimination
Expand Down
5 changes: 1 addition & 4 deletions include/cppad/local/val_graph/dis_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/val_graph/base_op.hpp>
# include <cppad/local/val_graph/print_op.hpp>
Expand All @@ -14,9 +14,6 @@
namespace CppAD { namespace local { namespace val_graph {
/*
{xrst_begin val_dis_op dev}
{xrst_spell
xam
}
The Discrete Value Operator
###########################
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/local/val_graph/fold_con.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// 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
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/local/val_graph/pri_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/val_graph/base_op.hpp>

Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/local/val_graph/renumber.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ---------------------------------------------------------------------------
# include <cppad/local/val_graph/op_hash_table.hpp>

Expand All @@ -11,7 +11,6 @@
{xrst_begin val_tape_renumber dev}
{xrst_spell
dep
xam
}
Value Re-Numbering
Expand Down
1 change: 0 additions & 1 deletion include/cppad/local/val_graph/unary_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ class unary_op_t : public base_op_t<Value> {
{xrst_begin val_unary_op_derived dev}
{xrst_spell
neg
xam
}
The Unary Value Operator Derived Classes
Expand Down
3 changes: 1 addition & 2 deletions include/cppad/local/val_graph/vector_op.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
// SPDX-FileContributor: 2023-23 Bradley M. Bell
// SPDX-FileContributor: 2023-24 Bradley M. Bell
// ----------------------------------------------------------------------------
# include <cppad/local/val_graph/base_op.hpp>
# include <cppad/local/val_graph/print_op.hpp>
Expand All @@ -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
Expand Down
7 changes: 0 additions & 7 deletions include/cppad/utility/thread_alloc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1252,9 +1252,6 @@ Example
}
/* -----------------------------------------------------------------------
{xrst_begin ta_create_array}
{xrst_spell
inuse
}
Allocate An Array and Call Default Constructor for its Elements
###############################################################
Expand Down Expand Up @@ -1378,7 +1375,6 @@ Example
{xrst_begin ta_delete_array}
{xrst_spell
deallocate
inuse
}
Deallocate An Array and Call Destructor for its Elements
Expand Down Expand Up @@ -1460,9 +1456,6 @@ Example
}
/* -----------------------------------------------------------------------
{xrst_begin ta_free_all}
{xrst_spell
inuse
}
Free All Memory That Was Allocated for Use by thread_alloc
##########################################################
Expand Down
2 changes: 1 addition & 1 deletion user_guide.xrst
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit b2d3b85

Please sign in to comment.