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.

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

Update TBB to use >= 2021.6 by default. #8856

Merged
merged 4 commits into from
Mar 29, 2023

Conversation

stuartarchibald
Copy link
Contributor

@stuartarchibald stuartarchibald commented Mar 29, 2023

Updates buildscripts, source and docs in relation to TBB 2021.6.

  • Windows 32 bit doesn't have the parallel target enabled
    so doesn't need TBB.
  • ppc64le and linux-aarch64 have suitable packages available but
    these haven't been tested so exclude them for now.
  • Updates the TBB version checking code for 2021.6 as minimum.

This is a continuation of PR #8727 which in itself is a continuation of #7608.

Closes #8487

kozlov-alexey and others added 4 commits March 29, 2023 11:20
Resolved conflicts in:
	numba/np/ufunc/tbbpool.cpp
Fixed conflicts in:
	numba/np/ufunc/tbbpool.cpp
Updates buildscripts, source and docs in relation to TBB 2021.6.

* Windows 32 bit doesn't have the parallel target enabled
  so doesn't need TBB.
* ppc64le and linux-aarch64 have suitable packages available but
  these haven't been tested so exclude them for now.
* Updates the TBB version checking code for 2021.6 as minimum.
@stuartarchibald stuartarchibald added this to the Numba 0.57 RC milestone Mar 29, 2023
@stuartarchibald stuartarchibald marked this pull request as ready for review March 29, 2023 11:25
@sklam
Copy link
Member

sklam commented Mar 29, 2023

BFID numba_smoketest_cpu_yaml_172

@sklam sklam self-assigned this Mar 29, 2023
@sklam sklam added the Pending BuildFarm For PRs that have been reviewed but pending a push through our buildfarm label Mar 29, 2023
#error "TBB version is incompatible, 2021.1 through to 2021.5 required, i.e. 12010 <= TBB_INTERFACE_VERSION < 12060"
/* TBB 2021.6 is the minimum version */
#if (TBB_INTERFACE_VERSION < 12060)
#error "TBB version is incompatible, 2021.6 or greater required, i.e. TBB_INTERFACE_VERSION >= 12060"
Copy link
Member

Choose a reason for hiding this comment

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

manually confirmed that this check works as expected.

@sklam sklam added 4 - Waiting on CI Review etc done, waiting for CI to finish and removed 3 - Ready for Review labels Mar 29, 2023
@sklam sklam added BuildFarm Passed For PRs that have been through the buildfarm and passed and removed Pending BuildFarm For PRs that have been reviewed but pending a push through our buildfarm 4 - Waiting on CI Review etc done, waiting for CI to finish labels Mar 29, 2023
@sklam sklam added the 5 - Ready to merge Review and testing done, is ready to merge label Mar 29, 2023
@sklam sklam merged commit 9a63768 into numba:main Mar 29, 2023
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 BuildFarm Passed For PRs that have been through the buildfarm and passed Effort - medium Medium size effort needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Not compatible with onetbb-2021.6.0
3 participants