Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build-with-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
- name: Install Intel OneAPI
run: |
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp
sudo apt-get install intel-oneapi-tbb
sudo apt-get install intel-oneapi-mkl-devel

- name: Setup Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_pip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Install Compiler and MKL
run: |
conda install mkl-devel tbb-devel dpcpp_linux-64
Comment thread
ndgrigorian marked this conversation as resolved.
conda install mkl-devel dpcpp_linux-64
python -c "import sys; print(sys.executable)"
which python

Expand Down
3 changes: 1 addition & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ It provides:
**Required:**
- Compiler toolchain: Intel `icx` or `clang` (with Intel-only flags gated when using clang)
- Intel® OneMKL (mkl-devel)
- Intel® TBB (tbb-devel)
- NumPy, Cython, scikit-build, cmake, ninja

**Conda environment:**
```bash
conda install -c https://software.repos.intel.com/python/conda \
mkl-devel tbb-devel dpcpp_linux-64 numpy-base \
mkl-devel dpcpp_linux-64 numpy-base \
cmake ninja cython scikit-build
export MKLROOT=$CONDA_PREFIX
CC=${CC:-icx} pip install --no-build-isolation --no-deps . # clang is also supported in CI
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ cmake_print_variables(Python_NumPy_INCLUDE_DIRS)
set(CYTHON_FLAGS "-t -w \"${CMAKE_SOURCE_DIR}\"")
find_package(Cython REQUIRED)

find_package(TBB REQUIRED)
set(MKL_ARCH "intel64")
set(MKL_LINK "dynamic")
set(MKL_THREADING "tbb_thread")
set(MKL_THREADING "intel_thread")
set(MKL_INTERFACE "lp64")
find_package(MKL REQUIRED)

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ If these are installed as part of a `oneAPI` installation, the following package

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

Expand All @@ -57,7 +56,7 @@ then the remaining dependencies
- `cython`
- `scikit-build`

and for `mkl-devel`, `tbb-devel` and `dpcpp_linux-64` in a Conda environment, `MKLROOT` environment variable must be set
and for `mkl-devel` and `dpcpp_linux-64` in a Conda environment, `MKLROOT` environment variable must be set
On Linux
```sh
export MKLROOT=$CONDA_PREFIX
Expand Down
4 changes: 2 additions & 2 deletions conda-recipe/AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Conda package build recipe for Intel channel distribution.
- **Channels:** `https://software.repos.intel.com/python/conda`, `conda-forge`
- **Python versions:** 3.10, 3.11, 3.12, 3.13, 3.14
- **Compilers:** Intel C compiler (icx/icl)
- **Dependencies:** mkl-devel, tbb-devel, dpcpp_{linux,win}-64, numpy-base
- **Dependencies:** mkl-devel, dpcpp_{linux,win}-64, numpy-base

## Build outputs
- Conda package: `mkl_umath-<version>-<build>.conda`
Expand All @@ -27,4 +27,4 @@ Conda package build recipe for Intel channel distribution.
## Maintenance
- Keep `conda_build_config.yaml` in sync with CI matrix
- NumPy pin: must match Intel channel NumPy versions
- MKL/TBB versions: track oneAPI releases
- MKL version: track oneAPI releases
1 change: 0 additions & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ requirements:
- python
- python-gil # [py>=314]
- mkl-devel
- tbb-devel
Comment thread
antonwolfy marked this conversation as resolved.
- numpy-base
- wheel >=0.41.3
run:
Expand Down
Loading