Skip to content

Commit 557c2fd

Browse files
aelovikov-intelbb-sycl
authored andcommitted
[SYCL] Remove <sycl/sycl.hpp> workaround (intel#1344)
1 parent fc99f90 commit 557c2fd

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

SYCL/include/sycl/sycl.hpp

Lines changed: 0 additions & 11 deletions
This file was deleted.

SYCL/lit.cfg.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -282,26 +282,12 @@
282282
else:
283283
arch_flag = ""
284284

285-
# Add an extra include directory which points to a fake sycl/sycl.hpp (which just points to CL/sycl.hpp)
286-
# location to workaround compiler versions which do not provide this header
287-
check_sycl_hpp_file='sycl_hpp_include.cpp'
288-
with open(check_sycl_hpp_file, 'w') as fp:
289-
fp.write('#include <sycl/sycl.hpp>\n')
290-
fp.write('int main() {}')
291-
292-
extra_sycl_include = ""
293-
sycl_hpp_available = subprocess.getstatusoutput(config.dpcpp_compiler + ' -fsycl ' + check_sycl_hpp_file + ' ' + ("/c" if cl_options else "-c"))
294-
if sycl_hpp_available[0] != 0:
295-
lit_config.note('Simple include of sycl/sycl.hpp failed with output: ' + sycl_hpp_available[1] +
296-
'\nUsing fake sycl/sycl.hpp (which just points to CL/sycl.hpp)')
297-
extra_sycl_include = " " + ("/I" if cl_options else "-I") + config.extra_include
298-
299285
if lit_config.params.get('compatibility_testing', False):
300286
config.substitutions.append( ('%clangxx', ' true ') )
301287
config.substitutions.append( ('%clang', ' true ') )
302288
else:
303-
config.substitutions.append( ('%clangxx', ' '+ config.dpcpp_compiler + ' ' + config.cxx_flags + ' ' + arch_flag + extra_sycl_include) )
304-
config.substitutions.append( ('%clang', ' ' + config.dpcpp_compiler + ' ' + config.c_flags + extra_sycl_include) )
289+
config.substitutions.append( ('%clangxx', ' '+ config.dpcpp_compiler + ' ' + config.cxx_flags + ' ' + arch_flag) )
290+
config.substitutions.append( ('%clang', ' ' + config.dpcpp_compiler + ' ' + config.c_flags) )
305291

306292
config.substitutions.append( ('%threads_lib', config.sycl_threads_lib) )
307293

0 commit comments

Comments
 (0)