Updates for the tagging tape.

SciCompKL · Dec 27, 2024 · 8b1dd95 · 8b1dd95
1 parent 0dc6ac0
commit 8b1dd95
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 7 deletions.
diff --git a/include/codi/tapes/tagging/tagTapeReverse.hpp b/include/codi/tapes/tagging/tagTapeReverse.hpp
@@ -269,8 +269,6 @@ namespace codi {
 
       /// Verify tag.
       bool isIdentifierActive(Identifier const& index) const {
-        Base::verifyTag(index.tag);
-
         return index.tag != Base::PassiveTag;
       }
 

diff --git a/include/codi/tools/helpers/preaccumulationHelper.hpp b/include/codi/tools/helpers/preaccumulationHelper.hpp
@@ -560,9 +560,7 @@ namespace codi {
    * and the outputs.
    */
   template<typename T_Type>
-  struct PreaccumulationHelper<
-      T_Type, typename enable_if_same<typename T_Type::Tape,
-                                      TagTapeReverse<typename T_Type::Real, typename T_Type::Tape::Tag>>::type> {
+  struct PreaccumulationHelper<T_Type, TapeTraits::EnableIfTagTapeReverse<typename T_Type::Tape>> {
     public:
 
       using Type = CODI_DD(T_Type, CODI_DEFAULT_LHS_EXPRESSION);  ///< See PreaccumulationHelper.
@@ -668,8 +666,10 @@ namespace codi {
       }
 
       void handleInput(Type const& input) {
-        inputLocations.push_back(&input);
-        getTape().setTagOnVariable(input);
+        if (Type::getTape().getPassiveIndex() != input.getIdentifier()) {
+          inputLocations.push_back(&input);
+          getTape().setTagOnVariable(input);
+        }
       }
 
       /// Terminator for the recursive implementation.

diff --git a/include/codi/traits/tapeTraits.hpp b/include/codi/traits/tapeTraits.hpp
@@ -183,6 +183,51 @@ namespace codi {
     template<typename Tape>
     using EnableIfNoEditing = typename std::enable_if<!SupportsEditing<Tape>::value>::type;
 
+
+    /// If the tape inherits from TagTapeBase.
+    template<typename Tape, typename = void>
+    struct IsTagTape : std::false_type {};
+
+#ifndef DOXYGEN_DISABLE
+    template<typename Tape>
+    struct IsTagTape<Tape, typename enable_if_base_of<TagTapeReverse<typename Tape::Real, typename Tape::Tag>, Tape>::type>
+        : std::true_type {};
+
+    template<typename Tape>
+    struct IsTagTape<Tape, typename enable_if_base_of<TagTapeForward<typename Tape::Real, typename Tape::Tag>, Tape>::type>
+        : std::true_type {};
+#endif
+
+#if CODI_IS_CPP14
+    /// Value entry of IsTagTape
+    template<typename Tape>
+    bool constexpr isTagTape = IsTagTape<Tape>::value;
+#endif
+
+    /// Enable if wrapper for IsTagTape
+    template<typename Tape>
+    using EnableIfTagTape = typename std::enable_if<IsTagTape<Tape>::value>::type;
+
+    /// If the tape inherits from TagTapeReverse.
+    template<typename Tape, typename = void>
+    struct IsTagTapeReverse : std::false_type {};
+
+#ifndef DOXYGEN_DISABLE
+    template<typename Tape>
+    struct IsTagTapeReverse<Tape, typename enable_if_base_of<TagTapeReverse<typename Tape::Real, typename Tape::Tag>, Tape>::type>
+        : std::true_type {};
+#endif
+
+#if CODI_IS_CPP14
+    /// Value entry of IsTagTape
+    template<typename Tape>
+    bool constexpr isTagTapeReverse = IsTagTapeReverse<Tape>::value;
+#endif
+
+    /// Enable if wrapper for IsTagTape
+    template<typename Tape>
+    using EnableIfTagTapeReverse = typename std::enable_if<IsTagTapeReverse<Tape>::value>::type;
+
     /// @}
   }
 }