Skip to content

Commit 7dd919f

Browse files
committed
update Windows build scripts
1 parent 480b7e2 commit 7dd919f

2 files changed

Lines changed: 32 additions & 25 deletions

File tree

conda-recipe-cf/bld.bat

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ REM A workaround for activate-dpcpp.bat issue to be addressed in 2021.4
22
set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
33
set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
44

5-
"%PYTHON%" setup.py clean --all
6-
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
5+
set "CC=icx"
6+
set "CXX=icx"
77

8-
FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16 17.0.0 17) DO @(
9-
REM set DIR_HINT if directory exists
10-
IF EXIST "%BUILD_PREFIX%\Library\lib\clang\%%V\" (
11-
SET "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\%%V"
12-
)
8+
%PYTHON% -m build -w -n -x
9+
if %ERRORLEVEL% neq "0" exit 1
10+
11+
for /f %%f in ('dir /b /S .\dist') do (
12+
%PYTHON% -m pip install %%f ^
13+
--no-build-isolation ^
14+
--no-deps ^
15+
--only-binary :all: ^
16+
--no-index ^
17+
--prefix %PREFIX% ^
18+
-vv
19+
if %ERRORLEVEL% neq 0 exit 1
1320
)
1421

1522
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
16-
rem Install and assemble wheel package from the build bits
17-
"%PYTHON%" setup.py install bdist_wheel %SKBUILD_ARGS%
18-
if errorlevel 1 exit 1
1923
copy dist\mkl_umath*.whl %WHEELS_OUTPUT_FOLDER%
20-
if errorlevel 1 exit 1
21-
) ELSE (
22-
rem Only install
23-
"%PYTHON%" setup.py install %SKBUILD_ARGS%
24-
if errorlevel 1 exit 1
24+
if %ERRORLEVEL% neq 0 exit 1
2525
)

conda-recipe/bld.bat

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,24 @@ REM A workaround for activate-dpcpp.bat issue to be addressed in 2021.4
22
set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
33
set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
44

5-
"%PYTHON%" setup.py clean --all
6-
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
5+
set "CC=icx"
6+
set "CXX=icx"
7+
8+
%PYTHON% -m build -w -n -x
9+
if %ERRORLEVEL% neq "0" exit 1
10+
11+
for /f %%f in ('dir /b /S .\dist') do (
12+
%PYTHON% -m pip install %%f ^
13+
--no-build-isolation ^
14+
--no-deps ^
15+
--only-binary :all: ^
16+
--no-index ^
17+
--prefix %PREFIX% ^
18+
-vv
19+
if %ERRORLEVEL% neq 0 exit 1
20+
)
721

822
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
9-
rem Install and assemble wheel package from the build bits
10-
"%PYTHON%" setup.py install bdist_wheel %SKBUILD_ARGS%
11-
if errorlevel 1 exit 1
1223
copy dist\mkl_umath*.whl %WHEELS_OUTPUT_FOLDER%
13-
if errorlevel 1 exit 1
14-
) ELSE (
15-
rem Only install
16-
"%PYTHON%" setup.py install %SKBUILD_ARGS%
17-
if errorlevel 1 exit 1
24+
if %ERRORLEVEL% neq 0 exit 1
1825
)

0 commit comments

Comments
 (0)