Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
ScalFMM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
ScalFMM
Commits
93fb14cf
Commit
93fb14cf
authored
10 years ago
by
BRAMAS Berenger
Browse files
Options
Downloads
Patches
Plain Diff
put priority in the right order
parent
accaeca7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp
+8
-8
8 additions, 8 deletions
Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp
with
8 additions
and
8 deletions
Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp
+
8
−
8
View file @
93fb14cf
...
@@ -337,7 +337,7 @@ protected:
...
@@ -337,7 +337,7 @@ protected:
ParticleGroupClass
*
containers
=
tree
->
getParticleGroup
(
idxGroup
);
ParticleGroupClass
*
containers
=
tree
->
getParticleGroup
(
idxGroup
);
#pragma omp task default(shared) firstprivate(leafCells, cellPoles, containers) depend(inout: cellPoles[0]) priority_if_supported(
-
4)
#pragma omp task default(shared) firstprivate(leafCells, cellPoles, containers) depend(inout: cellPoles[0]) priority_if_supported(4)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
leafCells
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
0
,
"P2M"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
leafCells
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
0
,
"P2M"
));
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
...
@@ -394,7 +394,7 @@ protected:
...
@@ -394,7 +394,7 @@ protected:
FAssertLF
(
nbSubCellGroups
<=
9
);
FAssertLF
(
nbSubCellGroups
<=
9
);
}
}
#pragma omp task default(none) firstprivate(idxLevel, currentCells, cellPoles, subCellGroups, subCellGroupPoles, nbSubCellGroups) depend(inout: cellPoles[0]) depend(in: subCellGroupPoles[0][0], subCellGroupPoles[1][0], subCellGroupPoles[2][0], subCellGroupPoles[3][0], subCellGroupPoles[4][0], subCellGroupPoles[5][0], subCellGroupPoles[6][0], subCellGroupPoles[7][0], subCellGroupPoles[8][0]) priority_if_supported(
-
3)
#pragma omp task default(none) firstprivate(idxLevel, currentCells, cellPoles, subCellGroups, subCellGroupPoles, nbSubCellGroups) depend(inout: cellPoles[0]) depend(in: subCellGroupPoles[0][0], subCellGroupPoles[1][0], subCellGroupPoles[2][0], subCellGroupPoles[3][0], subCellGroupPoles[4][0], subCellGroupPoles[5][0], subCellGroupPoles[6][0], subCellGroupPoles[7][0], subCellGroupPoles[8][0]) priority_if_supported(3)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
1
,
"M2M"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
1
,
"M2M"
));
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
...
@@ -452,7 +452,7 @@ protected:
...
@@ -452,7 +452,7 @@ protected:
PoleCellClass
*
cellPoles
=
currentCells
->
getRawMultipoleBuffer
();
PoleCellClass
*
cellPoles
=
currentCells
->
getRawMultipoleBuffer
();
LocalCellClass
*
cellLocals
=
currentCells
->
getRawLocalBuffer
();
LocalCellClass
*
cellLocals
=
currentCells
->
getRawLocalBuffer
();
#pragma omp task default(none) firstprivate(currentCells, cellPoles, cellLocals, idxLevel) depend(commute_if_supported: cellLocals[0]) depend(in: cellPoles[0]) priority_if_supported(idxLevel==FAbstractAlgorithm::lowerWorkingLevel-1?0:
-
2)
#pragma omp task default(none) firstprivate(currentCells, cellPoles, cellLocals, idxLevel) depend(commute_if_supported: cellLocals[0]) depend(in: cellPoles[0]) priority_if_supported(idxLevel==FAbstractAlgorithm::lowerWorkingLevel-1?0:2)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
2
,
"M2L"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
2
,
"M2L"
));
const
MortonIndex
blockStartIdx
=
currentCells
->
getStartingIndex
();
const
MortonIndex
blockStartIdx
=
currentCells
->
getStartingIndex
();
...
@@ -516,7 +516,7 @@ protected:
...
@@ -516,7 +516,7 @@ protected:
LocalCellClass
*
cellOtherLocals
=
cellsOther
->
getRawLocalBuffer
();
LocalCellClass
*
cellOtherLocals
=
cellsOther
->
getRawLocalBuffer
();
const
std
::
vector
<
OutOfBlockInteraction
>*
outsideInteractions
=
&
(
*
currentInteractions
).
interactions
;
const
std
::
vector
<
OutOfBlockInteraction
>*
outsideInteractions
=
&
(
*
currentInteractions
).
interactions
;
#pragma omp task default(none) firstprivate(currentCells, cellPoles, cellLocals, outsideInteractions, cellsOther, cellOtherPoles, cellOtherLocals, idxLevel) depend(commute_if_supported: cellLocals[0], cellOtherLocals[0]) depend(in: cellPoles[0], cellOtherPoles[0]) priority_if_supported(idxLevel==FAbstractAlgorithm::lowerWorkingLevel-1?0:
-
2)
#pragma omp task default(none) firstprivate(currentCells, cellPoles, cellLocals, outsideInteractions, cellsOther, cellOtherPoles, cellOtherLocals, idxLevel) depend(commute_if_supported: cellLocals[0], cellOtherLocals[0]) depend(in: cellPoles[0], cellOtherPoles[0]) priority_if_supported(idxLevel==FAbstractAlgorithm::lowerWorkingLevel-1?0:2)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
cellsOther
->
getStartingIndex
())
<<
50
|
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
3
,
"M2L ext"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
cellsOther
->
getStartingIndex
())
<<
50
|
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
3
,
"M2L ext"
));
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
...
@@ -597,7 +597,7 @@ protected:
...
@@ -597,7 +597,7 @@ protected:
FAssertLF
(
nbSubCellGroups
<=
9
);
FAssertLF
(
nbSubCellGroups
<=
9
);
}
}
#pragma omp task default(none) firstprivate(idxLevel, currentCells, cellLocals, subCellGroups, subCellLocalGroupsLocal, nbSubCellGroups) depend(commute_if_supported: subCellLocalGroupsLocal[0][0], subCellLocalGroupsLocal[1][0], subCellLocalGroupsLocal[2][0], subCellLocalGroupsLocal[3][0], subCellLocalGroupsLocal[4][0], subCellLocalGroupsLocal[5][0], subCellLocalGroupsLocal[6][0], subCellLocalGroupsLocal[7][0], subCellLocalGroupsLocal[8][0]) depend(in: cellLocals[0]) priority_if_supported(
-
1)
#pragma omp task default(none) firstprivate(idxLevel, currentCells, cellLocals, subCellGroups, subCellLocalGroupsLocal, nbSubCellGroups) depend(commute_if_supported: subCellLocalGroupsLocal[0][0], subCellLocalGroupsLocal[1][0], subCellLocalGroupsLocal[2][0], subCellLocalGroupsLocal[3][0], subCellLocalGroupsLocal[4][0], subCellLocalGroupsLocal[5][0], subCellLocalGroupsLocal[6][0], subCellLocalGroupsLocal[7][0], subCellLocalGroupsLocal[8][0]) depend(in: cellLocals[0]) priority_if_supported(1)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
4
,
"L2L"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
currentCells
->
getStartingIndex
()
<<
16
)
|
(
idxLevel
<<
8
)
|
4
,
"L2L"
));
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
...
@@ -650,7 +650,7 @@ protected:
...
@@ -650,7 +650,7 @@ protected:
ParticleGroupClass
*
containers
=
(
*
iterParticles
);
ParticleGroupClass
*
containers
=
(
*
iterParticles
);
unsigned
char
*
containersDown
=
containers
->
getRawAttributesBuffer
();
unsigned
char
*
containersDown
=
containers
->
getRawAttributesBuffer
();
#pragma omp task default(none) firstprivate(containers, containersDown) depend(commute_if_supported: containersDown[0]) priority_if_supported((containers->getNbParticlesInGroup()/containers->getNumberOfLeavesInBlock())>size_t(p2pPrioCriteria*1.1)?
-
5:2)
#pragma omp task default(none) firstprivate(containers, containersDown) depend(commute_if_supported: containersDown[0]) priority_if_supported((containers->getNbParticlesInGroup()/containers->getNumberOfLeavesInBlock())>size_t(p2pPrioCriteria*1.1)?5:
-
2)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
containers
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
5
,
"P2P"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
containers
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
5
,
"P2P"
));
const
MortonIndex
blockStartIdx
=
containers
->
getStartingIndex
();
const
MortonIndex
blockStartIdx
=
containers
->
getStartingIndex
();
...
@@ -709,7 +709,7 @@ protected:
...
@@ -709,7 +709,7 @@ protected:
unsigned
char
*
containersOtherDown
=
containersOther
->
getRawAttributesBuffer
();
unsigned
char
*
containersOtherDown
=
containersOther
->
getRawAttributesBuffer
();
const
std
::
vector
<
OutOfBlockInteraction
>*
outsideInteractions
=
&
(
*
currentInteractions
).
interactions
;
const
std
::
vector
<
OutOfBlockInteraction
>*
outsideInteractions
=
&
(
*
currentInteractions
).
interactions
;
#pragma omp task default(none) firstprivate(containers, containersDown, containersOther, containersOtherDown, outsideInteractions) depend(commute_if_supported: containersOtherDown[0], containersDown[0]) priority_if_supported((containers->getNbParticlesInGroup()/containers->getNumberOfLeavesInBlock())>size_t(p2pPrioCriteria*1.1)?
-
5:2)
#pragma omp task default(none) firstprivate(containers, containersDown, containersOther, containersOtherDown, outsideInteractions) depend(commute_if_supported: containersOtherDown[0], containersDown[0]) priority_if_supported((containers->getNbParticlesInGroup()/containers->getNumberOfLeavesInBlock())>size_t(p2pPrioCriteria*1.1)?5:
-
2)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
containersOther
->
getStartingIndex
())
<<
50
|
(
containers
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
6
,
"P2P ext"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
containersOther
->
getStartingIndex
())
<<
50
|
(
containers
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
6
,
"P2P ext"
));
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
...
@@ -759,7 +759,7 @@ protected:
...
@@ -759,7 +759,7 @@ protected:
ParticleGroupClass
*
containers
=
tree
->
getParticleGroup
(
idxGroup
);
ParticleGroupClass
*
containers
=
tree
->
getParticleGroup
(
idxGroup
);
unsigned
char
*
containersDown
=
containers
->
getRawAttributesBuffer
();
unsigned
char
*
containersDown
=
containers
->
getRawAttributesBuffer
();
#pragma omp task default(shared) firstprivate(leafCells, cellLocals, containers, containersDown) depend(commute_if_supported: containersDown[0]) depend(in: cellLocals[0]) priority_if_supported(1)
#pragma omp task default(shared) firstprivate(leafCells, cellLocals, containers, containersDown) depend(commute_if_supported: containersDown[0]) depend(in: cellLocals[0]) priority_if_supported(
-
1)
{
{
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
leafCells
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
7
,
"L2P"
));
FTIME_TASKS
(
FTaskTimer
::
ScopeEvent
taskTime
(
&
taskTimeRecorder
,
(
leafCells
->
getStartingIndex
()
<<
16
)
|
(
0
<<
8
)
|
7
,
"L2P"
));
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
KernelClass
*
const
kernel
=
kernels
[
omp_get_thread_num
()];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment