Skip to content

Fix TBB 2021 DSO names on OSX/Win and make TBB reporting consistent - #7605

Merged
sklam merged 1 commit into
numba:masterfrom
stuartarchibald:fix/7600
Dec 7, 2021
Merged

sklam merged 1 commit into
numba:masterfrom
stuartarchibald:fix/7600

Conversation

@stuartarchibald

Copy link
Copy Markdown
Contributor

As title.

Fixes #7600

# first check that the TBB version is new enough
if _IS_WINDOWS:
libtbb_name = 'tbb'
libtbb_name = 'tbb12.dll'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What happens if there is an older TBB version? Was there a previous version of TBB where the library was named tbb.dll that would be missed now?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

... or was this just always wrong?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

TBB changed ABI for the 2021 series. Numba updated to requiring this version as a minimum in 0.54. in associated PR #6854. I guess the windows and osx library name changes were missed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Am trying to enforce some consistency in #7606, whereby the CI system checks that if a threading layer is requested that it can actually be loaded.

libtbb_name = 'tbb12.dll'
elif _IS_OSX:
libtbb_name = 'libtbb.dylib'
libtbb_name = 'libtbb.12.dylib'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

confirmed this on OSX

@sklam sklam left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@stuartarchibald stuartarchibald added 5 - Ready to merge Review and testing done, is ready to merge and removed 3 - Ready for Review labels Dec 6, 2021
@stuartarchibald

Copy link
Copy Markdown
Contributor Author

Thanks for the review @sklam.

@sklam
sklam merged commit 4469f04 into numba:master Dec 7, 2021
stuartarchibald added a commit to stuartarchibald/numba that referenced this pull request Dec 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

5 - Ready to merge Review and testing done, is ready to merge Effort - short Short size effort needed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TBB backend not working on Win due to wrong dll name

3 participants