Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- client/server/API: rename cudaDeviceProp to CUDA_DEVICE_PROP to 

avoid conflict with nvidia's structure.
    Note: these structures don't have to be the same,
    since we populate our struct one item at a time.


svn path=/trunk/boinc/; revision=21668
This commit is contained in:
David Anderson 2010-06-01 18:36:11 +00:00
parent a3b27efb6f
commit 75e86bff04
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -3929,3 +3929,13 @@ Rytis 1 Jun 2010
html/inc/ html/inc/
user.inc user.inc
David 1 Jun 2010
- client/server/API: rename cudaDeviceProp to CUDA_DEVICE_PROP to
avoid conflict with nvidia's structure.
Note: these structures don't have to be the same,
since we populate our struct one item at a time.
lib/
coproc.h

7
lib/coproc.h
View File

@ -162,9 +162,10 @@ struct COPROC {
void print_available_ram(); void print_available_ram();
}; };
// the following copied from /usr/local/cuda/include/driver_types.h // based on cudaDeviceProp from /usr/local/cuda/include/driver_types.h
// doesn't have to match exactly since we get the attributes one at a time.
// //
struct cudaDeviceProp { struct CUDA_DEVICE_PROP {
char name[256]; char name[256];
unsigned int totalGlobalMem; unsigned int totalGlobalMem;
// not used on the server; dtotalGlobalMem is used instead // not used on the server; dtotalGlobalMem is used instead
@ -189,7 +190,7 @@ struct cudaDeviceProp {
struct COPROC_CUDA : public COPROC { struct COPROC_CUDA : public COPROC {
int cuda_version; // CUDA runtime version int cuda_version; // CUDA runtime version
int display_driver_version; int display_driver_version;
cudaDeviceProp prop; CUDA_DEVICE_PROP prop;
#ifndef _USING_FCGI_ #ifndef _USING_FCGI_
virtual void write_xml(MIOFILE&); virtual void write_xml(MIOFILE&);