Skip to content

[MAINT] Make error checks in .bat files more general #2154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2025
+10 −11
Merged

[MAINT] Make error checks in .bat files more general #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79f5a68
make error check in bld.bat wheel copy more general
ndgrigorian Sep 16, 2025
3d7f165
change error checks in .bat files throughout project
ndgrigorian Sep 17, 2025
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
7 changes: 3 additions & 4 deletions conda-recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

REM A workaround for activate-dpcpp.bat issue to be addressed in 2021.4
set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
Expand Down Expand Up @@ -26,9 +25,9 @@ rem fix the issue with IntelLLVM integration with cmake on Windows
if EXIST "%PLATFORM_DIR%" (
dir "%PLATFORM_DIR%\%FN%"
copy /Y "%PLATFORM_DIR%\%FN%" .
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
copy /Y ".github\workflows\Windows-IntelLLVM_%PATCHED_CMAKE_VERSION%.cmake" "%PLATFORM_DIR%\%FN%"
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
)

set "CC=icx"
Expand Down Expand Up @@ -65,5 +64,5 @@ for /f %%f in ('dir /b /S .\dist') do (
:: Copy wheel package
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
copy dist\dpctl*.whl %WHEELS_OUTPUT_FOLDER%
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
)
6 changes: 3 additions & 3 deletions conda-recipe/run_test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@echo on

"%PYTHON%" -c "import dpctl; print(dpctl.__version__)"
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1

"%PYTHON%" -m dpctl -f
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1

python -m pytest -q -ra --disable-warnings --pyargs dpctl -vv
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
8 changes: 4 additions & 4 deletions libsyclinterface/dbg_build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dpcpp.exe --version >nul 2>&1
if errorlevel 1 (
set ERRORLEVEL=
call "%ONEAPI_ROOT%\compiler\latest\env\vars.bat"
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
)
@REM conda uses %ERRORLEVEL% but FPGA scripts can set it. So it should be reseted.
set ERRORLEVEL=
Expand Down Expand Up @@ -31,13 +31,13 @@ cmake -G Ninja ^
"-DCMAKE_LINKER:PATH=%DPCPP_HOME%\bin\lld-link.exe" ^
"-DDPCTL_BUILD_CAPI_TESTS=ON" ^
".."
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1

ninja -n
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
@REM ninja check
@REM IF %ERRORLEVEL% NEQ 0 exit /b 1
ninja install
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1

cd ..
Loading