Merge pull request #1854 from kbenzie/benie/fix-cuda-windows-build

kbenzie · web-flow · commit fa43450ce855 · 2024-07-11T13:35:20.000+01:00
Fix CUDA Windows build
diff --git a/source/adapters/cuda/device.cpp b/source/adapters/cuda/device.cpp
@@ -1167,8 +1167,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGet(ur_platform_handle_t hPlatform,
 
 UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetNativeHandle(
     ur_device_handle_t hDevice, ur_native_handle_t *phNativeHandle) {
-  *phNativeHandle = reinterpret_cast<ur_native_handle_t>(
-      static_cast<std::uintptr_t>(hDevice->get()));
+  *phNativeHandle = static_cast<ur_native_handle_t>(hDevice->get());
   return UR_RESULT_SUCCESS;
 }
 
diff --git a/test/adapters/cuda/urDeviceCreateWithNativeHandle.cpp b/test/adapters/cuda/urDeviceCreateWithNativeHandle.cpp
@@ -15,8 +15,7 @@ TEST_F(urCudaDeviceCreateWithNativeHandle, Success) {
     CUdevice cudaDevice;
     ASSERT_SUCCESS_CUDA(cuDeviceGet(&cudaDevice, 0));
 
-    ur_native_handle_t nativeCuda = reinterpret_cast<ur_native_handle_t>(
-        static_cast<std::uintptr_t>(cudaDevice));
+    ur_native_handle_t nativeCuda = static_cast<ur_native_handle_t>(cudaDevice);
     ur_device_handle_t urDevice;
     ASSERT_SUCCESS(urDeviceCreateWithNativeHandle(nativeCuda, platform, nullptr,
                                                   &urDevice));

Original file line number	Diff line number	Diff line change
`@@ -1167,8 +1167,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGet(ur_platform_handle_t hPlatform,`
`1167`	`1167`
`1168`	`1168`	`UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetNativeHandle(`
`1169`	`1169`	`ur_device_handle_t hDevice, ur_native_handle_t *phNativeHandle) {`
`1170`		`- *phNativeHandle = reinterpret_cast<ur_native_handle_t>(`
`1171`		`- static_cast<std::uintptr_t>(hDevice->get()));`
	`1170`	`+ *phNativeHandle = static_cast<ur_native_handle_t>(hDevice->get());`
`1172`	`1171`	`return UR_RESULT_SUCCESS;`
`1173`	`1172`	`}`
`1174`	`1173`