From a10e227b56643a1deb0f28e1321e6031a59a1904 Mon Sep 17 00:00:00 2001 From: Michael LIAO Date: Thu, 7 Nov 2019 10:11:22 -0500 Subject: [PATCH 1/2] Remove redundant declarations. - The revised `hip/hip_ext.h` have that declarations. [ROCm/clr commit: d28ad401c9d8b75bd86a37e11f58657e9e80ac78] --- .../include/hip/hcc_detail/hip_runtime.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h index 0b70570352..fbf96d3d0b 100644 --- a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h +++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h @@ -518,25 +518,6 @@ hc_get_workitem_absolute_id(int dim) #pragma pop_macro("__CUDA__") #endif // ndef _OPENMP -#if __HIP_VDI__ -hipError_t hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, - uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, - uint32_t localWorkSizeX, uint32_t localWorkSizeY, - uint32_t localWorkSizeZ, size_t sharedMemBytes, - hipStream_t hStream, void** kernelParams, void** extra, - hipEvent_t startEvent = nullptr, - hipEvent_t stopEvent = nullptr, - uint32_t flags = 0); - -hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, - uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, - uint32_t localWorkSizeX, uint32_t localWorkSizeY, - uint32_t localWorkSizeZ, size_t sharedMemBytes, - hipStream_t hStream, void** kernelParams, void** extra, - hipEvent_t startEvent = nullptr, - hipEvent_t stopEvent = nullptr) - __attribute__((deprecated("use hipExtModuleLaunchKernel instead"))); -#endif // __HIP_VDI__ #endif // defined(__clang__) && defined(__HIP__) #include From ca9eb34000a6c80a41e4ba166ebab2b38cdb5ea3 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Mon, 11 Nov 2019 09:53:58 +0530 Subject: [PATCH 2/2] Bump version to 3.0 (#1648) Change-Id: Id1e6eb222080a339af938212e74a52c39c305eab [ROCm/clr commit: 0a2682625f16137164daf871fa654537ffa12b85] --- projects/clr/hipamd/bin/hipconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/bin/hipconfig b/projects/clr/hipamd/bin/hipconfig index e4bf118c61..d19c57ee5c 100755 --- a/projects/clr/hipamd/bin/hipconfig +++ b/projects/clr/hipamd/bin/hipconfig @@ -1,7 +1,7 @@ #!/usr/bin/perl -w -$HIP_BASE_VERSION_MAJOR = "2"; -$HIP_BASE_VERSION_MINOR = "10"; +$HIP_BASE_VERSION_MAJOR = "3"; +$HIP_BASE_VERSION_MINOR = "0"; # Need perl > 5.10 to use logic-defined or use 5.006; use v5.10.1;