Commit a348fd97 authored by BRAMAS Berenger's avatar BRAMAS Berenger

update starpu

parent 0c7299a2
......@@ -142,10 +142,12 @@ protected:
if(operationsToProceed & FFmmM2M) upwardPass();
if(operationsToProceed & FFmmM2L) transferPass();
if(operationsToProceed & FFmmM2L) transferPass( FAbstractAlgorithm::upperWorkingLevel,FAbstractAlgorithm::lowerWorkingLevel-1);
if(operationsToProceed & FFmmL2L) downardPass();
if(operationsToProceed & FFmmM2L) transferPass(FAbstractAlgorithm::lowerWorkingLevel-1, FAbstractAlgorithm::lowerWorkingLevel);
if( operationsToProceed & FFmmL2P ) mergePass();
#pragma omp taskwait
......@@ -473,10 +475,10 @@ protected:
FLOG( FLog::Controller << "\t\t upwardPass in " << timer.tacAndElapsed() << "s\n" );
}
void transferPass(){
void transferPass(const int startLevel, const int endLevel){
FLOG( FTic timer; );
FLOG( FTic timerInBlock; FTic timerOutBlock; );
for(int idxLevel = FAbstractAlgorithm::lowerWorkingLevel-1 ; idxLevel >= FAbstractAlgorithm::upperWorkingLevel ; --idxLevel){
for(int idxLevel = startLevel ; idxLevel < endLevel ; ++idxLevel){
FLOG( timerInBlock.tic() );
{
typename OctreeClass::CellGroupIterator iterCells = tree->cellsBegin(idxLevel);
......
......@@ -288,11 +288,15 @@ public:
}
void rebuildInteractions(){
setenv("OMP_WAIT_POLICY", "PASSIVE", 1);
#pragma omp parallel
#pragma omp single
buildExternalInteractionVecs();
buildHandles();
omp_set_num_threads(1);
}
protected:
......
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