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

Merge branch 'amd-master' into amd-master-next

Browse Source 
Change-Id: I3094c15008093f2072bcd38aca4ea90aeae2d97b
This commit is contained in:
Maneesh Gupta
2020-04-07 06:57:42 -04:00
parent 5ddccf0af7
commit 22e9bcf424
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/0_Intro/module_api/defaultDriver.cpp
+2 -2
View File
@@ -80,8 +80,8 @@ int main() {
hipFree(Ad);
hipFree(Bd);
delete A;
delete B;
delete[] A;
delete[] B;
hipCtxDestroy(context);
return 0;
}
samples/0_Intro/module_api/launchKernelHcc.cpp
+2 -2
View File
@@ -107,8 +107,8 @@ int main() {
hipFree(Ad);
hipFree(Bd);
delete A;
delete B;
delete[] A;
delete[] B;
hipCtxDestroy(context);
return 0;
}
samples/0_Intro/module_api/runKernel.cpp
+2 -2
View File
@@ -99,8 +99,8 @@ int main() {
hipFree(Ad);
hipFree(Bd);
delete A;
delete B;
delete[] A;
delete[] B;
hipCtxDestroy(context);
return 0;
}
samples/0_Intro/module_api_global/runKernel.cpp
+2 -2
View File
@@ -154,8 +154,8 @@ int main() {
hipFree(Ad);
hipFree(Bd);
delete A;
delete B;
delete[] A;
delete[] B;
hipCtxDestroy(context);
return 0;
}
samples/1_Utils/hipInfo/hipInfo.cpp
+2 -1
View File
@@ -56,6 +56,7 @@ void printCompilerInfo() {
#endif
}
double bytesToKB(size_t s) { return (double)s / (1024.0); }
double bytesToGB(size_t s) { return (double)s / (1024.0 * 1024.0 * 1024.0); }
#define printLimit(w1, limit, units) \
@@ -97,7 +98,7 @@ void printDeviceProp(int deviceId) {
cout << setw(w1) << "totalGlobalMem: " << fixed << setprecision(2)
<< bytesToGB(props.totalGlobalMem) << " GB" << endl;
cout << setw(w1) << "maxSharedMemoryPerMultiProcessor: " << fixed << setprecision(2)
<< bytesToGB(props.maxSharedMemoryPerMultiProcessor) << " GB" << endl;
<< bytesToKB(props.maxSharedMemoryPerMultiProcessor) << " KB" << endl;
cout << setw(w1) << "totalConstMem: " << props.totalConstMem << endl;
cout << setw(w1) << "sharedMemPerBlock: " << (float)props.sharedMemPerBlock / 1024.0 << " KB"
<< endl;