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

Restore changes lost due to GIT confusion

This commit is contained in:
Charlie Fenton 2012-12-10 04:59:06 -08:00 committed by Oliver Bock
parent 462be89f01
commit bc69fe301d
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cc_config.h
View File

@ -155,9 +155,7 @@ struct CONFIG {
bool http_1_0;
int http_transfer_timeout_bps;
int http_transfer_timeout;
std::vector<int> ignore_ati_dev;
std::vector<int> ignore_nvidia_dev;
std::vector<int> ignore_intel_dev;
std::vector<int> ignore_gpu_instance[NPROC_TYPES];
int max_file_xfers;
int max_file_xfers_per_project;
int max_stderr_file_size;

10
lib/coproc.h
View File

@ -398,6 +398,8 @@ struct COPROC_INTEL : public COPROC {
void fake(double ram, double avail_ram, int);
};
typedef std::vector<int> IGNORE_GPU_INSTANCE[NPROC_TYPES];
struct COPROCS {
int n_rsc;
COPROC coprocs[MAX_RSC];
@ -410,16 +412,12 @@ struct COPROCS {
bool use_all,
std::vector<std::string> &descs,
std::vector<std::string> &warnings,
std::vector<int>& ignore_nvidia_dev,
std::vector<int>& ignore_ati_dev,
std::vector<int>& ignore_intel_gpu_dev
IGNORE_GPU_INSTANCE &ignore_gpu_instance
);
void get_opencl(
bool use_all,
std::vector<std::string> &warnings,
std::vector<int>& ignore_nvidia_dev,
std::vector<int>& ignore_ati_dev,
std::vector<int>& ignore_intel_gpu_dev
IGNORE_GPU_INSTANCE &ignore_gpu_instance
);
cl_int get_opencl_info(
OPENCL_DEVICE_PROP& prop,