Commit 9ce3e90a authored by Phillip Samfass's avatar Phillip Samfass

removed job table dependency with local recompute

parent 68c9c879
...@@ -1068,7 +1068,7 @@ int exahype::runners::Runner::run() { ...@@ -1068,7 +1068,7 @@ int exahype::runners::Runner::run() {
#if defined(TaskSharing) #if defined(TaskSharing)
static_cast<exahype::solvers::ADERDGSolver*>(solver)->finishOutstandingInterTeamCommunication(); static_cast<exahype::solvers::ADERDGSolver*>(solver)->finishOutstandingInterTeamCommunication();
#endif #endif
#if defined(TaskSharing) || defined(OffloadingLocalRecompute) #if defined(TaskSharing)
static_cast<exahype::solvers::ADERDGSolver*>(solver)->cleanUpStaleTaskOutcomes(true); static_cast<exahype::solvers::ADERDGSolver*>(solver)->cleanUpStaleTaskOutcomes(true);
#endif #endif
#endif #endif
......
...@@ -95,6 +95,7 @@ int exahype::solvers::ADERDGSolver::mergeNeighboursHandle = 0; ...@@ -95,6 +95,7 @@ int exahype::solvers::ADERDGSolver::mergeNeighboursHandle = 0;
int exahype::solvers::ADERDGSolver::prolongateFaceDataToVirtualCellHandle = 0; int exahype::solvers::ADERDGSolver::prolongateFaceDataToVirtualCellHandle = 0;
int exahype::solvers::ADERDGSolver::restrictToTopMostParentHandle = 0; int exahype::solvers::ADERDGSolver::restrictToTopMostParentHandle = 0;
//Todo(Philipp) : remove unused
int exahype::solvers::ADERDGSolver::event_stp = 0; int exahype::solvers::ADERDGSolver::event_stp = 0;
int exahype::solvers::ADERDGSolver::event_stp_remote = 0; int exahype::solvers::ADERDGSolver::event_stp_remote = 0;
int exahype::solvers::ADERDGSolver::event_stp_local_replica = 0; int exahype::solvers::ADERDGSolver::event_stp_local_replica = 0;
...@@ -492,6 +493,8 @@ void exahype::solvers::ADERDGSolver::wrapUpTimeStep(const bool isFirstTimeStepOf ...@@ -492,6 +493,8 @@ void exahype::solvers::ADERDGSolver::wrapUpTimeStep(const bool isFirstTimeStepOf
#if defined(DistributedOffloading) && (defined(TaskSharing) || defined(OffloadingLocalRecompute)) #if defined(DistributedOffloading) && (defined(TaskSharing) || defined(OffloadingLocalRecompute))
exahype::offloading::JobTableStatistics::getInstance().printStatistics(); exahype::offloading::JobTableStatistics::getInstance().printStatistics();
#endif
#if defined(DistributedOffloading) && defined(TaskSharing)
cleanUpStaleTaskOutcomes(); cleanUpStaleTaskOutcomes();
#endif #endif
} }
...@@ -2473,9 +2476,12 @@ void exahype::solvers::ADERDGSolver::toString (std::ostream& out) const { ...@@ -2473,9 +2476,12 @@ void exahype::solvers::ADERDGSolver::toString (std::ostream& out) const {
out << ")"; out << ")";
} }
///////////////////////////////////
// DISTRIBUTED OFFLOADING
///////////////////////////////////
#if defined(DistributedOffloading) #if defined(DistributedOffloading)
#if defined (TaskSharing) || defined(OffloadingLocalRecompute) #if defined (TaskSharing) //|| defined(OffloadingLocalRecompute)
void exahype::solvers::ADERDGSolver::cleanUpStaleTaskOutcomes(bool isFinal) { void exahype::solvers::ADERDGSolver::cleanUpStaleTaskOutcomes(bool isFinal) {
int unsafe_size = _allocatedJobs.unsafe_size(); int unsafe_size = _allocatedJobs.unsafe_size();
assertion(unsafe_size>=0); assertion(unsafe_size>=0);
......
...@@ -1197,7 +1197,7 @@ private: ...@@ -1197,7 +1197,7 @@ private:
bool run(bool calledFromMaster) override; 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_CANCEL;
static int REQUEST_JOB_ACK; static int REQUEST_JOB_ACK;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment