Skip to content

Commit cf9122a

Browse files
compiler from package in recipe (#935)
* compiler from package in recipe * add tbb and mkl devel packages * rename env vars for ignore in CI * search math lib in Python env
1 parent 7a92c72 commit cf9122a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

conda-recipe/meta.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ requirements:
1313
- cython
1414
- cmake >=3.16.5
1515
- dpctl >=0.5.0a0
16-
- mkl-devel >=2021.1.1
16+
- mkl-devel-dpcpp
17+
- tbb-devel
1718
- wheel
1819
build:
19-
- {{ compiler('cxx') }}
20+
- {{ compiler('dpcpp') }}
2021
run:
2122
- python
2223
- dpctl >=0.5.0a0
@@ -29,8 +30,8 @@ build:
2930
number: {{ GIT_DESCRIBE_NUMBER }}
3031
include_recipe: False
3132
script_env:
32-
- ONEAPI_ROOT
33-
- DPCPPROOT
33+
- _ONEAPI_ROOT # renamed for ignore in CI
34+
- _DPCPPROOT # renamed for ignore in CI
3435
- MKLROOT
3536
- TBBROOT
3637
- WHEELS_OUTPUT_FOLDER

dpnp/backend/cmake/Modules/FindMathLib.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ endif()
5151

5252
find_path(
5353
MATHLIB_INCLUDE_DIR oneapi/mkl.hpp
54-
HINTS ENV CONDA_PREFIX ${MATHLIB_ROOT_DIR} # search order is important
54+
HINTS ENV CONDA_PREFIX ENV PREFIX ${MATHLIB_ROOT_DIR} # search order is important
5555
PATH_SUFFIXES include latest/include
5656
DOC "Path to mathlib include files")
5757

5858
find_path(
5959
MATHLIB_LIBRARY_DIR ${MATHLIB_SYCL_LIB}
60-
HINTS ENV CONDA_PREFIX ${MATHLIB_ROOT_DIR} # search order is important
60+
HINTS ENV CONDA_PREFIX ENV PREFIX ${MATHLIB_ROOT_DIR} # search order is important
6161
PATH_SUFFIXES lib latest/lib/intel64
6262
DOC "Path to mathlib library files")
6363

0 commit comments

Comments
 (0)