Mentions légales du service

Skip to content
Snippets Groups Projects
Commit b4cd5c50 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

always use the same priorities

parent da7e180d
Branches
No related tags found
No related merge requests found
...@@ -377,23 +377,13 @@ FStarPUFmmPriorities FStarPUFmmPriorities::controller; ...@@ -377,23 +377,13 @@ FStarPUFmmPriorities FStarPUFmmPriorities::controller;
#elif defined(SCALFMM_STARPU_USE_PRIO)// STARPU_SUPPORT_SCHEDULER #elif defined(SCALFMM_STARPU_USE_PRIO)// STARPU_SUPPORT_SCHEDULER
class FStarPUFmmPriorities{ #include "FOmpPriorities.hpp"
static FStarPUFmmPriorities controller;
enum Priorities{ class FStarPUFmmPriorities {
Prio_P2M = 9 - 5, static FStarPUFmmPriorities controller;
Prio_M2M = 8 - 5, FOmpPriorities ompPrio;
Prio_M2L_High = 7 - 5,
Prio_L2L = 6 - 5,
Prio_P2P_Big = 5 - 5,
Prio_M2L = 4 - 5,
Prio_L2P = 3 - 5,
Prio_P2P_Small = 2 - 5
};
int treeHeight;
FStarPUFmmPriorities() : treeHeight(0){ FStarPUFmmPriorities() : ompPrio(0){
} }
public: public:
...@@ -404,38 +394,38 @@ public: ...@@ -404,38 +394,38 @@ public:
void init(struct starpu_conf* /*conf*/, const int inTreeHeight, void init(struct starpu_conf* /*conf*/, const int inTreeHeight,
FStarPUKernelCapacities* /*inCapacities*/){ FStarPUKernelCapacities* /*inCapacities*/){
treeHeight = inTreeHeight; ompPrio = FOmpPriorities(inTreeHeight);
} }
int getInsertionPosP2M() const { int getInsertionPosP2M() const {
return Prio_P2M; return ompPrio.getInsertionPosP2M();
} }
int getInsertionPosM2M(const int /*inLevel*/) const { int getInsertionPosM2M(const int inLevel) const {
return Prio_M2M; return ompPrio.getInsertionPosM2M(inLevel);
} }
int getInsertionPosP2M(bool /*willBeSend*/) const { int getInsertionPosP2M(bool /*willBeSend*/) const {
return Prio_P2M; return ompPrio.getInsertionPosP2M();
} }
int getInsertionPosM2M(const int /*inLevel*/, bool /*willBeSend*/) const { int getInsertionPosM2M(const int inLevel, bool /*willBeSend*/) const {
return Prio_M2M; return ompPrio.getInsertionPosM2M(inLevel);
} }
int getInsertionPosM2L(const int inLevel) const { int getInsertionPosM2L(const int inLevel) const {
return inLevel == treeHeight-1 ? Prio_M2L: Prio_M2L_High; return ompPrio.getInsertionPosM2L(inLevel);
} }
int getInsertionPosM2LExtern(const int inLevel) const { int getInsertionPosM2LExtern(const int inLevel) const {
return inLevel == treeHeight-1 ? Prio_M2L : Prio_M2L_High; return ompPrio.getInsertionPosM2LExtern(inLevel);
} }
int getInsertionPosL2L(const int /*inLevel*/) const { int getInsertionPosL2L(const int inLevel) const {
return Prio_L2L; return ompPrio.getInsertionPosL2L(inLevel);
} }
int getInsertionPosL2P() const { int getInsertionPosL2P() const {
return Prio_L2P; return ompPrio.getInsertionPosL2P();
} }
int getInsertionPosP2P() const { int getInsertionPosP2P() const {
return Prio_P2P_Big; return ompPrio.getInsertionPosP2P();
} }
int getInsertionPosP2PExtern() const { int getInsertionPosP2PExtern() const {
return Prio_P2P_Small; return ompPrio.getInsertionPosP2PExtern();
} }
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment