Skip to content

Commit 4469f04

Browse files
authored
Merge pull request #7605 from stuartarchibald/fix/7600
Fix TBB 2021 DSO names on OSX/Win and make TBB reporting consistent
2 parents 1dc149d + efb81c9 commit 4469f04

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

‎numba/misc/numba_sysinfo.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,13 @@ def parse_error(e, backend):
421421
return "Unknown import problem."
422422

423423
try:
424+
# check import is ok, this means the DSO linkage is working
424425
from numba.np.ufunc import tbbpool # NOQA
426+
# check that the version is compatible, this is a check performed at
427+
# runtime (well, compile time), it will also ImportError if there's
428+
# a problem.
429+
from numba.np.ufunc.parallel import _check_tbb_version_compatible
430+
_check_tbb_version_compatible()
425431
sys_info[_tbb_thread] = True
426432
except ImportError as e:
427433
# might be a missing symbol due to e.g. tbb libraries missing

‎numba/np/ufunc/parallel.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,9 @@ def _check_tbb_version_compatible():
344344
try:
345345
# first check that the TBB version is new enough
346346
if _IS_WINDOWS:
347-
libtbb_name = 'tbb'
347+
libtbb_name = 'tbb12.dll'
348348
elif _IS_OSX:
349-
libtbb_name = 'libtbb.dylib'
349+
libtbb_name = 'libtbb.12.dylib'
350350
elif _IS_LINUX:
351351
libtbb_name = 'libtbb.so.12'
352352
else:

0 commit comments

Comments
 (0)