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
0fe42722
Commit
0fe42722
authored
1 year ago
by
Felix Weiglhofer
Browse files
Options
Downloads
Patches
Plain Diff
algo/compat: Rename ParalellSort to Sort.
parent
be440116
No related branches found
No related tags found
1 merge request
!1203
algo: Enable parallel sorting when libTBB is available.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
algo/base/compat/Algorithm.h
+1
-1
1 addition, 1 deletion
algo/base/compat/Algorithm.h
algo/unpack/Unpack.cxx
+14
-14
14 additions, 14 deletions
algo/unpack/Unpack.cxx
reco/tasks/CbmTaskUnpackXpu.cxx
+2
-2
2 additions, 2 deletions
reco/tasks/CbmTaskUnpackXpu.cxx
with
17 additions
and
17 deletions
algo/base/compat/Algorithm.h
+
1
−
1
View file @
0fe42722
...
@@ -40,7 +40,7 @@ namespace cbm::algo
...
@@ -40,7 +40,7 @@ namespace cbm::algo
}
// namespace detail
}
// namespace detail
template
<
typename
It
,
typename
Compare
>
template
<
typename
It
,
typename
Compare
>
void
Parallel
Sort
(
It
first
,
It
last
,
Compare
comp
)
void
Sort
(
It
first
,
It
last
,
Compare
comp
)
{
{
#ifdef WITH_EXECUTION
#ifdef WITH_EXECUTION
std
::
sort
(
detail
::
ExecPolicy
,
first
,
last
,
comp
);
std
::
sort
(
detail
::
ExecPolicy
,
first
,
last
,
comp
);
...
...
This diff is collapsed.
Click to expand it.
algo/unpack/Unpack.cxx
+
14
−
14
View file @
0fe42722
...
@@ -60,20 +60,20 @@ namespace cbm::algo
...
@@ -60,20 +60,20 @@ namespace cbm::algo
}
//# component
}
//# component
// --- Sorting of output digis. Is required by both digi trigger and event builder.
// --- Sorting of output digis. Is required by both digi trigger and event builder.
Parallel
Sort
(
digiTs
.
fData
.
fSts
.
fDigis
.
begin
(),
digiTs
.
fData
.
fSts
.
fDigis
.
end
(),
Sort
(
digiTs
.
fData
.
fSts
.
fDigis
.
begin
(),
digiTs
.
fData
.
fSts
.
fDigis
.
end
(),
[](
CbmStsDigi
digi1
,
CbmStsDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmStsDigi
digi1
,
CbmStsDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
Parallel
Sort
(
digiTs
.
fData
.
fMuch
.
fDigis
.
begin
(),
digiTs
.
fData
.
fMuch
.
fDigis
.
end
(),
Sort
(
digiTs
.
fData
.
fMuch
.
fDigis
.
begin
(),
digiTs
.
fData
.
fMuch
.
fDigis
.
end
(),
[](
CbmMuchDigi
digi1
,
CbmMuchDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmMuchDigi
digi1
,
CbmMuchDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
Parallel
Sort
(
digiTs
.
fData
.
fTof
.
fDigis
.
begin
(),
digiTs
.
fData
.
fTof
.
fDigis
.
end
(),
Sort
(
digiTs
.
fData
.
fTof
.
fDigis
.
begin
(),
digiTs
.
fData
.
fTof
.
fDigis
.
end
(),
[](
CbmTofDigi
digi1
,
CbmTofDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmTofDigi
digi1
,
CbmTofDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
Parallel
Sort
(
digiTs
.
fData
.
fT0
.
fDigis
.
begin
(),
digiTs
.
fData
.
fT0
.
fDigis
.
end
(),
Sort
(
digiTs
.
fData
.
fT0
.
fDigis
.
begin
(),
digiTs
.
fData
.
fT0
.
fDigis
.
end
(),
[](
CbmTofDigi
digi1
,
CbmTofDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmTofDigi
digi1
,
CbmTofDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
Parallel
Sort
(
digiTs
.
fData
.
fTrd
.
fDigis
.
begin
(),
digiTs
.
fData
.
fTrd
.
fDigis
.
end
(),
Sort
(
digiTs
.
fData
.
fTrd
.
fDigis
.
begin
(),
digiTs
.
fData
.
fTrd
.
fDigis
.
end
(),
[](
CbmTrdDigi
digi1
,
CbmTrdDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmTrdDigi
digi1
,
CbmTrdDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
Parallel
Sort
(
digiTs
.
fData
.
fTrd2d
.
fDigis
.
begin
(),
digiTs
.
fData
.
fTrd2d
.
fDigis
.
end
(),
Sort
(
digiTs
.
fData
.
fTrd2d
.
fDigis
.
begin
(),
digiTs
.
fData
.
fTrd2d
.
fDigis
.
end
(),
[](
CbmTrdDigi
digi1
,
CbmTrdDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmTrdDigi
digi1
,
CbmTrdDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
Parallel
Sort
(
digiTs
.
fData
.
fRich
.
fDigis
.
begin
(),
digiTs
.
fData
.
fRich
.
fDigis
.
end
(),
Sort
(
digiTs
.
fData
.
fRich
.
fDigis
.
begin
(),
digiTs
.
fData
.
fRich
.
fDigis
.
end
(),
[](
CbmRichDigi
digi1
,
CbmRichDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmRichDigi
digi1
,
CbmRichDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
return
result
;
return
result
;
}
}
...
...
This diff is collapsed.
Click to expand it.
reco/tasks/CbmTaskUnpackXpu.cxx
+
2
−
2
View file @
0fe42722
...
@@ -69,8 +69,8 @@ void CbmTaskUnpackXpu::Exec(Option_t*)
...
@@ -69,8 +69,8 @@ void CbmTaskUnpackXpu::Exec(Option_t*)
resultSts
.
first
.
end
());
resultSts
.
first
.
end
());
// --- Sorting of output digis. Is required by both digi trigger and event builder.
// --- Sorting of output digis. Is required by both digi trigger and event builder.
cbm
::
algo
::
Parallel
Sort
(
fTimeslice
->
fData
.
fSts
.
fDigis
.
begin
(),
fTimeslice
->
fData
.
fSts
.
fDigis
.
end
(),
cbm
::
algo
::
Sort
(
fTimeslice
->
fData
.
fSts
.
fDigis
.
begin
(),
fTimeslice
->
fData
.
fSts
.
fDigis
.
end
(),
[](
CbmStsDigi
digi1
,
CbmStsDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
[](
CbmStsDigi
digi1
,
CbmStsDigi
digi2
)
{
return
digi1
.
GetTime
()
<
digi2
.
GetTime
();
});
// --- Timeslice log
// --- Timeslice log
...
...
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