From 9af7591223b9b656f60a0fe929964cfddd52e68e Mon Sep 17 00:00:00 2001 From: Aditya Atluri Date: Mon, 29 Aug 2016 15:20:09 -0500 Subject: [PATCH] added hipInit for cuInit nvcc path Change-Id: I594d08d936ac5d06f16e42c63062ac5776b65a0c [ROCm/clr commit: 5d3c72a7fffdd18e0c8db6cc173b2f77c4320c3f] --- .../clr/hipamd/include/nvcc_detail/hip_runtime_api.h | 11 +++++++++++ projects/clr/hipamd/tests/src/sampleModule.cpp | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h index d7f5d521a4..9ca3542569 100644 --- a/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h +++ b/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h @@ -148,6 +148,11 @@ default: } } +inline static hipError_t hipInit(unsigned int flags) +{ + return hipCUResultTohipError(cuInit(flags)); +} + inline static hipError_t hipDeviceReset() { return hipCUDAErrorTohipError(cudaDeviceReset()); } @@ -219,6 +224,12 @@ inline static hipError_t hipMemcpyDtoH(void* dst, return hipCUResultTohipError(cuMemcpyDtoH(dst, src, size)); } +inline static hipError_t hipMemcpyDtoD(hipDeviceptr_t dst, + hipDeviceptr_t src, size_t size) +{ + return hipCUResultTohipError(cuMemcpyDtoD(dst, src, size)); +} + inline static hipError_t hipMemcpy(void* dst, const void* src, size_t sizeBytes, hipMemcpyKind copyKind) { return hipCUDAErrorTohipError(cudaMemcpy(dst, src, sizeBytes, hipMemcpyKindToCudaMemcpyKind(copyKind))); } diff --git a/projects/clr/hipamd/tests/src/sampleModule.cpp b/projects/clr/hipamd/tests/src/sampleModule.cpp index bef7345b4f..606b19717d 100644 --- a/projects/clr/hipamd/tests/src/sampleModule.cpp +++ b/projects/clr/hipamd/tests/src/sampleModule.cpp @@ -50,7 +50,7 @@ int main(){ #ifdef __HIP_PLATFORM_NVCC__ - cuInit(0); + hipInit(0); hipDevice_t device; hipCtx_t context; hipDeviceGet(&device, 0);