Skip to content

Commit ef555a6

Browse files
Pin TBB support with respect to incompatible 2021.6 API.
As title. Numba is not yet compatible with TBB 2021.6 API, but the ABI seems ok.
1 parent b1be2f1 commit ef555a6

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

‎buildscripts/condarecipe.local/meta.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ requirements:
3838
- llvmlite >=0.39.0dev0,<0.39
3939
# TBB devel version is to match TBB libs.
4040
# 2020.3 is the last version with the "old" ABI
41+
# NOTE: 2021.1..2021.5 are API compatible for Numba's purposes.
4142
# NOTE: ppc64le exclusion is temporary until packages are more generally
4243
# available.
43-
- tbb-devel >=2021 # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)]
44+
- tbb-devel >=2021,<2021.6 # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)]
4445
run:
4546
- python >=3.7
4647
- numpy >=1.18

‎docs/source/user/installing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ vary with target operating system and hardware. The following lists them all
213213
* ``llvm-openmp`` (OSX) - provides headers for compiling OpenMP support into
214214
Numba's threading backend
215215
* ``tbb-devel`` - provides TBB headers/libraries for compiling TBB support
216-
into Numba's threading backend (version >= 2021 required).
216+
into Numba's threading backend (2021 <= version < 2021.6 required).
217217
* ``importlib_metadata`` (for Python versions < 3.9)
218218

219219
* Optional runtime are:

‎numba/np/ufunc/tbbpool.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Implement parallel vectorize workqueue on top of Intel TBB.
2727
* from here:
2828
* https://github.com/intel/tbb/blob/2019_U5/include/tbb/tbb_stddef.h#L29
2929
*/
30-
#if TBB_INTERFACE_VERSION < 12010
31-
#error "TBB version is too old, 2021 update 1, i.e. TBB_INTERFACE_VERSION >= 12010 required"
30+
#if (TBB_INTERFACE_VERSION >= 12060) || (TBB_INTERFACE_VERSION < 12010)
31+
#error "TBB version is incompatible, 2021.1 through to 2021.5 required, i.e. 12010 <= TBB_INTERFACE_VERSION < 12060"
3232
#endif
3333

3434
#define _DEBUG 0

0 commit comments

Comments
 (0)