Skip to content

Conversation

@hahnjo
Copy link
Member

@hahnjo hahnjo commented May 26, 2021

Versions newer than 2021 don't have the header tbb/tbb_config.h,
see cms-sw/cmsdist#6936

@hahnjo hahnjo requested a review from oshadura as a code owner May 26, 2021 07:26
@hahnjo hahnjo self-assigned this May 26, 2021
@phsft-bot
Copy link

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

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

Failing tests:

@mrodozov
Copy link

mrodozov commented May 26, 2021

now with that config it tries to compile two files from the prev commit which are including tbb/tbb_config.h
-> fails with file not found:

-c /build/mrodozov/root/build_root_master/BUILD/slc7_amd64_gcc900/lcg/root/6.25.0\
1/root-6.25.01/core/imt/src/TThreadExecutor.cxx                                                                                                                                    
/build/mrodozov/root/build_root_master/BUILD/slc7_amd64_gcc900/lcg/root/6.25.01/root-6.25.01/core/imt/src/TThreadExecutor.cxx:3:10: fatal error: tbb/tbb_config.h: No such file or\
 directory                                                                                                                                                                         
    3 | #include "tbb/tbb_config.h"  

maybe wrap them in a macro version check or something (not sure if TBB defines version through macroses)

@hahnjo
Copy link
Member Author

hahnjo commented May 27, 2021

now with that config it tries to compile two files from the prev commit which are including tbb/tbb_config.h

That is what happens if I only test CMake configuration, but not the build itself. I'm working on a proper fix, hopefully I can find a header that can be included in all versions of TBB (otherwise we have a chicken-and-egg problem which header to include for finding out the version...)

Versions newer than 2021 don't have the header tbb/tbb_config.h,
see cms-sw/cmsdist#6936
@hahnjo hahnjo requested a review from eguiraud as a code owner May 27, 2021 07:31
@phsft-bot
Copy link

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

@hahnjo hahnjo changed the title Tweak CMake check for oneTBB Fix CMake configuration and build with oneTBB May 27, 2021
@hahnjo
Copy link
Member Author

hahnjo commented May 27, 2021

We don't need the include of tbb_config.h at all, the other headers will pull the configuration in as needed and from where it is available

@phsft-bot
Copy link

Build failed on ROOT-fedora32/noimt.
Running on root-fedora32-1.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Warnings:

  • [2021-05-27T07:49:34.319Z] math/unuran/unuran-1.8.0-root/src/methods/mvtdr_init.ch:886:17: warning: argument 1 value ‘18446744073709551608’ exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=]

Failing tests:

Copy link
Collaborator

@oshadura oshadura left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! @mrodozov can you please confirm it fixes reported issue?

@mrodozov
Copy link

it does just built it

@oshadura
Copy link
Collaborator

@hahnjo thanks a lot for fix! (and thanks to @mrodozov for reporting and testing!)

@oshadura oshadura merged commit f30096e into root-project:master May 27, 2021
@hahnjo hahnjo deleted the fix-cmake-tbb branch May 27, 2021 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants