Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport TBB deprecation and related changes to 6-22 #7065

Merged
merged 20 commits into from
Jan 21, 2021
Merged

Backport TBB deprecation and related changes to 6-22 #7065

merged 20 commits into from
Jan 21, 2021

Conversation

xvallspl
Copy link
Contributor

As requested by CMS (@mrodozov)

xvallspl added 15 commits January 20, 2021 09:34
@xvallspl
replace TPoolManager by RTaskArenaWrapper
69a50ad 
Replace all uses of TPoolManager, based on the deprecated
tbb_task_scheduler_init and its implicit task_arena, by explicit
manipulation of our own central instance of task_arena, as
suggested by intel:
https://software.intel.com/sites/default/files/managed/b2/d2/TBBRevamp.pdf

Work out some gymnastics to keep tbb out of the headers,
encapsulating it within the new RTaskArenaWrapper class. Couldn't
find a solution for the forward-declaration tbb::task_arena, which
is an alias of a versioned namespace dependent class that we are
forced to forward declare instead (tbb::interface7::tbb_task_arena).
@xvallspl
initialize the task arena on instantiation
88a6de5
@xvallspl
make variables const
e5551e3
@xvallspl
provide access 2 the tbb::task arena instead of its wrapping unique_ptr
7072d53
@xvallspl
replace use of stat by ifstream only
eec42ec 
...when checking for bandwith control
@xvallspl
avoid race conditions when retrieving the global task arena
b9633e6
@xvallspl
add a test for the global task arena
a112977
@xvallspl
get the global task arena within a critical section
50e62dd
@xvallspl
move warning to task arena acquisiton
b456d7b
@xvallspl
expose ROOT::Internal::LogicalCPUBandwithControl
7a8b1c7
@xvallspl
improve comments and documentation
a4f51e6
@xvallspl
apply clang format
b0c0943
@xvallspl
make RtaskArenaWrapper constructor private
a30e9a5 
...and only allow RTaskarenaWrapper to be constructed from
GetGlobalTaskArena
@xvallspl
doublecheck documentation
f5d275a 
..for things that were true in TPoolManager but not anymore
@xvallspl
fix indentation
7917be8
@xvallspl xvallspl requested a review from Axel-Naumann January 20, 2021 09:41
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@mrodozov mrodozov mentioned this pull request Jan 20, 2021
Closed
@phsft-bot
Copy link
Collaborator

Build failed on ROOT-performance-centos8-multicore/default.
Running on null:/data/sftnight/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu16/nortcxxmod.
Running on sft-ubuntu-1604-1.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora30/cxx14.
Running on root-fedora30-2.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on mac1014/python3.
Running on macitois21.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

xvallspl added a commit to xvallspl/roottest that referenced this pull request Jan 20, 2021
@xvallspl
remove poolManager test
1bc7069 
Due to moving from TPoolManager to RTaskArena as an interface to
the TBB pool of threads.

See root-project/root#7065
@xvallspl xvallspl mentioned this pull request Jan 20, 2021
Merged
@xvallspl
remove TPoolManager from ROOT
3f472be
@xvallspl
fix missing include in TTreeCacheUnzip
c674f6e
@xvallspl
warn on tbb::global_control interferences
4b4880f 
    warn when the number of threads set by the user is limited at runtime
    by tbb::global_control.

    Fix for github issue root-project#6363: root-project#6363
@xvallspl
set TBB_PREVIEW_GLOBAL_CONTROL for older tbb versions
d3d3b3f
@xvallspl
remove dependency on tbb interfaces from RTaskArena
fa15e9d 
Introduce yet another layer of abstraction in ROpaqueTaskArena,
a class inheriting from tbb::task_arena that will allow us to keep
tbb hidden from ROOT interfaces while solving the issue of having to
forward-declare tbb::task_arena in an interface-dependent way
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-performance-centos8-multicore/default.
Running on null:/data/sftnight/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu16/nortcxxmod.
Running on sft-ubuntu-1604-2.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on mac11.0/cxx17.
Running on macphsft20.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on mac1014/python3.
Running on macitois21.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora30/cxx14.
Running on root-fedora30-2.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@xvallspl xvallspl self-assigned this Jan 20, 2021
@xvallspl xvallspl merged commit 98ff530 into root-project:v6-22-00-patches Jan 21, 2021
@xvallspl xvallspl mentioned this pull request Jan 21, 2021
Closed
xvallspl added a commit to root-project/roottest that referenced this pull request Jan 22, 2021
@xvallspl
remove poolManager test
5d1ac6b 
Due to moving from TPoolManager to RTaskArena as an interface to
the TBB pool of threads.

See root-project/root#7065
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oshadura oshadura oshadura approved these changes

@Axel-Naumann Axel-Naumann Awaiting requested review from Axel-Naumann

@dpiparo dpiparo Awaiting requested review from dpiparo dpiparo is a code owner

@pcanal pcanal Awaiting requested review from pcanal pcanal is a code owner

Assignees

@xvallspl xvallspl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@xvallspl @phsft-bot @oshadura