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
77d758c7
Commit
77d758c7
authored
Aug 31, 2017
by
COULAUD Olivier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add white space before s in timer, usefull to awk Src/Core/FFmmAlgorithm.hpp
parent
bad8dea4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
68 additions
and
68 deletions
+68
-68
Src/Core/FFmmAlgorithmOmp4.hpp
Src/Core/FFmmAlgorithmOmp4.hpp
+9
-9
Src/Core/FFmmAlgorithmPeriodic.hpp
Src/Core/FFmmAlgorithmPeriodic.hpp
+9
-9
Src/Core/FFmmAlgorithmSectionTask.hpp
Src/Core/FFmmAlgorithmSectionTask.hpp
+7
-7
Src/Core/FFmmAlgorithmTask.hpp
Src/Core/FFmmAlgorithmTask.hpp
+10
-10
Src/Core/FFmmAlgorithmThread.hpp
Src/Core/FFmmAlgorithmThread.hpp
+8
-8
Src/Core/FFmmAlgorithmThreadBalance.hpp
Src/Core/FFmmAlgorithmThreadBalance.hpp
+8
-8
Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
+1
-1
Src/Core/FFmmAlgorithmThreadTsm.hpp
Src/Core/FFmmAlgorithmThreadTsm.hpp
+8
-8
Src/Core/FFmmAlgorithmTsm.hpp
Src/Core/FFmmAlgorithmTsm.hpp
+8
-8
No files found.
Src/Core/FFmmAlgorithmOmp4.hpp
View file @
77d758c7
...
...
@@ -271,7 +271,7 @@ protected:
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/////////////////////////////////////////////////////////////////////////////
...
...
@@ -399,11 +399,11 @@ protected:
avoidGotoLeftIterator
.
moveUp
();
octreeIterator
=
avoidGotoLeftIterator
;
// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/////////////////////////////////////////////////////////////////////////////
...
...
@@ -490,10 +490,10 @@ protected:
avoidGotoLeftIterator
.
moveDown
();
octreeIterator
=
avoidGotoLeftIterator
;
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
...
...
@@ -618,10 +618,10 @@ protected:
avoidGotoLeftIterator
.
moveDown
();
octreeIterator
=
avoidGotoLeftIterator
;
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
...
...
@@ -1087,7 +1087,7 @@ protected:
}
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/** L2P */
...
...
@@ -1113,7 +1113,7 @@ protected:
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Merge Pass (L2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Merge Pass (L2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
};
...
...
Src/Core/FFmmAlgorithmPeriodic.hpp
View file @
77d758c7
...
...
@@ -245,7 +245,7 @@ protected:
FLOG
(
computationCounter
.
tac
());
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -296,13 +296,13 @@ protected:
FLOG
(
computationCounter
.
tac
());
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
"("
<<
(
idxLevel
+
offsetRealTree
)
<<
", "
<<
octreeIterator
.
getCurrentCell
()
->
getLevel
()
<<
") = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
"("
<<
(
idxLevel
+
offsetRealTree
)
<<
", "
<<
octreeIterator
.
getCurrentCell
()
->
getLevel
()
<<
") = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
avoidGotoLeftIterator
.
moveUp
();
octreeIterator
=
avoidGotoLeftIterator
;
// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -360,7 +360,7 @@ protected:
counter
);
FLOG
(
computationCounter
.
tac
());
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
"("
<<
fakeLevel
<<
", "
<<
octreeIterator
.
getCurrentCell
()
->
getLevel
()
<<
") = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
"("
<<
fakeLevel
<<
", "
<<
octreeIterator
.
getCurrentCell
()
->
getLevel
()
<<
") = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
avoidGotoLeftIterator
.
moveDown
();
octreeIterator
=
avoidGotoLeftIterator
;
...
...
@@ -368,7 +368,7 @@ protected:
kernels
->
finishedLevelM2L
(
fakeLevel
);
FLOG
(
computationCounter
.
tac
());
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -415,12 +415,12 @@ protected:
FLOG
(
computationCounter
.
tac
());
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
"("
<<
(
idxLevel
+
offsetRealTree
)
<<
", "
<<
octreeIterator
.
getCurrentCell
()
->
getLevel
()
<<
") = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
"("
<<
(
idxLevel
+
offsetRealTree
)
<<
", "
<<
octreeIterator
.
getCurrentCell
()
->
getLevel
()
<<
") = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
avoidGotoLeftIterator
.
moveDown
();
octreeIterator
=
avoidGotoLeftIterator
;
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
...
...
@@ -519,7 +519,7 @@ protected:
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation L2P : "
<<
computationCounterL2P
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation P2P : "
<<
computationCounterP2P
.
cumulated
()
<<
" s
\n
"
);
...
...
@@ -780,7 +780,7 @@ protected:
delete
[]
downerCells
;
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Periodic = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Periodic = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
...
...
Src/Core/FFmmAlgorithmSectionTask.hpp
View file @
77d758c7
...
...
@@ -177,7 +177,7 @@ protected:
#pragma omp taskwait
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/////////////////////////////////////////////////////////////////////////////
...
...
@@ -235,11 +235,11 @@ protected:
octreeIterator
=
avoidGotoLeftIterator
;
// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
#pragma omp taskwait
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/////////////////////////////////////////////////////////////////////////////
...
...
@@ -447,10 +447,10 @@ protected:
octreeIterator
=
avoidGotoLeftIterator
;
#pragma omp taskwait
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
...
...
@@ -507,7 +507,7 @@ protected:
FLOG
(
computationCounter
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation P2P : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -531,7 +531,7 @@ protected:
#pragma omp taskwait
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
};
...
...
Src/Core/FFmmAlgorithmTask.hpp
View file @
77d758c7
...
...
@@ -169,7 +169,7 @@ protected:
}
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/////////////////////////////////////////////////////////////////////////////
...
...
@@ -231,12 +231,12 @@ protected:
octreeIterator
=
avoidGotoLeftIterator
;
// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
#pragma omp taskwait
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
}
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/////////////////////////////////////////////////////////////////////////////
...
...
@@ -323,12 +323,12 @@ protected:
avoidGotoLeftIterator
.
moveDown
();
octreeIterator
=
avoidGotoLeftIterator
;
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
}
}
// end parallel region
//
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
void
transferPassWithFinalize
(){
...
...
@@ -405,11 +405,11 @@ protected:
}
}
#pragma omp taskwait
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
}
// end single region
}
// end // region
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
/////////////////////////////////////////////////////////////////////////////
...
...
@@ -468,12 +468,12 @@ protected:
octreeIterator
=
avoidGotoLeftIterator
;
#pragma omp taskwait
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
}
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
...
...
@@ -543,7 +543,7 @@ protected:
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation L2P + P2P : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
Src/Core/FFmmAlgorithmThread.hpp
View file @
77d758c7
...
...
@@ -217,7 +217,7 @@ protected:
}
FLOG
(
computationCounter
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
elapsed
()
<<
" s
\n
"
);
}
...
...
@@ -294,11 +294,11 @@ protected:
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -391,10 +391,10 @@ protected:
myThreadkernels
->
finishedLevelM2L
(
idxLevel
);
}
//Synchro end of parallel section
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -465,10 +465,10 @@ protected:
}
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -586,7 +586,7 @@ protected:
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation L2P + P2P : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation P2P : "
<<
computationCounterP2P
.
cumulated
()
<<
" s
\n
"
);
...
...
Src/Core/FFmmAlgorithmThreadBalance.hpp
View file @
77d758c7
...
...
@@ -484,7 +484,7 @@ protected:
}
FLOG
(
computationCounter
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
elapsed
()
<<
" s
\n
"
);
}
...
...
@@ -541,11 +541,11 @@ protected:
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -628,10 +628,10 @@ protected:
||
octreeIterator
.
getCurrentGlobalIndex
()
==
workloadM2L
[
idxLevel
][
omp_get_thread_num
()
+
1
].
iterator
.
getCurrentGlobalIndex
());
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -688,10 +688,10 @@ protected:
||
octreeIterator
.
getCurrentGlobalIndex
()
==
workloadL2L
[
idxLevel
][
omp_get_thread_num
()
+
1
].
iterator
.
getCurrentGlobalIndex
());
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -768,7 +768,7 @@ protected:
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation L2P + P2P : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation P2P : "
<<
computationCounterP2P
.
cumulated
()
<<
" s
\n
"
);
...
...
Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
View file @
77d758c7
...
...
@@ -2429,7 +2429,7 @@ protected:
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Periodic = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Periodic = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
}
...
...
Src/Core/FFmmAlgorithmThreadTsm.hpp
View file @
77d758c7
...
...
@@ -158,7 +158,7 @@ protected:
FLOG
(
computationCounter
.
tac
());
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
elapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
elapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
elapsed
()
<<
" s
\n
"
);
}
...
...
@@ -243,11 +243,11 @@ protected:
}
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
elapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
elapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -344,9 +344,9 @@ protected:
FLOG
(
computationCounter
.
tac
());
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -421,9 +421,9 @@ protected:
}
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
}
...
...
@@ -480,7 +480,7 @@ protected:
FLOG
(
computationCounter
.
tac
());
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation L2P + P2P : "
<<
computationCounter
.
elapsed
()
<<
" s
\n
"
);
}
...
...
Src/Core/FFmmAlgorithmTsm.hpp
View file @
77d758c7
...
...
@@ -113,7 +113,7 @@ protected:
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
elapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
elapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
totalComputation
<<
" s
\n
"
);
}
...
...
@@ -184,11 +184,11 @@ protected:
avoidGotoLeftIterator
.
moveUp
();
octreeIterator
=
avoidGotoLeftIterator
;
// equal octreeIterator.moveUp(); octreeIterator.gotoLeft();
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
elapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
elapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
totalComputation
<<
" s
\n
"
);
}
...
...
@@ -268,11 +268,11 @@ protected:
avoidGotoLeftIterator
.
moveDown
();
octreeIterator
=
avoidGotoLeftIterator
;
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
elapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
elapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
totalComputation
<<
" s
\n
"
);
}
...
...
@@ -334,11 +334,11 @@ protected:
avoidGotoLeftIterator
.
moveDown
();
octreeIterator
=
avoidGotoLeftIterator
;
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
>> Level "
<<
idxLevel
<<
" = "
<<
counterTimeLevel
.
tacAndElapsed
()
<<
"
s
\n
"
);
}
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
elapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
elapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
totalComputation
<<
" s
\n
"
);
}
...
...
@@ -383,7 +383,7 @@ protected:
}
while
(
octreeIterator
.
moveRight
());
FLOG
(
counterTime
.
tac
()
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
elapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
elapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation L2P + P2P : "
<<
totalComputation
<<
" s
\n
"
);
}
...
...
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