Skip to content

Commit 4a51351

Browse files
Add build-time dependency on scikit-build, change build scripts
1 parent 49f111c commit 4a51351

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

conda-recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
44
set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
55

66
"%PYTHON%" setup.py clean --all
7-
set "INSTALL_CMD=install --sycl-compiler-prefix=%BUILD_PREFIX%\Library"
7+
set "INSTALL_CMD=install -- -G Ninja -DDPCTL_DPCPP_HOME_DIR=%BUILD_PREFIX%\Library -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON"
88

99
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
1010
rem Install and assemble wheel package from the build bits

conda-recipe/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
77

88
${PYTHON} setup.py clean --all
9-
INSTALL_CMD="install --sycl-compiler-prefix=$BUILD_PREFIX"
9+
export CMAKE_GENERATOR="Unix Makefiles"
10+
INSTALL_CMD="install -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=${BUILD_PREFIX}"
11+
echo "${PYTHON} setup.py ${INSTALL_CMD}"
1012

1113
# Workaround for:
1214
# DPC++ launched by cmake does not see components of `dpcpp_cpp_rt`,

conda-recipe/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ requirements:
2222
- python
2323
- make # [unix]
2424
- ninja # [win]
25+
- scikit-build
2526
- numpy 1.19
2627
- wheel
2728
run:
2829
- python
2930
- {{ pin_compatible('numpy') }}
30-
- dpcpp-cpp-rt >=2021.2
31+
- dpcpp-cpp-rt >=2022.0
3132

3233
test:
3334
requires:

0 commit comments

Comments
 (0)