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

Merge branch 'memtracker' into privatestaging

Browse Source 
Conflicts:
	include/nvcc_detail/hip_runtime_api.h
This commit is contained in:
Ben Sander
2016-02-26 06:17:05 -06:00
parent c300ffe458 812f56c119
commit 369e0d7b5b
7 changed files with 236 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nvcc_detail/hip_runtime_api.h
-2
View File
@@ -242,12 +242,10 @@ inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t att
cdattr = cudaDevAttrMaxRegistersPerBlock; break;
case hipDeviceAttributeClockRate:
cdattr = cudaDevAttrClockRate; break;
#ifdef USE_ROCR_20
case hipDeviceAttributeMemoryClockRate:
cdattr = cudaDevAttrMemoryClockRate; break;
case hipDeviceAttributeMemoryBusWidth:
cdattr = cudaDevAttrGlobalMemoryBusWidth; break;
#endif
case hipDeviceAttributeMultiprocessorCount:
cdattr = cudaDevAttrMultiProcessorCount; break;
case hipDeviceAttributeComputeMode: