Skip to content

Commit

Permalink
Fix for windows: IntelDPCPP vs. IntelSYCL
Browse files Browse the repository at this point in the history
Revert changes
  • Loading branch information
chudur-budur committed Nov 7, 2023
1 parent 6ba0e17 commit c3d5155
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ project(numba-dpex
VERSION ${NUMBA_DPEX_VERSION}
)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)

if(IS_INSTALL)
install(DIRECTORY numba_dpex
DESTINATION ${CMAKE_INSTALL_PREFIX}
Expand Down
13 changes: 3 additions & 10 deletions numba_dpex/core/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,34 +79,27 @@ message(STATUS "CMAKE_MODULE_PATH=" "${CMAKE_MODULE_PATH}")

# Add packages
find_package(Python 3.9 REQUIRED
COMPONENTS Interpreter Development.Module)
COMPONENTS Interpreter Development.Module NumPy)
find_package(Dpctl REQUIRED)
find_package(NumPy REQUIRED)
find_package(IntelSYCL REQUIRED)

# Includes
include(GNUInstallDirs)
include_directories(${Python_INCLUDE_DIRS})
include_directories(${NumPy_INCLUDE_DIRS})
include_directories(${Numba_INCLUDE_DIRS})
include_directories(${Dpctl_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/kernels/tensor/include)
include_directories(.)

# Source files, *.c
file(GLOB_RECURSE DPEXRT_SOURCES CONFIGURE_DEPENDS "*.c")
file(GLOB_RECURSE KERNEL_SOURCES CONFIGURE_DEPENDS "*.cpp")
set(SOURCES ${DPEXRT_SOURCES} ${KERNEL_SOURCES})
file(GLOB SOURCES "*.c")

# Link dpctl library path with -L
link_directories(${DPCTL_LIBRARY_PATH})

# Output static library, *.so or *.dll
python_add_library(${PROJECT_NAME} MODULE ${SOURCES})

# Add SYCL to target, this must come after python_add_library()
add_sycl_to_target(TARGET ${PROJECT_NAME} SOURCES ${KERNEL_SOURCES})

# Link the DPCTLSyclInterface library to target
target_link_libraries(${PROJECT_NAME} PRIVATE DPCTLSyclInterface)

Expand Down

0 comments on commit c3d5155

Please sign in to comment.