Skip to content

Commit 44d4cfe

Browse files
Make sure to not overwrite -fsycl option in select files
Removed -fsycl for default linking options on Windows. The option is added as needed.
1 parent 42e43b9 commit 44d4cfe

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

dpctl/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ elseif(UNIX)
6060
string(CONCAT CXXFLAGS
6161
"${WARNING_FLAGS}"
6262
"${SDL_FLAGS}"
63-
"-fsycl "
6463
)
6564
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 ${CFLAGS}")
6665
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 ${CXXFLAGS}")
@@ -193,14 +192,18 @@ function(build_dpctl_ext _trgt _src _dest)
193192
install(TARGETS ${_trgt} LIBRARY DESTINATION ${_dest})
194193
endfunction()
195194

196-
file(GLOB _cython_sources *.pyx)
195+
file(GLOB _cython_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.pyx)
196+
list(REMOVE_ITEM _cython_sources ${CMAKE_CURRENT_SOURCE_DIR}/_sycl_queue.pyx)
197197
foreach(_cy_file ${_cython_sources})
198198
get_filename_component(_trgt ${_cy_file} NAME_WLE)
199199
build_dpctl_ext(${_trgt} ${_cy_file} "dpctl")
200200
endforeach()
201201

202+
set(_cy_file ${CMAKE_CURRENT_SOURCE_DIR}/_sycl_queue.pyx)
203+
get_filename_component(_trgt ${_cy_file} NAME_WLE)
204+
build_dpctl_ext(${_trgt} ${_cy_file} "dpctl" SYCL)
205+
202206
target_include_directories(_sycl_queue PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
203-
add_sycl_to_target(TARGET _sycl_queue SOURCES _sycl_queue.cxx)
204207

205208
add_subdirectory(program)
206209
add_subdirectory(memory)

dpctl/tensor/CMakeLists.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,20 @@ set(_clang_prefix "")
5757
if (WIN32)
5858
set(_clang_prefix "/clang:")
5959
endif()
60-
set_source_files_properties(
60+
61+
set(_no_fast_math_sources
6162
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/full_ctor.cpp
6263
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/linear_sequences.cpp
6364
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/elementwise_functions.cpp
64-
PROPERTIES COMPILE_OPTIONS "${_clang_prefix}-fno-fast-math")
65+
)
66+
foreach(_src_fn ${_no_fast_math_sources})
67+
get_source_file_property(_cmpl_options_prop ${_src_fn} COMPILE_OPTIONS)
68+
set(_combined_options_prop ${_cmpl_options_prop} "${_clang_prefix}-fno-fast-math")
69+
set_source_files_properties(
70+
${_src_fn}
71+
PROPERTIES COMPILE_OPTIONS "${_combined_options_prop}"
72+
)
73+
endforeach()
6574
if (UNIX)
6675
set_source_files_properties(
6776
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/elementwise_functions.cpp

0 commit comments

Comments
 (0)