From e5277ab4b6da4730f7b3e06e701a02ecd3c6ddbc Mon Sep 17 00:00:00 2001 From: pensun Date: Wed, 9 Nov 2016 11:33:23 -0600 Subject: [PATCH] fix for hipcallback function on NV path Change-Id: If80c0cfe60b1f3b1a71627b5f3f79503cba4d491 --- hipamd/include/hip/nvcc_detail/hip_runtime_api.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h index cb4a3f8676..9d2e12d8af 100644 --- a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h +++ b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h @@ -171,8 +171,8 @@ inline static cudaMemcpyKind hipMemcpyKindToCudaMemcpyKind(hipMemcpyKind kind) { /** * Stream CallBack struct */ -typedef void(* hipStreamCallback_t)(hipStream_t stream, hipError_t status, void* userData); - +#define HIPRT_CB CUDART_CB +typedef void(HIPRT_CB * hipStreamCallback_t)(hipStream_t stream, hipError_t status, void* userData); inline static hipError_t hipInit(unsigned int flags) { return hipCUResultTohipError(cuInit(flags)); @@ -589,8 +589,7 @@ inline static hipError_t hipStreamQuery(hipStream_t stream) inline static hipError_t hipStreamAddCallback(hipStream_t stream, hipStreamCallback_t callback, void *userData, unsigned int flags) { - return hipCUDAErrorTohipError(cudaStreamAddCallback(cudaStream_t stream, - cudaStreamCallback_t callback, void *userData, unsigned int flags)); + return hipCUDAErrorTohipError(cudaStreamAddCallback(stream, (cudaStreamCallback_t)callback, userData, flags)); } inline static hipError_t hipDriverGetVersion(int *driverVersion)