Commit d438e2de authored by BRAMAS Berenger's avatar BRAMAS Berenger

reset priorities as there were

parent 1bae05be
......@@ -138,7 +138,7 @@ public:
struct starpu_conf conf;
FAssertLF(starpu_conf_init(&conf) == 0);
// FStarPUFmmPriorities::Controller().init(&conf, tree->getHeight(), inKernels);
FStarPUFmmPriorities::Controller().init(&conf, tree->getHeight(), inKernels);
FAssertLF(starpu_init(&conf) == 0);
starpu_pthread_mutex_t initMutex;
......
......@@ -61,7 +61,11 @@ public:
if(inTreeHeight > 2){
int incPrio = 0;
prioL2P = incPrio++;
prioP2MSend = incPrio++;
prioP2M = incPrio++;
prioM2MSend = incPrio++;
prioM2M = incPrio++;
prioM2L = incPrio;
prioM2LExtern = incPrio;
......@@ -69,19 +73,14 @@ public:
prioL2L = incPrio++;
incPrio += (treeHeight-2)-1 // M2L is done treeHeight-2 times
incPrio += (treeHeight-2)-1 // M2L is done treeHeight-2 times
+(treeHeight-3)-1; // L2L is done treeHeight-3 times
prioM2M = incPrio++;
prioM2MSend = incPrio++;
prioP2M = incPrio++;
prioP2MSend = incPrio++;
prioP2P = incPrio;
prioP2P = incPrio;
prioP2PExtern = incPrio;
prioP2PMpi = incPrio++;
prioP2PMpi = incPrio++;
prioL2P = incPrio++;
assert(incPrio == 6 + (treeHeight-2) + (treeHeight-3));
}
else{
......@@ -325,13 +324,13 @@ public:
return willBeSend?prioM2MSend:prioM2M;
}
int getPrioM2L(const int inLevel) const {
return prioM2L + (treeHeight - inLevel - 1)*2;
return prioM2L + (inLevel - 2)*2;
}
int getPrioM2LExtern(const int inLevel) const {
return prioM2LExtern + (treeHeight - inLevel - 1)*2;
return prioM2LExtern + (inLevel - 2)*2;
}
int getPrioL2L(const int inLevel) const {
return prioL2L + (treeHeight - inLevel - 1)*2;
return prioL2L + (inLevel - 2)*2;
}
int getPrioL2P() const {
return prioL2P;
......@@ -343,7 +342,7 @@ public:
return prioP2PExtern;
}
int getPrioM2LMpi(const int inLevel) const {
return prioM2LMpi + (treeHeight - inLevel - 1)*2;
return prioM2LMpi + (inLevel - 2)*2;
}
int getPrioP2PMpi() const {
return prioP2PMpi;
......
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