From c3d5155f7f121204e5f3a19d694f4b8f2f340c28 Mon Sep 17 00:00:00 2001 From: khaled Date: Mon, 6 Nov 2023 22:37:34 -0600 Subject: [PATCH] Fix for windows: IntelDPCPP vs. IntelSYCL Revert changes --- CMakeLists.txt | 5 ----- numba_dpex/core/runtime/CMakeLists.txt | 13 +++---------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a0edab657..44fd0cd8bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} diff --git a/numba_dpex/core/runtime/CMakeLists.txt b/numba_dpex/core/runtime/CMakeLists.txt index 8be88facde..674cc03db6 100644 --- a/numba_dpex/core/runtime/CMakeLists.txt +++ b/numba_dpex/core/runtime/CMakeLists.txt @@ -79,10 +79,9 @@ 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) @@ -90,13 +89,10 @@ 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}) @@ -104,9 +100,6 @@ 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)