Commit 0465941d authored by BRAMAS Berenger's avatar BRAMAS Berenger

move codelet name into task for new starpu

parent 4fa5f55c
......@@ -732,6 +732,9 @@ protected:
STARPU_R, cellHandles[tree->getHeight()-1][idxGroup].symb,
STARPU_RW, cellHandles[tree->getHeight()-1][idxGroup].up,
STARPU_R, particleHandles[idxGroup].symb,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, p2m_cl.name,
#endif
0);
}
......@@ -792,6 +795,9 @@ protected:
task->cl_arg = arg_buffer;
task->cl_arg_size = arg_buffer_size;
task->priority = FStarPUFmmPriorities::Controller().getInsertionPosM2M(idxLevel);
#ifdef STARPU_USE_TASK_NAME
task->name = m2m_cl[nbSubCellGroups-1].name;
#endif
FAssertLF(starpu_task_submit(task) == 0);
}
}
......@@ -816,6 +822,9 @@ protected:
STARPU_R, cellHandles[idxLevel][idxGroup].symb,
STARPU_R, cellHandles[idxLevel][idxGroup].up,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), cellHandles[idxLevel][idxGroup].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, m2l_cl_in.name,
#endif
0);
}
FLOG( timerInBlock.tac() );
......@@ -838,6 +847,9 @@ protected:
STARPU_R, cellHandles[idxLevel][interactionid].symb,
STARPU_R, cellHandles[idxLevel][interactionid].up,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), cellHandles[idxLevel][interactionid].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, m2l_cl_inout.name,
#endif
0);
}
}
......@@ -900,6 +912,9 @@ protected:
task->cl_arg = arg_buffer;
task->cl_arg_size = arg_buffer_size;
task->priority = FStarPUFmmPriorities::Controller().getInsertionPosL2L(idxLevel);
#ifdef STARPU_USE_TASK_NAME
task->name = l2l_cl[nbSubCellGroups-1].name;
#endif
FAssertLF(starpu_task_submit(task) == 0);
}
}
......@@ -922,6 +937,9 @@ protected:
STARPU_PRIORITY, FStarPUFmmPriorities::Controller().getInsertionPosP2P(),
STARPU_R, particleHandles[idxGroup].symb,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[idxGroup].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, p2p_cl_in.name,
#endif
0);
}
FLOG( timerInBlock.tac() );
......@@ -939,6 +957,9 @@ protected:
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[idxGroup].down,
STARPU_R, particleHandles[interactionid].symb,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[interactionid].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, p2p_cl_inout.name,
#endif
0);
}
}
......@@ -966,6 +987,9 @@ protected:
STARPU_R, cellHandles[tree->getHeight()-1][idxGroup].down,
STARPU_R, particleHandles[idxGroup].symb,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[idxGroup].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, l2p_cl.name,
#endif
0);
}
......
......@@ -1314,6 +1314,9 @@ protected:
STARPU_R, cellHandles[tree->getHeight()-1][idxGroup].symb,
STARPU_RW, cellHandles[tree->getHeight()-1][idxGroup].up,
STARPU_R, particleHandles[idxGroup].symb,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, p2m_cl.name,
#endif
0);
}
......@@ -1375,6 +1378,9 @@ protected:
task->cl_arg = arg_buffer;
task->cl_arg_size = arg_buffer_size;
task->priority = FStarPUFmmPriorities::Controller().getInsertionPosM2M(idxLevel);
#ifdef STARPU_USE_TASK_NAME
task->name = task->cl->name;
#endif
FAssertLF(starpu_task_submit(task) == 0);
}
......@@ -1456,6 +1462,9 @@ protected:
task->cl_arg = arg_buffer;
task->cl_arg_size = arg_buffer_size;
task->priority = FStarPUFmmPriorities::Controller().getInsertionPosM2M(idxLevel);
#ifdef STARPU_USE_TASK_NAME
task->name = task->cl->name;
#endif
FAssertLF(starpu_task_submit(task) == 0);
}
}
......@@ -1521,6 +1530,9 @@ protected:
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), cellHandles[idxLevel][idxGroup].down,
STARPU_R, remoteCellGroups[idxLevel][interactionid].handleSymb,
STARPU_R, remoteCellGroups[idxLevel][interactionid].handleUp,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, m2l_cl_inout_mpi.name,
#endif
0);
}
}
......@@ -1546,6 +1558,9 @@ protected:
STARPU_R, cellHandles[idxLevel][idxGroup].symb,
STARPU_R, cellHandles[idxLevel][idxGroup].up,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), cellHandles[idxLevel][idxGroup].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, m2l_cl_in.name,
#endif
0);
}
FLOG( timerInBlock.tac() );
......@@ -1568,6 +1583,9 @@ protected:
STARPU_R, cellHandles[idxLevel][interactionid].symb,
STARPU_R, cellHandles[idxLevel][interactionid].up,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), cellHandles[idxLevel][interactionid].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, m2l_cl_inout.name,
#endif
0);
}
}
......@@ -1724,6 +1742,9 @@ protected:
task->cl_arg = arg_buffer;
task->cl_arg_size = arg_buffer_size;
task->priority = FStarPUFmmPriorities::Controller().getInsertionPosL2L(idxLevel);
#ifdef STARPU_USE_TASK_NAME
task->name = task->cl->name;
#endif
FAssertLF(starpu_task_submit(task) == 0);
}
}
......@@ -1778,6 +1799,9 @@ protected:
task->cl_arg = arg_buffer;
task->cl_arg_size = arg_buffer_size;
task->priority = FStarPUFmmPriorities::Controller().getInsertionPosL2L(idxLevel);
#ifdef STARPU_USE_TASK_NAME
task->name = task->cl->name;
#endif
FAssertLF(starpu_task_submit(task) == 0);
}
}
......@@ -1802,6 +1826,9 @@ protected:
STARPU_R, particleHandles[idxGroup].symb,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[idxGroup].down,
STARPU_R, remoteParticleGroupss[interactionid].handleSymb,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, p2p_cl_inout_mpi.name,
#endif
0);
}
}
......@@ -1825,6 +1852,9 @@ protected:
STARPU_PRIORITY, FStarPUFmmPriorities::Controller().getInsertionPosP2P(),
STARPU_R, particleHandles[idxGroup].symb,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[idxGroup].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, p2p_cl_in.name,
#endif
0);
}
FLOG( timerInBlock.tac() );
......@@ -1842,6 +1872,9 @@ protected:
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[idxGroup].down,
STARPU_R, particleHandles[interactionid].symb,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[interactionid].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, p2p_cl_inout.name,
#endif
0);
}
}
......@@ -1867,6 +1900,9 @@ protected:
STARPU_R, cellHandles[tree->getHeight()-1][idxGroup].down,
STARPU_R, particleHandles[idxGroup].symb,
(STARPU_RW|STARPU_COMMUTE_IF_SUPPORTED), particleHandles[idxGroup].down,
#ifdef STARPU_USE_TASK_NAME
STARPU_NAME, l2p_cl.name,
#endif
0);
}
......
......@@ -12,7 +12,7 @@
/////////////////////////////////////////////////////
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 2)
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 3)
#define STARPU_SUPPORT_COMMUTE
#define STARPU_SUPPORT_SCHEDULER
#else
......@@ -25,6 +25,10 @@
#warning StarPU Arbiter is not supported
#endif
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 3)
#define STARPU_USE_TASK_NAME
#endif
/////////////////////////////////////////////////////
#if defined(STARPU_USE_CUDA) && defined(SCALFMM_USE_CUDA)
......
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