Skip to content

Commit ebfd9fb

Browse files
committed
Remove -fsycl getting added to non-SYCL code
1 parent 75b49c7 commit ebfd9fb

File tree

3 files changed

+4
-19
lines changed

3 files changed

+4
-19
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ if(OCCA_ENABLE_DPCPP)
195195
if(DPCPP_FOUND)
196196
set(OCCA_DPCPP_ENABLED 1)
197197

198-
message("-- DPCPP flags: ${SYCL_FLAGS}")
199198
message("-- DPCPP include dirs: ${SYCL_INCLUDE_DIRS}")
200199
message("-- DPCPP libraries: ${SYCL_LIBRARIES}")
201200

cmake/FindDPCPP.cmake

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ find_path(
1717
PATH_SUFFIXES
1818
include/sycl
1919
include/CL
20-
include/sycl/CL
21-
)
20+
include/sycl/CL)
2221

2322
find_library(
2423
SYCL_LIBRARIES
@@ -29,32 +28,19 @@ find_library(
2928
/opt/intel/oneapi/compiler/latest/linux
3029
${SYCL_ROOT}
3130
PATH_SUFFIXES
32-
lib
33-
)
34-
35-
if(NOT DEFINED SYCL_FLAGS)
36-
if(DEFINED ENV{SYCL_FLAGS})
37-
set(SYCL_FLAGS $ENV{SYCL_FLAGS})
38-
else()
39-
set(SYCL_FLAGS -fsycl)
40-
endif()
41-
endif()
31+
lib)
4232

4333
include(FindPackageHandleStandardArgs)
4434
find_package_handle_standard_args(
4535
DPCPP
4636
REQUIRED_VARS
4737
SYCL_INCLUDE_DIRS
48-
SYCL_LIBRARIES
49-
SYCL_FLAGS
50-
)
38+
SYCL_LIBRARIES)
5139

5240
if(DPCPP_FOUND AND NOT TARGET OCCA::depends::DPCPP)
5341
# Create our wrapper imported target
5442
# Put it in the OCCA namespace to make it clear that we created it.
5543
add_library(OCCA::depends::DPCPP INTERFACE IMPORTED)
56-
separate_arguments(SYCL_FLAGS UNIX_COMMAND "${SYCL_FLAGS}")
57-
target_compile_options(OCCA::depends::DPCPP INTERFACE ${SYCL_FLAGS})
5844
set_target_properties(OCCA::depends::DPCPP PROPERTIES
5945
INTERFACE_INCLUDE_DIRECTORIES "${SYCL_INCLUDE_DIRS}"
6046
INTERFACE_LINK_LIBRARIES "${SYCL_LIBRARIES}"

src/occa/internal/modes/dpcpp/polyfill.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#define OCCA_MODES_DPCPP_POLYFILL_HEADER
55

66
#if OCCA_DPCPP_ENABLED
7-
#include <sycl.hpp>
7+
#include <sycl/sycl.hpp>
88
#else
99
#include <cstdint>
1010
#include <vector>

0 commit comments

Comments
 (0)