From 562d44f9489f59bf99504e97aef412c792dae792 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Fri, 10 May 2024 10:07:53 +0100 Subject: [PATCH] Merge pull request #1593 from kbenzie/benie/cl-update-device-match-file [CL] Update device CTS match file --- .github/scripts/get_system_info.sh | 2 +- source/adapters/opencl/device.cpp | 2 +- test/conformance/device/device_adapter_opencl.match | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/get_system_info.sh b/.github/scripts/get_system_info.sh index 6ca38a33ef..8301c99099 100755 --- a/.github/scripts/get_system_info.sh +++ b/.github/scripts/get_system_info.sh @@ -53,7 +53,7 @@ function system_info { echo "**********/proc/meminfo**********" cat /proc/meminfo echo "**********build/bin/urinfo**********" - $(dirname "$(readlink -f "$0")")/../../build/bin/urinfo || true + $(dirname "$(readlink -f "$0")")/../../build/bin/urinfo --no-linear-ids --verbose || true echo "******OpenCL*******" # The driver version of OpenCL Graphics is the compute-runtime version clinfo || echo "OpenCL not installed" diff --git a/source/adapters/opencl/device.cpp b/source/adapters/opencl/device.cpp index 229c2429a3..6831ea1384 100644 --- a/source/adapters/opencl/device.cpp +++ b/source/adapters/opencl/device.cpp @@ -506,7 +506,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice, cl_adapter::cast(hDevice), {"cl_khr_fp16"}, Supported)); if (!Supported) { - return UR_RESULT_ERROR_INVALID_ENUMERATION; + return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION; } } diff --git a/test/conformance/device/device_adapter_opencl.match b/test/conformance/device/device_adapter_opencl.match index 716ebd54fe..e69de29bb2 100644 --- a/test/conformance/device/device_adapter_opencl.match +++ b/test/conformance/device/device_adapter_opencl.match @@ -1 +0,0 @@ -urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HALF_FP_CONFIG