Skip to content

Commit aa3dcf6

Browse files
authored
Merge pull request #171 from IntelPython/drop-tbb-threading
Use OpenMP for threading instead of TBB
2 parents a2d0087 + 9b64034 commit aa3dcf6

8 files changed

Lines changed: 6 additions & 12 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
- name: Install Intel OneAPI
4141
run: |
4242
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp
43-
sudo apt-get install intel-oneapi-tbb
4443
sudo apt-get install intel-oneapi-mkl-devel
4544
4645
- name: Setup Python

.github/workflows/build_pip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Install Compiler and MKL
4444
run: |
45-
conda install mkl-devel tbb-devel dpcpp_linux-64
45+
conda install mkl-devel dpcpp_linux-64
4646
python -c "import sys; print(sys.executable)"
4747
which python
4848

AGENTS.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ It provides:
2121
**Required:**
2222
- Compiler toolchain: Intel `icx` or `clang` (with Intel-only flags gated when using clang)
2323
- Intel® OneMKL (mkl-devel)
24-
- Intel® TBB (tbb-devel)
2524
- NumPy, Cython, scikit-build, cmake, ninja
2625

2726
**Conda environment:**
2827
```bash
2928
conda install -c https://software.repos.intel.com/python/conda \
30-
mkl-devel tbb-devel dpcpp_linux-64 numpy-base \
29+
mkl-devel dpcpp_linux-64 numpy-base \
3130
cmake ninja cython scikit-build
3231
export MKLROOT=$CONDA_PREFIX
3332
CC=${CC:-icx} pip install --no-build-isolation --no-deps . # clang is also supported in CI

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ cmake_print_variables(Python_NumPy_INCLUDE_DIRS)
2323
set(CYTHON_FLAGS "-t -w \"${CMAKE_SOURCE_DIR}\"")
2424
find_package(Cython REQUIRED)
2525

26-
find_package(TBB REQUIRED)
2726
set(MKL_ARCH "intel64")
2827
set(MKL_LINK "dynamic")
29-
set(MKL_THREADING "tbb_thread")
28+
set(MKL_THREADING "intel_thread")
3029
set(MKL_INTERFACE "lp64")
3130
find_package(MKL REQUIRED)
3231

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ If these are installed as part of a `oneAPI` installation, the following package
4747

4848
If build dependencies are to be installed with Conda, the following packages must be installed from the Intel(R) channel
4949
- `mkl-devel`
50-
- `tbb-devel`
5150
- `dpcpp_linux-64` (or `dpcpp_win-64` for Windows)
5251
- `numpy-base`
5352

@@ -57,7 +56,7 @@ then the remaining dependencies
5756
- `cython`
5857
- `scikit-build`
5958

60-
and for `mkl-devel`, `tbb-devel` and `dpcpp_linux-64` in a Conda environment, `MKLROOT` environment variable must be set
59+
and for `mkl-devel` and `dpcpp_linux-64` in a Conda environment, `MKLROOT` environment variable must be set
6160
On Linux
6261
```sh
6362
export MKLROOT=$CONDA_PREFIX

conda-recipe-cf/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ requirements:
2828
- scikit-build
2929
- python
3030
- mkl-devel
31-
- tbb-devel
3231
- numpy
3332
run:
3433
- python

conda-recipe/AGENTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Conda package build recipe for Intel channel distribution.
1313
- **Channels:** `https://software.repos.intel.com/python/conda`, `conda-forge`
1414
- **Python versions:** 3.10, 3.11, 3.12, 3.13, 3.14
1515
- **Compilers:** Intel C compiler (icx/icl)
16-
- **Dependencies:** mkl-devel, tbb-devel, dpcpp_{linux,win}-64, numpy-base
16+
- **Dependencies:** mkl-devel, dpcpp_{linux,win}-64, numpy-base
1717

1818
## Build outputs
1919
- Conda package: `mkl_umath-<version>-<build>.conda`
@@ -27,4 +27,4 @@ Conda package build recipe for Intel channel distribution.
2727
## Maintenance
2828
- Keep `conda_build_config.yaml` in sync with CI matrix
2929
- NumPy pin: must match Intel channel NumPy versions
30-
- MKL/TBB versions: track oneAPI releases
30+
- MKL version: track oneAPI releases

conda-recipe/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ requirements:
2828
- python
2929
- python-gil # [py>=314]
3030
- mkl-devel
31-
- tbb-devel
3231
- numpy-base
3332
- wheel >=0.41.3
3433
run:

0 commit comments

Comments
 (0)