Merge branch 'amd-develop' into amd-master

Change-Id: I312fb9d1181733ef5160d1e993e2ae57ced0f6b3 (cherry picked from commit 88fb807af0)
2017-04-24 08:50:43 +05:30
parent 090398d522
commit 5433d17e2e
10 changed files with 1259 additions and 397 deletions
@@ -36,6 +36,10 @@ do {\
 kernelName<<<numblocks,numthreads,memperblock,streamId>>>(0, ##__VA_ARGS__);\
 } while(0)

+#define hipLaunchKernelGGL(kernelName, numblocks, numthreads, memperblock, streamId, ...) \
+do {\
+kernelName<<<numblocks,numthreads,memperblock,streamId>>>(__VA_ARGS__);\
+} while(0)

 #define hipReadModeElementType cudaReadModeElementType

@@ -948,4 +948,6 @@ inline static hipChannelFormatDesc hipCreateChannelDesc()
 {
 		return cudaCreateChannelDesc<T>();
 }
-#endif
+#endif //__CUDACC__
+
+#endif //HIP_INCLUDE_HIP_NVCC_DETAIL_HIP_RUNTIME_API_H