AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-369042 - updating to GetError to match cuda

Browse Source 
Change-Id: I0ec2330443b26cb1c8cedba942f31fb1267cd09d


[ROCm/clr commit: 335a24d1a0]
This commit is contained in:
pghafari
2022-12-11 22:28:36 -05:00
committed by Payam Ghafari
parent f91da83d6a
commit bb765cafaf
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h
+12 -2
View File
@@ -1833,11 +1833,21 @@ inline static const char* hipGetErrorName(hipError_t error) {
} }
inline static hipError_t hipDrvGetErrorString(hipError_t error, const char** errorString) { inline static hipError_t hipDrvGetErrorString(hipError_t error, const char** errorString) {
return hipCUResultTohipError(cuGetErrorString(hipErrorToCUResult(error), errorString)); CUresult err = hipErrorToCUResult(error);
if( err == CUDA_ERROR_UNKNOWN ) {
return hipCUResultTohipError(cuGetErrorString((CUresult)error, errorString));
} else {
return hipCUResultTohipError(cuGetErrorString(err, errorString));
}
} }
inline static hipError_t hipDrvGetErrorName(hipError_t error, const char** errorString) { inline static hipError_t hipDrvGetErrorName(hipError_t error, const char** errorString) {
return hipCUResultTohipError(cuGetErrorName(hipErrorToCUResult(error), errorString)); CUresult err = hipErrorToCUResult(error);
if( err == CUDA_ERROR_UNKNOWN ) {
return hipCUResultTohipError(cuGetErrorName((CUresult)error, errorString));
} else {
return hipCUResultTohipError(cuGetErrorName(err, errorString));
}
} }
inline static hipError_t hipGetDeviceCount(int* count) { inline static hipError_t hipGetDeviceCount(int* count) {
projects/clr/hipamd/src/hip_error.cpp
+2 -2
View File
@@ -357,7 +357,7 @@ hipError_t hipDrvGetErrorName(hipError_t hip_error, const char** errStr)
return hipErrorInvalidValue; return hipErrorInvalidValue;
} }
*errStr = ihipGetErrorName(hip_error); *errStr = ihipGetErrorName(hip_error);
if (strcmp( *errStr, "hipErrorUnknown") != 0) { if (hip_error == hipErrorUnknown || strcmp( *errStr, "hipErrorUnknown") != 0) {
return hipSuccess; return hipSuccess;
} else { } else {
return hipErrorInvalidValue; return hipErrorInvalidValue;
@@ -370,7 +370,7 @@ hipError_t hipDrvGetErrorString(hipError_t hip_error, const char** errStr)
return hipErrorInvalidValue; return hipErrorInvalidValue;
} }
*errStr = ihipGetErrorString(hip_error); *errStr = ihipGetErrorString(hip_error);
if (strcmp( *errStr, "unknown error") != 0) { if (hip_error == hipErrorUnknown || strcmp( *errStr, "unknown error") != 0) {
return hipSuccess; return hipSuccess;
} else { } else {
return hipErrorInvalidValue; return hipErrorInvalidValue;