Skip to content

Commit 7805af9

Browse files
committed
Fix CI to green on Linux
1 parent bcd591d commit 7805af9

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

conda-recipe/build.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ ! -z "${ONEAPI_ROOT}" ]; then
55
# Suppress error b/c it could fail on Ubuntu 18.04
66
source ${ONEAPI_ROOT}/compiler/latest/env/vars.sh || true
77
export CC=clang
8-
export CXX=dpcpp
8+
export CXX=clang++
99
else
1010
echo "DPCPP is needed to build DPPL. Abort!"
1111
exit 1
@@ -25,8 +25,6 @@ cmake \
2525
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
2626
-DCMAKE_PREFIX_PATH=${PREFIX} \
2727
-DDPCPP_ROOT=${DPCPP_ROOT} \
28-
-DCMAKE_C_COMPILER:PATH=${DPCPP_ROOT}/bin/clang \
29-
-DCMAKE_CXX_COMPILER:PATH=${DPCPP_ROOT}/bin/dpcpp \
3028
-DPYTHON_INCLUDE_DIR=${PYTHON_INC} \
3129
-DNUMPY_INCLUDE_DIR=${NUMPY_INC} \
3230
../oneapi_wrapper
@@ -40,8 +38,8 @@ export DP_GLUE_LIBDIR=${PREFIX}
4038
export DP_GLUE_INCLDIR=${PREFIX}/include
4139
export OpenCL_LIBDIR=${DPCPP_ROOT}/lib
4240
# required by oneapi_interface
43-
export DPPL_ONEAPI_INTERFACE_LIBDIR=${INSTALL_PREFIX}/lib
44-
export DPPL_ONEAPI_INTERFACE_INCLDIR=${INSTALL_PREFIX}/include
41+
export DPPL_ONEAPI_INTERFACE_LIBDIR=${PREFIX}/lib
42+
export DPPL_ONEAPI_INTERFACE_INCLDIR=${PREFIX}/include
4543

4644
# FIXME: How to pass this using setup.py? This flags is needed when
4745
# dpcpp compiles the generated cpp file.

oneapi_wrapper/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function (check_for_dpcpp)
1313
set (dpcpp_cmd "${DPCPP_ROOT}/bin/dpcpp-cl")
1414
set (dpcpp_arg "--version")
1515
elseif(UNIX)
16-
set (dpcpp_cmd "${DPCPP_ROOT}/bin/dpcpp")
16+
set (dpcpp_cmd "dpcpp")
1717
set (dpcpp_arg "--version")
1818
else()
1919
message(FATAL_ERROR "Unsupported system.")
@@ -76,15 +76,12 @@ if(WIN32)
7676
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
7777
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3 -DDEBUG ")
7878
elseif(UNIX)
79-
set(CMAKE_CXX_COMPILER "dpcpp")
80-
set(CMAKE_C_COMPILER "clang")
81-
8279
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
8380
-Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations \
8481
-fdiagnostics-color=auto -O3 \
8582
")
8683
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3 -DDEBUG ")
87-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
84+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fsycl")
8885
else()
8986
message(FATAL_ERROR "Unsupported system.")
9087
endif()

0 commit comments

Comments
 (0)