From 9ce3e90a61605b9f44c484969bbe733a9e7c55a1 Mon Sep 17 00:00:00 2001
From: Phillip Samfass <di57zoh3@login04.sng.lrz.de>
Date: Wed, 8 Apr 2020 18:35:20 +0200
Subject: [PATCH] removed job table dependency with local recompute

---
 ExaHyPE/exahype/runners/Runner.cpp       | 2 +-
 ExaHyPE/exahype/solvers/ADERDGSolver.cpp | 8 +++++++-
 ExaHyPE/exahype/solvers/ADERDGSolver.h   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ExaHyPE/exahype/runners/Runner.cpp b/ExaHyPE/exahype/runners/Runner.cpp
index 39d1a8a37..4ab9fe155 100644
--- a/ExaHyPE/exahype/runners/Runner.cpp
+++ b/ExaHyPE/exahype/runners/Runner.cpp
@@ -1068,7 +1068,7 @@ int exahype::runners::Runner::run() {
 #if defined(TaskSharing)
       static_cast<exahype::solvers::ADERDGSolver*>(solver)->finishOutstandingInterTeamCommunication();
 #endif
-#if defined(TaskSharing) || defined(OffloadingLocalRecompute)
+#if defined(TaskSharing)
       static_cast<exahype::solvers::ADERDGSolver*>(solver)->cleanUpStaleTaskOutcomes(true);
 #endif
 #endif
diff --git a/ExaHyPE/exahype/solvers/ADERDGSolver.cpp b/ExaHyPE/exahype/solvers/ADERDGSolver.cpp
index 32ea57653..55c3cb2d5 100644
--- a/ExaHyPE/exahype/solvers/ADERDGSolver.cpp
+++ b/ExaHyPE/exahype/solvers/ADERDGSolver.cpp
@@ -95,6 +95,7 @@ int exahype::solvers::ADERDGSolver::mergeNeighboursHandle                 = 0;
 int exahype::solvers::ADERDGSolver::prolongateFaceDataToVirtualCellHandle = 0;
 int exahype::solvers::ADERDGSolver::restrictToTopMostParentHandle         = 0;
 
+//Todo(Philipp) : remove unused
 int exahype::solvers::ADERDGSolver::event_stp = 0;
 int exahype::solvers::ADERDGSolver::event_stp_remote = 0;
 int exahype::solvers::ADERDGSolver::event_stp_local_replica = 0;
@@ -492,6 +493,8 @@ void exahype::solvers::ADERDGSolver::wrapUpTimeStep(const bool isFirstTimeStepOf
 
 #if defined(DistributedOffloading) && (defined(TaskSharing) || defined(OffloadingLocalRecompute))
   exahype::offloading::JobTableStatistics::getInstance().printStatistics();
+#endif
+#if defined(DistributedOffloading) && defined(TaskSharing)
   cleanUpStaleTaskOutcomes();
 #endif
 }
@@ -2473,9 +2476,12 @@ void exahype::solvers::ADERDGSolver::toString (std::ostream& out) const {
   out <<  ")";
 }
 
+///////////////////////////////////
+// DISTRIBUTED OFFLOADING
+///////////////////////////////////
 #if defined(DistributedOffloading)
 
-#if defined (TaskSharing) || defined(OffloadingLocalRecompute)
+#if defined (TaskSharing) //|| defined(OffloadingLocalRecompute)
 void exahype::solvers::ADERDGSolver::cleanUpStaleTaskOutcomes(bool isFinal) {
   int unsafe_size = _allocatedJobs.unsafe_size();
   assertion(unsafe_size>=0);
diff --git a/ExaHyPE/exahype/solvers/ADERDGSolver.h b/ExaHyPE/exahype/solvers/ADERDGSolver.h
index 7c5549203..ad5694b1a 100644
--- a/ExaHyPE/exahype/solvers/ADERDGSolver.h
+++ b/ExaHyPE/exahype/solvers/ADERDGSolver.h
@@ -1197,7 +1197,7 @@ private:
       bool run(bool calledFromMaster) override;
   };
 
-#if defined(TaskSharing) || defined(OffloadingLocalRecompute) //Todo(Philipp): do we still need this for local recompute?
+#if defined(TaskSharing) // || defined(OffloadingLocalRecompute) //Todo(Philipp): do we still need this for local recompute?
 
   static int REQUEST_JOB_CANCEL;
   static int REQUEST_JOB_ACK;
-- 
GitLab