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

Move device functions outside class

Browse Source
This commit is contained in:
Tom Deakin 2016-04-29 18:28:21 +01:00
parent 1a96b71935
commit 3c394b9db0
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/CUDAStream.cu
View File

@ -135,8 +135,7 @@ void CUDAStream<T>::triad()
} }
template <class T> void listDevices(void)
void CUDAStream<T>::listDevices(void)
{ {
// Get number of devices // Get number of devices
int count; int count;
@ -160,8 +159,8 @@ void CUDAStream<T>::listDevices(void)
} }
} }
template <class T>
std::string CUDAStream<T>::getDeviceName(const int device) std::string getDeviceName(const int device)
{ {
cudaDeviceProp props; cudaDeviceProp props;
cudaGetDeviceProperties(&props, device); cudaGetDeviceProperties(&props, device);
@ -169,8 +168,8 @@ std::string CUDAStream<T>::getDeviceName(const int device)
return std::string(props.name); return std::string(props.name);
} }
template <class T>
std::string CUDAStream<T>::getDeviceDriver(const int device) std::string getDeviceDriver(const int device)
{ {
cudaSetDevice(device); cudaSetDevice(device);
check_error(); check_error();

4
src/CUDAStream.h
View File

@ -31,9 +31,5 @@ class CUDAStream : public Stream<T>
virtual void write_arrays(const std::vector<T>& a, const std::vector<T>& b, const std::vector<T>& c) override; virtual void write_arrays(const std::vector<T>& a, const std::vector<T>& b, const std::vector<T>& c) override;
virtual void read_arrays(std::vector<T>& a, std::vector<T>& b, std::vector<T>& c) override; virtual void read_arrays(std::vector<T>& a, std::vector<T>& b, std::vector<T>& c) override;
static void listDevices(void);
static std::string getDeviceName(const int device);
static std::string getDeviceDriver(const int device);
}; };

10
src/Stream.h
View File

@ -19,10 +19,10 @@ class Stream
virtual void write_arrays(const std::vector<T>& a, const std::vector<T>& b, const std::vector<T>& c) = 0; virtual void write_arrays(const std::vector<T>& a, const std::vector<T>& b, const std::vector<T>& c) = 0;
virtual void read_arrays(std::vector<T>& a, std::vector<T>& b, std::vector<T>& c) = 0; virtual void read_arrays(std::vector<T>& a, std::vector<T>& b, std::vector<T>& c) = 0;
// Implementation specific device functions
static void listDevices(void);
static std::string getDeviceName(const int);
static std::string getDeviceDriver(const int);
}; };
// Implementation specific device functions
static void listDevices(void);
static std::string getDeviceName(const int);
static std::string getDeviceDriver(const int);

6
src/main.cpp
View File

@ -205,11 +205,7 @@ void parseArguments(int argc, char *argv[])
{ {
if (!std::string("--list").compare(argv[i])) if (!std::string("--list").compare(argv[i]))
{ {
#if defined(CUDA) listDevices();
CUDAStream<double>::listDevices();
#elif defined(OCL)
OCLStream<double>::listDevices();
#endif
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
else if (!std::string("--device").compare(argv[i])) else if (!std::string("--device").compare(argv[i]))