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
cd304bf7
Commit
cd304bf7
authored
9 years ago
by
Martin Khannouz
Committed by
Berenger Bramas
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix memory leak from the previous commit.
parent
a9511bb8
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/FGroupTaskStarpuImplicitAlgorithm.hpp
+15
-13
15 additions, 13 deletions
Src/GroupTree/Core/FGroupTaskStarpuImplicitAlgorithm.hpp
with
15 additions
and
13 deletions
Src/GroupTree/Core/FGroupTaskStarpuImplicitAlgorithm.hpp
+
15
−
13
View file @
cd304bf7
...
@@ -94,6 +94,7 @@ protected:
...
@@ -94,6 +94,7 @@ protected:
std
::
vector
<
std
::
vector
<
std
::
vector
<
BlockInteractions
<
CellContainerClass
>>>>
externalInteractionsAllLevel
;
std
::
vector
<
std
::
vector
<
std
::
vector
<
BlockInteractions
<
CellContainerClass
>>>>
externalInteractionsAllLevel
;
std
::
vector
<
std
::
vector
<
BlockInteractions
<
ParticleGroupClass
>>>
externalInteractionsLeafLevel
;
std
::
vector
<
std
::
vector
<
BlockInteractions
<
ParticleGroupClass
>>>
externalInteractionsLeafLevel
;
std
::
list
<
const
std
::
vector
<
OutOfBlockInteraction
>*>
externalInteractionsLeafLevelOpposite
;
OctreeClass
*
const
tree
;
//< The Tree
OctreeClass
*
const
tree
;
//< The Tree
KernelClass
*
const
originalCpuKernel
;
KernelClass
*
const
originalCpuKernel
;
...
@@ -349,9 +350,11 @@ public:
...
@@ -349,9 +350,11 @@ public:
starpu_arbiter_destroy
(
arbiterGlobal
);
starpu_arbiter_destroy
(
arbiterGlobal
);
#endif
#endif
for
(
auto
externalInteraction
:
externalInteractionsLeafLevelOpposite
)
delete
externalInteraction
;
starpu_mpi_shutdown
();
starpu_mpi_shutdown
();
starpu_shutdown
();
starpu_shutdown
();
//MPI_Finalize(); //TODO put it somewhere else, it's really dirty here.
}
}
void
rebuildInteractions
(){
void
rebuildInteractions
(){
...
@@ -1663,23 +1666,22 @@ protected:
...
@@ -1663,23 +1666,22 @@ protected:
#endif
#endif
#endif
#endif
0
);
0
);
std
::
vector
<
OutOfBlockInteraction
>
outsideInteractions
_2
=
externalInteractionsLeafLevel
[
idxGroup
][
idxInteraction
].
interactions
;
std
::
vector
<
OutOfBlockInteraction
>
*
outsideInteractions
Opposite
=
new
std
::
vector
<
OutOfBlockInteraction
>
(
externalInteractionsLeafLevel
[
idxGroup
][
idxInteraction
].
interactions
)
;
for
(
int
i
=
0
;
i
<
outsideInteractions
_2
.
size
();
++
i
)
for
(
int
i
=
0
;
i
<
outsideInteractions
Opposite
->
size
();
++
i
)
{
{
MortonIndex
tmp
=
outsideInteractions
_2
[
i
]
.
outIndex
;
MortonIndex
tmp
=
outsideInteractions
Opposite
->
at
(
i
)
.
outIndex
;
outsideInteractions
_2
[
i
]
.
outIndex
=
outsideInteractions
_2
[
i
]
.
insideIndex
;
outsideInteractions
Opposite
->
at
(
i
)
.
outIndex
=
outsideInteractions
Opposite
->
at
(
i
)
.
insideIndex
;
outsideInteractions
_2
[
i
]
.
insideIndex
=
tmp
;
outsideInteractions
Opposite
->
at
(
i
)
.
insideIndex
=
tmp
;
int
tmp2
=
outsideInteractions
_2
[
i
]
.
insideIdxInBlock
;
int
tmp2
=
outsideInteractions
Opposite
->
at
(
i
)
.
insideIdxInBlock
;
outsideInteractions
_2
[
i
]
.
insideIdxInBlock
=
outsideInteractions
_2
[
i
]
.
outsideIdxInBlock
;
outsideInteractions
Opposite
->
at
(
i
)
.
insideIdxInBlock
=
outsideInteractions
Opposite
->
at
(
i
)
.
outsideIdxInBlock
;
outsideInteractions
_2
[
i
]
.
outsideIdxInBlock
=
tmp2
;
outsideInteractions
Opposite
->
at
(
i
)
.
outsideIdxInBlock
=
tmp2
;
outsideInteractions
_2
[
i
]
.
relativeOutPosition
=
getOppositeInterIndex
(
outsideInteractions
_2
[
i
]
.
relativeOutPosition
);
outsideInteractions
Opposite
->
at
(
i
)
.
relativeOutPosition
=
getOppositeInterIndex
(
outsideInteractions
Opposite
->
at
(
i
)
.
relativeOutPosition
);
}
}
//TODO delete when done in the destructor
externalInteractionsLeafLevelOpposite
.
push_front
(
outsideInteractionsOpposite
);
std
::
vector
<
OutOfBlockInteraction
>*
c
=
new
std
::
vector
<
OutOfBlockInteraction
>
(
outsideInteractions_2
);
starpu_mpi_insert_task
(
MPI_COMM_WORLD
,
starpu_mpi_insert_task
(
MPI_COMM_WORLD
,
&
p2p_cl_inout_mpi
,
&
p2p_cl_inout_mpi
,
STARPU_VALUE
,
&
wrapperptr
,
sizeof
(
wrapperptr
),
STARPU_VALUE
,
&
wrapperptr
,
sizeof
(
wrapperptr
),
STARPU_VALUE
,
&
c
,
sizeof
(
c
),
STARPU_VALUE
,
&
outsideInteractionsOpposite
,
sizeof
(
outsideInteractionsOpposite
),
STARPU_VALUE
,
&
particleHandles
[
idxGroup
].
intervalSize
,
sizeof
(
int
),
STARPU_VALUE
,
&
particleHandles
[
idxGroup
].
intervalSize
,
sizeof
(
int
),
#ifdef SCALFMM_STARPU_USE_PRIO
#ifdef SCALFMM_STARPU_USE_PRIO
STARPU_PRIORITY
,
PrioClass
::
Controller
().
getInsertionPosP2PExtern
(),
STARPU_PRIORITY
,
PrioClass
::
Controller
().
getInsertionPosP2PExtern
(),
...
...
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