-
Notifications
You must be signed in to change notification settings - Fork 102
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.
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
Replace tbb with std containers #723
Replace tbb with std containers #723
Conversation
@MarkusFrankATcernch - CMS XML description would need quite a bit of work to make it modular. |
That means also dropping the TBB requirements for these source files, right? |
Please, do :-) |
Hmm...
|
This failing test is strange. It is entirely unrelated to tbb. |
@MarkusFrankATcernch - sorry I missed the meeting where I was planning to bring this up for discussion. Would it be possible to integrate this asap? Thanks! |
@ianna For the time being your are the only customer of this feature. I do not see any point of not merging. |
no, I have not. I'm not sure I can test this change since I'm using scram and pkgtools to build it... |
You just need diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index 6a4f9b73..a3ded85e 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -15,7 +15,7 @@ dd4hep_print("|++> Will be Building DDCore")
file(GLOB DDCore_SOURCES src/*.cpp src/segmentations/*.cpp src/XML/*.cpp)
-if(NOT DD4HEP_USE_TBB OR ${CMAKE_CXX_STANDARD} LESS 17)
+if(${CMAKE_CXX_STANDARD} LESS 17)
list(APPEND EXCLUDE_HEADER include/DD4hep/SpecParRegistry.h)
list(APPEND EXCLUDE_HEADER include/DD4hep/Filter.h)
list(FILTER DDCore_SOURCES EXCLUDE REGEX Filter\.cpp|SpecParRegistry\.cpp ) And set DD4HEP_USE_TBB=OFF in the CMS build config |
@andresailer - thanks! I'll update the PR. |
remove a flag see AIDASoft/DD4hep#723
BEGINRELEASENOTES
SpecParRegistry: remove need for TBB
Reverse the plan to process XML files in parallel
ENDRELEASENOTES