less restrictive SYCL_DEVICE_FILTER

ginkgo-project · Apr 21, 2023 · 2b71f7a · 2b71f7a
1 parent c26a99a
commit 2b71f7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -605,7 +605,7 @@ build/dpcpp/cpu/release/static:
     BUILD_DPCPP: "ON"
     BUILD_TYPE: "Release"
     BUILD_SHARED_LIBS: "ON"
-    SYCL_DEVICE_FILTER: "Level_Zero:CPU"
+    SYCL_DEVICE_FILTER: "CPU"
     SLURM_PARTITION: "cpu"
     SLURM_TIME: "2:00:00"
     # This job is not in exclusive mode
@@ -624,7 +624,7 @@ build/dpcpp/igpu/release/shared:
     BUILD_TYPE: "Release"
     BUILD_SHARED_LIBS: "ON"
     DPCPP_SINGLE_MODE: "ON"
-    SYCL_DEVICE_FILTER: "Level_Zero:GPU"
+    SYCL_DEVICE_FILTER: "GPU"
 
 # TODO: Enable when debug shared library size issues are fixed
 # build/dpcpp/level_zero_igpu/debug/shared:
@@ -656,7 +656,7 @@ build/dpcpp/dgpu/release/static:
     BUILD_TYPE: "Release"
     BUILD_SHARED_LIBS: "OF"
     DPCPP_SINGLE_MODE: "ON"
-    SYCL_DEVICE_FILTER: "Level_Zero:GPU"
+    SYCL_DEVICE_FILTER: "GPU"
 
 build/dpcpp/level_zero_dgpu/release/shared:
   extends:

diff --git a/dpcpp/get_info.cmake b/dpcpp/get_info.cmake
@@ -3,6 +3,5 @@ ginkgo_print_module_footer(${detailed_log} "DPCPP variables:")
 ginkgo_print_variable(${detailed_log} "GINKGO_DPCPP_FLAGS")
 ginkgo_print_variable(${detailed_log} "GINKGO_DPCPP_SINGLE_MODE")
 ginkgo_print_module_footer(${detailed_log} "DPCPP environment variables:")
-ginkgo_print_env_variable(${detailed_log} "SYCL_DEVICE_TYPE")
-ginkgo_print_env_variable(${detailed_log} "SYCL_BE")
+ginkgo_print_env_variable(${detailed_log} "SYCL_DEVICE_FILTER")
 ginkgo_print_module_footer(${detailed_log} "")