From 6f15e42a33668ffb4accc278fbd14778148f949a Mon Sep 17 00:00:00 2001 From: Fraser Cormack Date: Mon, 17 Jun 2024 13:33:20 +0100 Subject: [PATCH] [HIP] Fix error code for urContextCreateWithNativeHandle Mirrors a similar change made to the CUDA adapater in 00761dc4. --- source/adapters/cuda/context.cpp | 15 +++++---------- source/adapters/hip/context.cpp | 9 ++++++--- .../conformance/context/context_adapter_hip.match | 3 --- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/source/adapters/cuda/context.cpp b/source/adapters/cuda/context.cpp index 0d08dab76c..8180315b7c 100644 --- a/source/adapters/cuda/context.cpp +++ b/source/adapters/cuda/context.cpp @@ -142,16 +142,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextGetNativeHandle( } UR_APIEXPORT ur_result_t UR_APICALL urContextCreateWithNativeHandle( - ur_native_handle_t hNativeContext, uint32_t numDevices, - const ur_device_handle_t *phDevices, - const ur_context_native_properties_t *pProperties, - ur_context_handle_t *phContext) { - std::ignore = hNativeContext; - std::ignore = numDevices; - std::ignore = phDevices; - std::ignore = pProperties; - std::ignore = phContext; - + [[maybe_unused]] ur_native_handle_t hNativeContext, + [[maybe_unused]] uint32_t numDevices, + [[maybe_unused]] const ur_device_handle_t *phDevices, + [[maybe_unused]] const ur_context_native_properties_t *pProperties, + [[maybe_unused]] ur_context_handle_t *phContext) { return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } diff --git a/source/adapters/hip/context.cpp b/source/adapters/hip/context.cpp index c3fcb3a1a3..1cb0cd83b4 100644 --- a/source/adapters/hip/context.cpp +++ b/source/adapters/hip/context.cpp @@ -119,9 +119,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextGetNativeHandle( } UR_APIEXPORT ur_result_t UR_APICALL urContextCreateWithNativeHandle( - ur_native_handle_t, uint32_t, const ur_device_handle_t *, - const ur_context_native_properties_t *, ur_context_handle_t *) { - return UR_RESULT_ERROR_INVALID_OPERATION; + [[maybe_unused]] ur_native_handle_t hNativeContext, + [[maybe_unused]] uint32_t numDevices, + [[maybe_unused]] const ur_device_handle_t *phDevices, + [[maybe_unused]] const ur_context_native_properties_t *pProperties, + [[maybe_unused]] ur_context_handle_t *phContext) { + return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } UR_APIEXPORT ur_result_t UR_APICALL urContextSetExtendedDeleter( diff --git a/test/conformance/context/context_adapter_hip.match b/test/conformance/context/context_adapter_hip.match index cecf5c8747..e69de29bb2 100644 --- a/test/conformance/context/context_adapter_hip.match +++ b/test/conformance/context/context_adapter_hip.match @@ -1,3 +0,0 @@ -urContextCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}_ -urContextCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_ -urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_