From 9cb14a455cfdc322bee87753d99537d59fd3d3cf Mon Sep 17 00:00:00 2001 From: Ben Sander Date: Thu, 4 Feb 2016 16:26:33 -0600 Subject: [PATCH] Fix getdeviceattr compilation for NVCC [ROCm/hip commit: 76ebe6dcfd187f37684e8b5d8fd647e65eda59e6] --- projects/hip/include/nvcc_detail/hip_runtime_api.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/hip/include/nvcc_detail/hip_runtime_api.h b/projects/hip/include/nvcc_detail/hip_runtime_api.h index 62cdc582bc..482b1259b0 100644 --- a/projects/hip/include/nvcc_detail/hip_runtime_api.h +++ b/projects/hip/include/nvcc_detail/hip_runtime_api.h @@ -213,7 +213,7 @@ inline static hipError_t hipDeviceGetProperties(hipDeviceProp_t *p_prop, int dev inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t attr, int device) { - cudaDeviceAttribute cdattr; + cudaDeviceAttr cdattr; cudaError_t cerror; switch (attr) { @@ -254,7 +254,7 @@ inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t att case hipDeviceAttributeComputeCapabilityMinor: cdattr = cudaDevAttrComputeCapabilityMinor; break; default: - e = hipErrorInvalidValue; break; + cerror = cudaErrorInvalidValue; break; } cerror = cudaDeviceGetAttribute(pi, cdattr, device);