[cmake] Allow to use clang++ -fsycl (#639)

uxlfoundation · Mar 4, 2025 · 620fe8d · 620fe8d
1 parent b8b5244
commit 620fe8d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/cmake/FindCompiler.cmake b/cmake/FindCompiler.cmake
@@ -25,7 +25,14 @@ check_cxx_compiler_flag("-fsycl" is_dpcpp)
 if(is_dpcpp)
   # Workaround for internal compiler error during linking if -fsycl is used
   get_filename_component(SYCL_BINARY_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
-  find_library(SYCL_LIBRARY NAMES sycl PATHS "${SYCL_BINARY_DIR}/../lib" "${SYCL_BINARY_DIR}/lib" ENV LIBRARY_PATH ENV PATH)
+  find_library(SYCL_LIBRARY NAMES sycl
+    PATHS
+      "${SYCL_BINARY_DIR}/lib"
+      "${SYCL_BINARY_DIR}/../lib"
+      "${SYCL_BINARY_DIR}/../../lib"
+      ENV LIBRARY_PATH
+      ENV PATH
+  )
   if(NOT SYCL_LIBRARY)
     message(FATAL_ERROR "SYCL library is not found in ${SYCL_BINARY_DIR}/../lib, PATH, and LIBRARY_PATH")
   endif()

diff --git a/cmake/FindcuBLAS.cmake b/cmake/FindcuBLAS.cmake
@@ -21,12 +21,13 @@ find_package(CUDA 10.0 REQUIRED)
 get_filename_component(SYCL_BINARY_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
 # the OpenCL include file from cuda is opencl 1.1 and it is not compatible with DPC++
 # the OpenCL include headers 1.2 onward is required. This is used to bypass NVIDIA OpenCL headers
-find_path(OPENCL_INCLUDE_DIR CL/cl.h OpenCL/cl.h 
-HINTS 
-${OPENCL_INCLUDE_DIR}
-${SYCL_BINARY_DIR}/../include/sycl/
-${SYCL_BINARY_DIR}/../../include/sycl/
-${SYCL_BINARY_DIR}/../include/
+find_path(OPENCL_INCLUDE_DIR
+  NAMES CL/cl.h OpenCL/cl.h
+  HINTS
+    ${OPENCL_INCLUDE_DIR}
+    ${SYCL_BINARY_DIR}/../include/
+    ${SYCL_BINARY_DIR}/../../include/
+  PATH_SUFFIXES sycl
 )
 # this is work around to avoid duplication half creation in both cuda and SYCL
 add_compile_definitions(CUDA_NO_HALF)

diff --git a/cmake/FindcuRAND.cmake b/cmake/FindcuRAND.cmake
@@ -62,11 +62,13 @@ get_filename_component(SYCL_BINARY_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
 if (NOT (ONEMATH_SYCL_IMPLEMENTATION STREQUAL "hipsycl"))
 # the OpenCL include file from cuda is opencl 1.1 and it is not compatible with DPC++
 # the OpenCL include headers 1.2 onward is required. This is used to bypass NVIDIA OpenCL headers
-find_path(OPENCL_INCLUDE_DIR CL/cl.h OpenCL/cl.h 
-HINTS 
-${OPENCL_INCLUDE_DIR}
-${SYCL_BINARY_DIR}/../include/sycl/
-${SYCL_BINARY_DIR}/../include/
+find_path(OPENCL_INCLUDE_DIR
+  NAMES CL/cl.h OpenCL/cl.h
+  HINTS
+    ${OPENCL_INCLUDE_DIR}
+    ${SYCL_BINARY_DIR}/../include/
+    ${SYCL_BINARY_DIR}/../../include/
+  PATH_SUFFIXES sycl
 )
 endif()
 

diff --git a/cmake/FindcuSOLVER.cmake b/cmake/FindcuSOLVER.cmake
@@ -21,11 +21,13 @@ find_package(CUDA 10.0 REQUIRED)
 get_filename_component(SYCL_BINARY_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
 # the OpenCL include file from cuda is opencl 1.1 and it is not compatible with DPC++
 # the OpenCL include headers 1.2 onward is required. This is used to bypass NVIDIA OpenCL headers
-find_path(OPENCL_INCLUDE_DIR CL/cl.h OpenCL/cl.h 
-HINTS 
-${OPENCL_INCLUDE_DIR}
-${SYCL_BINARY_DIR}/../include/sycl/
-${SYCL_BINARY_DIR}/../include/
+find_path(OPENCL_INCLUDE_DIR
+  NAMES CL/cl.h OpenCL/cl.h
+  HINTS
+    ${OPENCL_INCLUDE_DIR}
+    ${SYCL_BINARY_DIR}/../include/
+    ${SYCL_BINARY_DIR}/../../include/
+  PATH_SUFFIXES sycl
 )
 # this is work around to avoid duplication half creation in both cuda and SYCL
 add_compile_definitions(CUDA_NO_HALF)