Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Computing
cbmroot
Commits
a3be2cc6
Commit
a3be2cc6
authored
2 years ago
by
Jan de Cuveland
Committed by
Administrator
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add simple OpenMP multithreading to CbmTaskUnpack
parent
cc5b4cad
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!828
Add multithreading to CbmTaskUnpack and fix compiler errors on several systems
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
reco/tasks/CMakeLists.txt
+1
-0
1 addition, 0 deletions
reco/tasks/CMakeLists.txt
reco/tasks/CbmTaskUnpack.cxx
+15
-17
15 additions, 17 deletions
reco/tasks/CbmTaskUnpack.cxx
with
16 additions
and
17 deletions
reco/tasks/CMakeLists.txt
+
1
−
0
View file @
a3be2cc6
...
...
@@ -69,6 +69,7 @@ CbmBase
CbmData
Algo
external::yaml-cpp
OpenMP::OpenMP_CXX
)
# ---------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
reco/tasks/CbmTaskUnpack.cxx
+
15
−
17
View file @
a3be2cc6
...
...
@@ -22,6 +22,7 @@
#include
<algorithm>
#include
<cassert>
#include
<cstdint>
#include
<execution>
#include
<iomanip>
#include
<iostream>
#include
<memory>
...
...
@@ -63,20 +64,15 @@ void CbmTaskUnpack::Exec(Option_t*)
// --- Timer and counters
TStopwatch
timer
;
TStopwatch
compTimer
;
timer
.
Start
();
size_t
numMs
=
0
;
size_t
numBytes
=
0
;
size_t
numDigis
=
0
;
// --- Timeslice properties
const
uint64_t
tsIndex
=
timeslice
->
index
();
const
uint64_t
tsTime
=
timeslice
->
start_time
();
const
uint64_t
numComp
=
timeslice
->
num_components
();
uint64_t
numCompUsed
=
0
;
size_t
numMs
=
0
;
size_t
numBytes
=
0
;
size_t
numDigis
=
0
;
uint64_t
numCompUsed
=
0
;
// --- Component loop
for
(
uint64_t
comp
=
0
;
comp
<
numComp
;
comp
++
)
{
#pragma omp parallel for schedule(dynamic) default(none) shared(timeslice) reduction(+: numMs, numBytes, numDigis, numCompUsed)
for
(
uint64_t
comp
=
0
;
comp
<
timeslice
->
num_components
();
comp
++
)
{
auto
systemId
=
static_cast
<
fles
::
SubsystemIdentifier
>
(
timeslice
->
descriptor
(
comp
,
0
).
sys_id
);
if
(
systemId
==
fles
::
SubsystemIdentifier
::
STS
)
{
...
...
@@ -93,6 +89,7 @@ void CbmTaskUnpack::Exec(Option_t*)
// --- Component log
size_t
numBytesInComp
=
0
;
size_t
numDigisInComp
=
0
;
TStopwatch
compTimer
;
compTimer
.
Start
();
// --- Microslice loop
...
...
@@ -101,15 +98,16 @@ void CbmTaskUnpack::Exec(Option_t*)
const
auto
msDescriptor
=
timeslice
->
descriptor
(
comp
,
mslice
);
const
auto
msContent
=
timeslice
->
content
(
comp
,
mslice
);
numBytesInComp
+=
msDescriptor
.
size
;
auto
result
=
(
algoIt
->
second
)(
msContent
,
msDescriptor
,
t
sT
ime
);
auto
result
=
(
algoIt
->
second
)(
msContent
,
msDescriptor
,
t
imeslice
->
start_t
ime
()
);
LOG
(
debug1
)
<<
GetName
()
<<
": Component "
<<
comp
<<
", microslice "
<<
mslice
<<
", digis "
<<
result
.
first
.
size
()
<<
", errors "
<<
result
.
second
.
fNumNonHitOrTsbMessage
<<
" | "
<<
result
.
second
.
fNumErrElinkOutOfRange
<<
" | "
<<
result
.
second
.
fNumErrInvalidFirstMessage
<<
" | "
<<
result
.
second
.
fNumErrInvalidMsSize
<<
" | "
<<
result
.
second
.
fNumErrTimestampOverflow
<<
" | "
;
const
auto
it
=
fTimeslice
->
fData
.
fSts
.
fDigis
.
end
();
fTimeslice
->
fData
.
fSts
.
fDigis
.
insert
(
it
,
result
.
first
.
begin
(),
result
.
first
.
end
());
numDigisInComp
+=
result
.
first
.
size
();
#pragma omp critical(insert_sts_digis)
fTimeslice
->
fData
.
fSts
.
fDigis
.
insert
(
fTimeslice
->
fData
.
fSts
.
fDigis
.
end
(),
result
.
first
.
begin
(),
result
.
first
.
end
());
}
//# microslice
compTimer
.
Stop
();
...
...
@@ -126,7 +124,7 @@ void CbmTaskUnpack::Exec(Option_t*)
}
//# component
// --- Sorting of output digis. Is required by both digi trigger and event builder.
std
::
sort
(
fTimeslice
->
fData
.
fSts
.
fDigis
.
begin
(),
fTimeslice
->
fData
.
fSts
.
fDigis
.
end
(),
std
::
sort
(
std
::
execution
::
par_unseq
,
fTimeslice
->
fData
.
fSts
.
fDigis
.
begin
(),
fTimeslice
->
fData
.
fSts
.
fDigis
.
end
(),
[](
CbmStsDigi
digi1
,
CbmStsDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
...
...
@@ -135,8 +133,8 @@ void CbmTaskUnpack::Exec(Option_t*)
stringstream
logOut
;
logOut
<<
setw
(
15
)
<<
left
<<
GetName
()
<<
" ["
;
logOut
<<
fixed
<<
setw
(
8
)
<<
setprecision
(
1
)
<<
right
<<
timer
.
RealTime
()
*
1000.
<<
" ms] "
;
logOut
<<
"TS "
<<
fNumTs
<<
" (index "
<<
t
sI
ndex
<<
")"
;
logOut
<<
", components "
<<
numCompUsed
<<
" / "
<<
num
C
omp
<<
", microslices "
<<
numMs
;
logOut
<<
"TS "
<<
fNumTs
<<
" (index "
<<
t
imeslice
->
i
ndex
()
<<
")"
;
logOut
<<
", components "
<<
numCompUsed
<<
" / "
<<
timeslice
->
num
_c
omp
onents
()
<<
", microslices "
<<
numMs
;
logOut
<<
", input rate "
<<
double
(
numBytes
)
/
timer
.
RealTime
()
/
1.e6
<<
" MB/s"
;
logOut
<<
", digis "
<<
numDigis
;
LOG
(
info
)
<<
logOut
.
str
();
...
...
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