Commit 3cf5aff6 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

update the task name to use simgrid

parent 34684b32
...@@ -1018,9 +1018,10 @@ protected: ...@@ -1018,9 +1018,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2mTaskNames.get(), STARPU_NAME, p2mTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("P2M_nb%d_i%lld", STARPU_NAME, taskNames.print("P2M_nb%d_i%lld_p%lld",
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
#endif #endif
#endif #endif
0); 0);
...@@ -1409,11 +1410,13 @@ protected: ...@@ -1409,11 +1410,13 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pOuterTaskNames.get(), STARPU_NAME, p2pOuterTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("P2P_out_nb%d_i%lld_nb%d_i%lld_s%d", STARPU_NAME, taskNames.print("P2P_out_nb%d_i%lld_p%lld_nb%d_i%lld_p%lld_s%d",
tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(), tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(idxGroup)->getSizeOfInterval(), tree->getParticleGroup(idxGroup)->getSizeOfInterval(),
tree->getParticleGroup(idxGroup)->getNbParticlesInGroup(),
tree->getParticleGroup(interactionid)->getNumberOfLeavesInBlock(), tree->getParticleGroup(interactionid)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(interactionid)->getSizeOfInterval(), tree->getParticleGroup(interactionid)->getSizeOfInterval(),
tree->getParticleGroup(interactionid)->getNbParticlesInGroup(),
outsideInteractions->size()), outsideInteractions->size()),
#endif #endif
#endif #endif
...@@ -1439,9 +1442,10 @@ protected: ...@@ -1439,9 +1442,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pTaskNames.get(), STARPU_NAME, p2pTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("P2P_nb%d_i%lld", STARPU_NAME, taskNames.print("P2P_nb%d_i%lld_p%lld",
tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(), tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(idxGroup)->getSizeOfInterval()), tree->getParticleGroup(idxGroup)->getSizeOfInterval(),
tree->getParticleGroup(idxGroup)->getNbParticlesInGroup()),
#endif #endif
#endif #endif
0); 0);
...@@ -1480,9 +1484,10 @@ protected: ...@@ -1480,9 +1484,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, l2pTaskNames.get(), STARPU_NAME, l2pTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("L2P_nb%d_i%lld", STARPU_NAME, taskNames.print("L2P_nb%d_i%lld_p%lld",
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
#endif #endif
#endif #endif
0); 0);
......
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