bumped version to 2.3.0;

improved CGPrettyPrinter and changed installation path;
Operation node stores the name in a unique_ptr

Author: Joao Rui Leal

CMakeLists.txt

@@ -18,7 +18,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 PROJECT(cppadcg CXX C)
 
-SET(cppadcg_version      "2.2.0" )
+SET(cppadcg_version      "2.3.0" )
 SET(cppadcg_url          "https://github.com/joaoleal/CppADCodeGen" )
 SET(cppadcg_description  "A C++ Algorithmic Differentiation Package with Source Code Generation" )
 
@@ -111,7 +111,7 @@ SET(install_cppadcg_include_location "${CMAKE_INSTALL_PREFIX}/include/cppad")
 SET(install_cppad_include_location   "${CMAKE_INSTALL_PREFIX}/include/cppad")
 SET(install_library_pkg_location     "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
 SET(install_doc_location             "${CMAKE_INSTALL_PREFIX}/share/doc/cppadcg")
-SET(install_python_location          "${CMAKE_INSTALL_PREFIX}/share/cppad/cg/")
+SET(install_python_location          "${CMAKE_INSTALL_PREFIX}/share/cppadcg/python")
 
 # ----------------------------------------------------------------------------
 #                    Define some optional compiler flags

debian/changelog

@@ -1,3 +1,11 @@
+cppadcodegen (2.3.0-1) unstable; urgency=low
+
+   * added support for Clang/LLVM 5.0
+   * use unique_ptr internally in additional locations
+   * pretty printers for GDB
+
+ -- Joao Leal <[email protected]>  Wed, 24 Jan 2018 13:00:00 +0000
+
 cppadcodegen (2.2.0-1) unstable; urgency=low
 
    * initial work for multithreaded evaluation of Jacobians and Hessians

debian/control

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5),
                libattr1 (>= 1 ),
                cmake (>= 2.8),
                doxygen,
-               cppad-dev (>= 20170000.3)|cppad (>= 20170000.3),
+               cppad-dev (>= 20170000.3)|cppad (>= 2017.00.00.3),
                libadolc-dev,
                libclang-dev (>= 3.2) | libclang-3.6-dev | libclang-3.8-dev | libclang-4.0-dev,
                libeigen3-dev,
@@ -20,7 +20,7 @@ Package: cppadcodegen-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         cppad-dev (>= 20170000.3)|cppad (>= 20170000.3)
+         cppad-dev (>= 20170000.3)|cppad (>= 2017.00.00.3)
 Suggests: libclang-dev (>= 3.2),
           llvm-4.0-dev,
           libeigen3-dev
@@ -30,4 +30,4 @@ Package: cppadcodegen-doc
 Section: doc
 Architecture: all
 Description: Documentation for CppADCodeGen
- HTML Documentation for CppADCodeGen package. 
+ HTML Documentation for CppADCodeGen package.

debian/cppadcodegen-dev.install

@@ -1,3 +1,3 @@
 debian/tmp/usr/include/
 debian/tmp/usr/share/pkgconfig/
-debian/tmp/usr/share/cppad/cg/
+debian/tmp/usr/share/cppadcg/

include/cppad/cg/operation_node.hpp

@@ -20,7 +20,7 @@ namespace cg {
 
 /**
  * An operation node.
- * 
+ *
  * @author Joao Leal
  */
 template<class Base>
@@ -35,7 +35,7 @@ class OperationNode {
     static const std::set<CGOpCode> CUSTOM_NODE_CLASS;
 private:
     /**
-     * the source code handler that own this node 
+     * the source code handler that own this node
      * (only null for temporary OperationNodes)
      */
     CodeHandler<Base>* handler_;
@@ -48,7 +48,7 @@ class OperationNode {
      */
     std::vector<size_t> info_;
     /**
-     * arguments required by the operation 
+     * arguments required by the operation
      * (empty for independent variables and possibly for the 1st assignment
      *  of a dependent variable)
      */
@@ -60,7 +60,7 @@ class OperationNode {
     /**
      * name for the result of this operation
      */
-    std::string* name_;
+    std::unique_ptr<std::string> name_;
 public:
     /**
      * Changes the current operation type into an Alias.
@@ -72,14 +72,13 @@ class OperationNode {
         operation_ = CGOpCode::Alias;
         arguments_.resize(1);
         arguments_[0] = other;
-        delete name_;
-        name_ = nullptr;
+        name_.reset();
     }
-    
+
     /**
      * Provides the source code handler that owns this node.
      * It can only be null for temporary nodes.
-     * 
+     *
      * @return a CodeHandler which owns this nodes memory (possibly null)
      */
     inline CodeHandler<Base>* getCodeHandler() const {
@@ -96,7 +95,7 @@ class OperationNode {
 
     /**
      * Changes the current operation type.
-     * The previous operation information/options might also have to be 
+     * The previous operation information/options might also have to be
      * changed, use getInfo() to change it if required.
      * @param op the new operation type
      * @param arguments the arguments for the new operation
@@ -149,7 +148,7 @@ class OperationNode {
      *         no name was assigned to this node yet
      */
     inline const std::string* getName() const {
-        return name_;
+        return name_.get();
     }
 
     /**
@@ -160,29 +159,28 @@ class OperationNode {
         if (name_ != nullptr)
             *name_ = name;
         else
-            name_ = new std::string(name);
+            name_.reset(new std::string(name));
     }
 
     /**
      * Clears any name assigned to this node.
      */
     inline void clearName() {
-        delete name_;
-        name_ = nullptr;
+        name_.reset();
     }
-    
+
     /**
      * Provides the index in CodeHandler which owns this OperationNode.
-     * A value of std::numeric_limits<size_t>::max() means that it is not 
+     * A value of std::numeric_limits<size_t>::max() means that it is not
      * managed by any CodeHandler.
      * This value can change if its position changes in the CodeHandler.
-     * 
-     * @return the index in the CodeHandler's array of managed nodes 
+     *
+     * @return the index in the CodeHandler's array of managed nodes
      */
     inline size_t getHandlerPosition() const {
         return pos_;
     }
-   
+
     // argument iterators
 
     inline iterator begin() {
@@ -232,13 +230,11 @@ class OperationNode {
     inline const_reverse_iterator crend() const noexcept {
         return arguments_.crend();
     }
-    
-    inline virtual ~OperationNode() {
-        delete name_;
-    }
-    
+
+    inline virtual ~OperationNode() = default;
+
 protected:
-    
+
     inline OperationNode(const OperationNode& orig) :
         handler_(orig.handler_),
         operation_(orig.operation_),
@@ -252,8 +248,7 @@ class OperationNode {
                          CGOpCode op) :
         handler_(handler),
         operation_(op),
-        pos_(std::numeric_limits<size_t>::max()),
-        name_(nullptr) {
+        pos_(std::numeric_limits<size_t>::max()) {
     }
 
     inline OperationNode(CodeHandler<Base>* handler,
@@ -262,8 +257,7 @@ class OperationNode {
         handler_(handler),
         operation_(op),
         arguments_ {arg},
-        pos_(std::numeric_limits<size_t>::max()),
-        name_(nullptr) {
+        pos_(std::numeric_limits<size_t>::max()) {
     }
 
     inline OperationNode(CodeHandler<Base>* handler,
@@ -272,8 +266,7 @@ class OperationNode {
         handler_(handler),
         operation_(op),
         arguments_(std::move(args)),
-        pos_(std::numeric_limits<size_t>::max()),
-        name_(nullptr) {
+        pos_(std::numeric_limits<size_t>::max()) {
     }
 
     inline OperationNode(CodeHandler<Base>* handler,
@@ -284,8 +277,7 @@ class OperationNode {
         operation_(op),
         info_(std::move(info)),
         arguments_(std::move(args)),
-        pos_(std::numeric_limits<size_t>::max()),
-        name_(nullptr) {
+        pos_(std::numeric_limits<size_t>::max()) {
     }
 
     inline OperationNode(CodeHandler<Base>* handler,
@@ -296,10 +288,9 @@ class OperationNode {
         operation_(op),
         info_(info),
         arguments_(args),
-        pos_(std::numeric_limits<size_t>::max()),
-        name_(nullptr) {
+        pos_(std::numeric_limits<size_t>::max()) {
     }
-    
+
     inline void setHandlerPosition(size_t pos) {
         pos_ = pos;
     }
@@ -308,15 +299,15 @@ class OperationNode {
 
     /**
      * Creates a temporary operation node.
-     * 
+     *
      * @warning This node should never be provided to a CodeHandler.
      */
     static std::unique_ptr<OperationNode<Base>> makeTemporaryNode(CGOpCode op,
                                                                   const std::vector<size_t>& info,
                                                                   const std::vector<Argument<Base> >& args) {
         return std::unique_ptr<OperationNode<Base>> (new OperationNode<Base>(nullptr, op, info, args));
     }
-    
+
 protected:
     static inline std::set<CGOpCode> makeCustomNodeClassesSet();
 
@@ -371,4 +362,4 @@ inline std::ostream& operator<<(
 } // END cg namespace
 } // END CppAD namespace
 
-#endif
+#endif

python/gdb/cppadcg/CGPrettyPrinter.py

@@ -1,52 +1,88 @@
-'''
- * --------------------------------------------------------------------------
- *  CppADCodeGen: C++ Algorithmic Differentiation with Source Code Generation:
- *    Copyright (C) 2018 Ciengis
- *
- *  CppADCodeGen is distributed under multiple licenses:
- *
- *   - Eclipse Public License Version 1.0 (EPL1), and
- *   - GNU General Public License Version 3 (GPL3).
- *
- *  EPL1 terms and conditions can be found in the file "epl-v10.txt", while
- *  terms and conditions for the GPL3 can be found in the file "gpl3.txt".
- * ----------------------------------------------------------------------------
- * Author: Joao Leal
-'''
+# * --------------------------------------------------------------------------
+# *  CppADCodeGen: C++ Algorithmic Differentiation with Source Code Generation:
+# *    Copyright (C) 2018 Ciengis
+# *
+# *  CppADCodeGen is distributed under multiple licenses:
+# *
+# *   - Eclipse Public License Version 1.0 (EPL1), and
+# *   - GNU General Public License Version 3 (GPL3).
+# *
+# *  EPL1 terms and conditions can be found in the file "epl-v10.txt", while
+# *  terms and conditions for the GPL3 can be found in the file "gpl3.txt".
+# * ----------------------------------------------------------------------------
+# * Author: Joao Leal
+
 import gdb
 
 
+def is_null(value_ptr):
+    if value_ptr.type.code == gdb.TYPE_CODE_PTR:
+        value_str = str(value_ptr)
+        return value_str == '0x0' or value_str == 'NULL'
+    else:
+        return False
+
+
+def get_smart_ptr_val(smart_ptr):
+    pointer = smart_ptr['_M_t']['_M_t']['_M_head_impl']
+    if is_null(pointer):
+        return None
+    else:
+        return pointer.dereference()
+
+
 class CGPrettyPrinter:
     def __init__(self, val):
         self.val = val
 
     def to_string(self):
-        out = "CG:"
-
         try:
             node_ptr = self.val['node_']
-            if str(node_ptr) != 'NULL':
+            if not is_null(node_ptr):
                 node = node_ptr.dereference()
-                if str(node['name_']) != '0x0' and str(node['name_']) != 'NULL':
-                    out += "\n name: " + str(node['name_'])
-                out += "\n variable operation: " + str(node['operation_'])
-            else:
-                out += "\n <constant>"
 
-            # pointer to value
-            pointer = self.val['value_']['_M_t']['_M_t']['_M_head_impl']
-            if str(pointer) != 'NULL':
-                out += "\n value: " + str(pointer.dereference())
+                out = "variable CG ("
+
+                name = get_smart_ptr_val(node['name_'])
+                if name is not None:
+                    out += "'" + str(name) + "', "
+                out += str(node['operation_'])
+
+                value = get_smart_ptr_val(self.val['value_'])
+                if value is not None:
+                    out += ", " + str(value)
+
+                out += ")"
+                return out
+            else:
+                value = get_smart_ptr_val(self.val['value_'])
+                return "constant CG (" + str(value) + ")"
 
         except Exception as e:
             print('An exception occurred: {}'.format(e))
-        except:
-            print('An exception occurred')
 
         return out
 
     def children(self):
-        return [('node', self.val['node_']), ('value', self.val['value_'])]
+        c = []
+
+        # value
+        value = get_smart_ptr_val(self.val['value_'])
+        if value is not None:
+            c.append(('value_', value))
+
+        # node
+        node_ptr = self.val['node_']
+        if not is_null(node_ptr):
+            c.append(('node_', node_ptr.dereference()))
+
+        return c
+
+    def display_hint(self):
+        if is_null(self.val['node_']):
+            return 'string'
+        else:
+            return 'map'
 
 ###############################################################################
 #