cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CUDA fix geting device name with the device index

Browse Source
This commit is contained in:
Tom Deakin 2015-07-20 17:09:26 +01:00
parent 91c804edcd
commit cd786dbe25
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cuda-stream.cu
View File

@ -19,7 +19,7 @@ unsigned int NTIMES = 10;
#define VERSION_STRING "0.0" #define VERSION_STRING "0.0"
void parseArguments(int argc, char *argv[]); void parseArguments(int argc, char *argv[]);
std::string getDeviceName(); std::string getDeviceName(int device);
struct badtype : public std::exception struct badtype : public std::exception
{ {
@ -162,7 +162,7 @@ int main(int argc, char *argv[])
cudaSetDevice(deviceIndex); cudaSetDevice(deviceIndex);
// Print out device name // Print out device name
std::cout << "Using CUDA device " << getDeviceName() << std::endl; std::cout << "Using CUDA device " << getDeviceName(deviceIndex) << std::endl;
// Create host vectors // Create host vectors
@ -286,10 +286,8 @@ int main(int argc, char *argv[])
} }
} }
std::string getDeviceName() std::string getDeviceName(int device)
{ {
int device;
cudaGetDevice(&device);
struct cudaDeviceProp prop; struct cudaDeviceProp prop;
cudaGetDeviceProperties(&prop, device); cudaGetDeviceProperties(&prop, device);
return std::string(prop.name); return std::string(prop.name);
@ -331,8 +329,7 @@ void parseArguments(int argc, char *argv[])
std::cout << "Devices:" << std::endl; std::cout << "Devices:" << std::endl;
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
cudaSetDevice(i); std::cout << i << ": " << getDeviceName(i) << std::endl;
std::cout << i << ": " << getDeviceName() << std::endl;
} }
std::cout << std::endl; std::cout << std::endl;
} }