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
Admin message
GitLab upgrade completed. Current version is 17.11.4.
Show more breadcrumbs
solverstack
ScalFMM
Commits
fd00910b
Commit
fd00910b
authored
9 years ago
by
BRAMAS Berenger
Browse files
Options
Downloads
Patches
Plain Diff
ensure to print out the number of threads only for openmp block
parent
cbc78d82
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
Tests/noDist/testBlockedUniformCompare.cpp
+4
-3
4 additions, 3 deletions
Tests/noDist/testBlockedUniformCompare.cpp
with
4 additions
and
3 deletions
Tests/noDist/testBlockedUniformCompare.cpp
+
4
−
3
View file @
fd00910b
...
...
@@ -574,9 +574,6 @@ struct RunContainer{
typedef
FUnifCellPODLocal
<
FReal
,
ORDER
>
GroupCellDownClass
;
typedef
FUnifCellPOD
<
FReal
,
ORDER
>
GroupCellClass
;
if
(
threadsList
.
getSize
())
omp_set_num_threads
(
int
(
threadsList
[
0
]));
std
::
cout
<<
"
\n
>> Using "
<<
omp_get_max_threads
()
<<
" omp threads.
\n
"
<<
std
::
endl
;
typedef
FP2PGroupParticleContainer
<
FReal
>
GroupContainerClass
;
typedef
FGroupTree
<
FReal
,
GroupCellClass
,
GroupCellSymbClass
,
GroupCellUpClass
,
GroupCellDownClass
,
GroupContainerClass
,
1
,
4
,
FReal
>
GroupOctreeClass
;
#ifdef SCALFMM_USE_STARPU
...
...
@@ -585,6 +582,8 @@ struct RunContainer{
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
std
::
cout
<<
"Using FGroupTaskStarPUAlgorithm"
<<
std
::
endl
;
#elif defined(SCALFMM_USE_OMP4)
if
(
threadsList
.
getSize
())
omp_set_num_threads
(
int
(
threadsList
[
0
]));
std
::
cout
<<
"
\n
>> Using "
<<
omp_get_max_threads
()
<<
" omp threads.
\n
"
<<
std
::
endl
;
typedef
FUnifKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
// Set the number of threads
omp_set_num_threads
(
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
NbThreads
.
options
,
omp_get_max_threads
()));
...
...
@@ -592,6 +591,8 @@ struct RunContainer{
GroupCellSymbClass
,
GroupCellUpClass
,
GroupCellDownClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
std
::
cout
<<
"Using FGroupTaskDepAlgorithm"
<<
std
::
endl
;
#else
if
(
threadsList
.
getSize
())
omp_set_num_threads
(
int
(
threadsList
[
0
]));
std
::
cout
<<
"
\n
>> Using "
<<
omp_get_max_threads
()
<<
" omp threads.
\n
"
<<
std
::
endl
;
typedef
FUnifKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
//typedef FGroupSeqAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass > GroupAlgorithm;
typedef
FGroupTaskAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
...
...
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