From 9eb1fda8ad1bd50a8c1302afdb139c071b4dbdda Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 23 Sep 2020 17:21:05 -0500 Subject: [PATCH 1/2] Use dpcpp.exe on Windows instead of dpcpp-cl.exe deleted in oneAPI beta08 --- conda-recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index fa6318a820..362fcb6528 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -3,8 +3,8 @@ IF ERRORLEVEL 1 exit 1 REM conda uses %ERRORLEVEL% but FPGA scripts can set it. So it should be reseted. set ERRORLEVEL= -set "CC=dpcpp-cl.exe" -set "CXX=dpcpp-cl.exe" +set "CC=dpcpp.exe" +set "CXX=dpcpp.exe" rmdir /S /Q build_cmake mkdir build_cmake From 4b05a80e95b478350423481ee9da7bca809a8028 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 23 Sep 2020 17:37:31 -0500 Subject: [PATCH 2/2] Use dpcpp.exe instead of dpcpp-cl.exe in CMakeLists.txt --- backends/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt index abb8c022ff..c92faed9b8 100644 --- a/backends/CMakeLists.txt +++ b/backends/CMakeLists.txt @@ -10,7 +10,7 @@ function (check_for_dpcpp) endif() if(WIN32) - set (dpcpp_cmd "${DPCPP_ROOT}/bin/dpcpp-cl") + set (dpcpp_cmd "${DPCPP_ROOT}/bin/dpcpp") set (dpcpp_arg "--version") elseif(UNIX) set (dpcpp_cmd "dpcpp") @@ -62,7 +62,7 @@ check_for_dpcpp() check_for_numpy_inc() if(WIN32) - set(CMAKE_CXX_COMPILER:PATH "${DPCPP_ROOT}/bin/dpcpp-cl") + set(CMAKE_CXX_COMPILER:PATH "${DPCPP_ROOT}/bin/dpcpp") set(CMAKE_C_COMPILER:PATH "${DPCPP_ROOT}/bin/clang-cl") set(CMAKE_LINKER:PATH "${DPCPP_ROOT}/bin/lld-link") message(STATUS "Resetting CXX compiler to: " ${CMAKE_CXX_COMPILER})