Explicitly specify adjoint access mode for recovery.

Ensure correct behaviour when calling resetTask in the initial implicit
task.

Author: jblueh

include/opdi/logic/logicInterface.hpp

@@ -83,15 +83,10 @@ namespace opdi {
       virtual void freeState(void* state) = 0;
       virtual void recoverState(void* state) = 0;
 
-      virtual void setAdjointAccessMode(AdjointAccessMode adjointAccess) = 0;
+      virtual void setAdjointAccessMode(AdjointAccessMode mode) = 0;
       virtual AdjointAccessMode getAdjointAccessMode() const = 0;
 
-      /** @brief Complement positional tape resets by OpDiLib-specific cleanup.
-       *
-       *  Cleanup performed for the task of the calling thread. Reverts changes of the adjoint access mode, up to the
-       *  last adjoint access mode that was set at this position.
-       */
-      virtual void resetTask(void* position) = 0;
+      virtual void resetTask(void* position, AdjointAccessMode mode) = 0;
 
       virtual void addReverseBarrier() = 0;
       virtual void addReverseFlush() = 0;

include/opdi/logic/omp/implicitTaskOmpLogic.cpp

@@ -144,20 +144,22 @@ void opdi::ImplicitTaskOmpLogic::onImplicitTaskEnd(void* dataPtr) {
   }
 }
 
-void opdi::ImplicitTaskOmpLogic::resetTask(void* position) {
+void opdi::ImplicitTaskOmpLogic::resetTask(void* position, opdi::LogicInterface::AdjointAccessMode mode) {
 
-  void* parallelDataPtr = backend->getParallelData();
+  void* taskDataPtr = backend->getTaskData();
 
-  if (parallelDataPtr) {
-    opdi::ParallelOmpLogic::Data* parallelData = reinterpret_cast<opdi::ParallelOmpLogic::Data*>(parallelDataPtr);
+  if (taskDataPtr != nullptr) {
+    opdi::ImplicitTaskOmpLogic::Data* taskData = reinterpret_cast<opdi::ImplicitTaskOmpLogic::Data*>(taskDataPtr);
 
-    Data* taskData = reinterpret_cast<Data*>(parallelData->childTasks[omp_get_thread_num()]);
+    if (!taskData->initialImplicitTask) {
+      assert(tool->comparePosition(taskData->positions.front(), position) <= 0);
 
-    assert(tool->comparePosition(taskData->positions.front(), position) <= 0);
-
-    while (tool->comparePosition(taskData->positions.back(), position) > 0) {
-      taskData->positions.pop_back();
-      taskData->adjointAccessModes.pop_back();
+      while (tool->comparePosition(taskData->positions.back(), position) > 0) {
+        taskData->positions.pop_back();
+        taskData->adjointAccessModes.pop_back();
+      }
     }
+
+    taskData->adjointAccessModes.back() = mode;
   }
 }

include/opdi/logic/omp/implicitTaskOmpLogic.hpp

@@ -66,6 +66,6 @@ namespace opdi {
                                         void* parallelDataPtr);
       virtual void onImplicitTaskEnd(void* dataPtr);
 
-      virtual void resetTask(void* position);
+      virtual void resetTask(void* position, AdjointAccessMode mode);
   };
 }