Skip to content

Commit bedec37

Browse files
committed
[CI] Install DeviceConfigFile independently
Also clear configure.py
1 parent b37d0d4 commit bedec37

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

.github/workflows/sycl-linux-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ jobs:
296296
cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
297297
cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
298298
cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
299+
cmake --install $GITHUB_WORKSPACE/build --component DeviceConfigFile
299300
- name: Additional Install for "--shared-libs" build
300301
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }}
301302
run: |

buildbot/configure.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ def do_configure(args, passthrough_args):
6666
xpti_enable_werror = "OFF"
6767
llvm_enable_zstd = "OFF"
6868
spirv_enable_dis = "OFF"
69-
sycl_install_device_config_file = "OFF"
7069

7170
if sys.platform != "darwin":
7271
# For more info on the enablement of level_zero_v2 refer to this document:
@@ -162,7 +161,6 @@ def do_configure(args, passthrough_args):
162161
libclc_targets_to_build += libclc_nvidia_target_names
163162
libclc_gen_remangled_variants = "ON"
164163
spirv_enable_dis = "ON"
165-
sycl_install_device_config_file = "ON"
166164

167165
if args.enable_backends:
168166
sycl_enabled_backends += args.enable_backends
@@ -211,7 +209,6 @@ def do_configure(args, passthrough_args):
211209
"-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
212210
"-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
213211
"-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
214-
"-DSYCL_INSTALL_DEVICE_CONFIG_FILE={}".format(sycl_install_device_config_file),
215212
]
216213

217214
if libclc_enabled:

sycl/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -532,11 +532,6 @@ if("hip" IN_LIST SYCL_ENABLE_BACKENDS)
532532
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS ur_adapter_hip)
533533
endif()
534534

535-
if(SYCL_INSTALL_DEVICE_CONFIG_FILE)
536-
add_dependencies(sycl-toolchain DeviceConfigFile)
537-
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS DeviceConfigFile)
538-
endif()
539-
540535
# Use it as fake dependency in order to force another command(s) to execute.
541536
add_custom_command(OUTPUT __force_it
542537
COMMAND "${CMAKE_COMMAND}" -E echo

0 commit comments

Comments
 (0)