use openmp threading instead of tbb

Author: ndgrigorian

.github/workflows/build-with-standard-clang.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Install mkl_umath dependencies
         run: |
           pip install meson-python ninja cython mkl-service
-          pip install mkl-devel tbb-devel
+          pip install mkl-devel
           pip install ${{ matrix.numpy_version }}
 
       - name: Build mkl_umath

.github/workflows/build_pip.yaml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Install Compiler and MKL
         run: |
-          conda install mkl-devel tbb-devel dpcpp_linux-64
+          conda install mkl-devel dpcpp_linux-64
           python -c "import sys; print(sys.executable)"
           which python
 

conda-recipe-cf/meta.yaml

@@ -29,7 +29,6 @@ requirements:
       - python-gil     # [py>=314]
       - python-build
       - mkl-devel
-      - tbb-devel
       - numpy
       - wheel  >=0.41.3
       - pip

conda-recipe/meta.yaml

@@ -29,7 +29,6 @@ requirements:
       - python-gil     # [py>=314]
       - python-build
       - mkl-devel
-      - tbb-devel
       - numpy-base
       - wheel  >=0.41.3
       - pip

meson.build

@@ -73,18 +73,18 @@ else
 endif
 
 # dependencies
-tbb_dep = dependency('tbb', required: true)
+omp_dep = dependency('openmp', required: true)
 
 # manually waterfall the meson deps: pkg-config to cmake to find_library
-mkl_dep = dependency('mkl-dynamic-lp64-tbb', required: false)
+mkl_dep = dependency('mkl-dynamic-lp64-iomp', required: false)
 
 if not mkl_dep.found()
     mkl_dep = dependency('MKL', method: 'cmake',
         modules: ['MKL::MKL'],
         cmake_args: [
             '-DMKL_ARCH=intel64',
             '-DMKL_LINK=dynamic',
-            '-DMKL_THREADING=tbb_thread',
+            '-DMKL_THREADING=intel_thread',
             '-DMKL_INTERFACE=lp64'
         ],
         required: false
@@ -97,8 +97,8 @@ if not mkl_dep.found()
     # see: https://github.com/mesonbuild/meson/issues/14163
     mkl_core = cc.find_library('mkl_core', required: true, static: false)
     mkl_intel_lp64 = cc.find_library('mkl_intel_lp64', required: true, static: false)
-    mkl_tbb_thread = cc.find_library('mkl_tbb_thread', required: true, static: false)
-    mkl_dep = declare_dependency(dependencies: [mkl_core, mkl_intel_lp64, mkl_tbb_thread])
+    mkl_intel_thread = cc.find_library('mkl_intel_thread', required: true, static: false)
+    mkl_dep = declare_dependency(dependencies: [mkl_core, mkl_intel_lp64, mkl_intel_thread])
 endif
 
 # generate loops, similar to numpy
@@ -131,7 +131,7 @@ mkl_umath_loops = shared_library(
     'mkl_umath_loops',
     sources: [gen_loops_c, gen_loops_h],
     include_directories: inc_np,
-    dependencies: [mkl_dep, tbb_dep, py_dep],
+    dependencies: [mkl_dep, omp_dep, py_dep],
     c_args: c_args,
     link_args: link_args,
     install: true,
@@ -152,7 +152,7 @@ py.extension_module(
     '_ufuncs',
     sources: ['mkl_umath/src/ufuncsmodule.c', gen_loops_h],
     include_directories: inc_np,
-    dependencies: [mkl_dep, tbb_dep, loops_dep],
+    dependencies: [mkl_dep, omp_dep, loops_dep],
     c_args: c_args + ['-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION'],
     link_args: link_args,
     install_rpath: ext_rpath,