Clarify dependencies of local reduction operations in index managers.

SciCompKL · Mar 4, 2024 · d1d16c7 · d1d16c7
1 parent 141b13a
commit d1d16c7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/include/codi/tapes/indices/linearIndexManager.hpp b/include/codi/tapes/indices/linearIndexManager.hpp
@@ -105,7 +105,11 @@ namespace codi {
       /// \copydoc IndexManagerInterface::addToTapeValues <br><br>
       /// Implementation: Adds maximum live indices.
       void addToTapeValues(TapeValues& values) const {
-        values.addLongEntry("Max. live indices", getLargestCreatedIndex(), TapeValues::LocalReductionOperation::Sum);
+        TapeValues::LocalReductionOperation constexpr operation = NeedsStaticStorage
+                                                                    ? TapeValues::LocalReductionOperation::Max
+                                                                    : TapeValues::LocalReductionOperation::Sum;
+
+        values.addLongEntry("Max. live indices", getLargestCreatedIndex(), operation);
       }
 
       /// \copydoc IndexManagerInterface::freeIndex <br><br>

diff --git a/include/codi/tapes/indices/multiUseIndexManager.hpp b/include/codi/tapes/indices/multiUseIndexManager.hpp
@@ -93,8 +93,11 @@ namespace codi {
 
         double memoryindexUseVector = (double)indexUse.size() * (double)(sizeof(Index));
 
-        values.addDoubleEntry("Memory: index use vector", memoryindexUseVector,
-                              TapeValues::LocalReductionOperation::Max, true, true);
+        TapeValues::LocalReductionOperation constexpr operation = NeedsStaticStorage
+                                                                      ? TapeValues::LocalReductionOperation::Max
+                                                                      : TapeValues::LocalReductionOperation::Sum;
+
+        values.addDoubleEntry("Memory: index use vector", memoryindexUseVector, operation, true, true);
       }
 
       /// \copydoc ReuseIndexManager::assignIndex

diff --git a/include/codi/tapes/indices/parallelReuseIndexManager.hpp b/include/codi/tapes/indices/parallelReuseIndexManager.hpp
@@ -136,7 +136,10 @@ namespace codi {
       void addToTapeValues(TapeValues& values) const {
         unsigned long maximumGlobalIndex = globalMaximumIndex();
 
-        values.addUnsignedLongEntry("Max. live indices", maximumGlobalIndex, TapeValues::LocalReductionOperation::Max);
+        // As maximumGlobalIndex is static, it uses a local maximum reduction.
+        TapeValues::LocalReductionOperation constexpr operation = TapeValues::LocalReductionOperation::Max;
+
+        values.addUnsignedLongEntry("Max. live indices", maximumGlobalIndex, operation);
         // The number of current live indices cannot be computed from one instance alone.
         // It equals the number of maximum live indices minus the number of indices stored across all instances.
 

diff --git a/include/codi/tapes/indices/reuseIndexManager.hpp b/include/codi/tapes/indices/reuseIndexManager.hpp
@@ -93,8 +93,12 @@ namespace codi {
         unsigned long storedIndices = this->usedIndicesPos + this->unusedIndicesPos;
         long currentLiveIndices = maximumGlobalIndex - storedIndices;
 
-        values.addUnsignedLongEntry("Max. live indices", maximumGlobalIndex, TapeValues::LocalReductionOperation::Max);
-        values.addLongEntry("Cur. live indices", currentLiveIndices, TapeValues::LocalReductionOperation::Max);
+        TapeValues::LocalReductionOperation constexpr operation = NeedsStaticStorage
+                                                                      ? TapeValues::LocalReductionOperation::Max
+                                                                      : TapeValues::LocalReductionOperation::Sum;
+
+        values.addUnsignedLongEntry("Max. live indices", maximumGlobalIndex, operation);
+        values.addLongEntry("Cur. live indices", currentLiveIndices, operation);
 
         Base::addToTapeValues(values);
       }