Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
solverstack
ScalFMM
Commits
84728b54
Commit
84728b54
authored
Aug 16, 2015
by
BRAMAS Berenger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update compare uniform to include omp4 fine granularity
parent
cb1e1b57
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
2 deletions
+20
-2
Tests/noDist/testBlockedUniformCompare.cpp
Tests/noDist/testBlockedUniformCompare.cpp
+20
-2
No files found.
Tests/noDist/testBlockedUniformCompare.cpp
View file @
84728b54
...
...
@@ -32,6 +32,7 @@
#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
#ifdef SCALFMM_USE_OMP4
#include "../../Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp"
#include "Core/FFmmAlgorithmOmp4.hpp"
#endif
#ifdef SCALFMM_USE_STARPU
#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
...
...
@@ -65,7 +66,9 @@ const FParameterNames LocalOrder { {"-order"}, "Order of the kernel"};
const
FParameterNames
LocalOptionOmpTask
{
{
"-omp-task"
},
"To use FFmmAlgorithmTask"
};
const
FParameterNames
LocalOptionOmpSection
{
{
"-omp-section"
},
"To use FFmmAlgorithmSectionTask"
};
const
FParameterNames
LocalOptionOmpBalance
{
{
"-omp-balance"
},
"To use FFmmAlgorithmThreadBalance"
};
#ifdef SCALFMM_USE_OMP4
const
FParameterNames
LocalOptionOmp4
{
{
"-omp-taskdep"
},
"To use FFmmAlgorithmOmp4"
};
#endif
const
FParameterNames
LocalOptionClassic
{
{
"-omp"
,
"omp-classic"
},
"In order to use classic parallelism"
};
const
FParameterNames
LocalOptionBlocSize
{
{
"-bs"
},
"The size of the block of the blocked tree"
};
const
FParameterNames
LocalOptionNoValidate
{
{
"-no-validation"
},
"To avoid comparing with direct computation"
};
...
...
@@ -484,6 +487,17 @@ struct RunContainer{
time
.
tac
();
std
::
cout
<<
"Done "
<<
"(@Algorithm = "
<<
time
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
}
#ifdef SCALFMM_USE_OMP4
else
if
(
FParameters
::
existParameter
(
argc
,
argv
,
LocalOptionOmp4
.
options
)){
typedef
FFmmAlgorithmOmp4
<
OctreeClass
,
CellClass
,
ContainerClass
,
KernelClass
,
LeafClass
>
FmmClass
;
std
::
cout
<<
"Using FFmmAlgorithmOmp4 "
<<
std
::
endl
;
FmmClass
algorithm
(
&
tree
,
&
kernels
);
time
.
tic
();
algorithm
.
execute
();
time
.
tac
();
std
::
cout
<<
"Done "
<<
"(@Algorithm = "
<<
time
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
}
#endif
else
{
typedef
FFmmAlgorithmThread
<
OctreeClass
,
CellClass
,
ContainerClass
,
KernelClass
,
LeafClass
>
FmmClass
;
std
::
cout
<<
"Using FFmmAlgorithmThread "
<<
std
::
endl
;
...
...
@@ -684,7 +698,11 @@ int main(int argc, char* argv[]){
FParameterDefinitions
::
NbThreads
,
LocalOptionBlocSize
,
LocalOptionNoValidate
,
LocalOptionClassic
,
LocalOptionOmpTask
,
LocalOptionOmpSection
,
LocalOptionOmpBalance
,
LocalOrder
);
LocalOrder
#ifdef SCALFMM_USE_OMP4
,
LocalOptionOmp4
#endif
);
const
int
order
=
FParameters
::
getValue
(
argc
,
argv
,
LocalOrder
.
options
,
5
);
FRunIf
::
Run
<
int
,
3
,
8
,
1
,
RunContainer
>
(
order
,
argc
,
argv
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment