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

Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2

This commit is contained in:
Joachim Fritzsch 2013-04-18 15:46:44 +02:00
parent e0e6a56719 81d64892b6
commit 97860f15d0
3 changed files with 90 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/app_config.cpp
View File

@ -94,7 +94,8 @@ void APP_CONFIGS::config_app_versions(PROJECT* p) {
APP* app = gstate.lookup_app(p, ac.name);
if (!app) {
msg_printf(p, MSG_USER_ALERT,
"app %s not found in app_config.xml", ac.name
"Your app_config.xml file includes settings for application %s, which does not exist",
ac.name
);
continue;
}

28
client/gpu_opencl.cpp
View File

@ -91,14 +91,23 @@ cl_int (*__clGetDeviceInfo)(
#endif
static bool is_AMD(char *vendor) {
if ((strstr(vendor, GPU_TYPE_ATI)) ||
(strstr(vendor, "AMD")) ||
(strstr(vendor, "Advanced Micro Devices, Inc."))
) return true;
if (strstr(vendor, "ATI")) return true;
if (strstr(vendor, "AMD")) return true;
if (strstr(vendor, "Advanced Micro Devices, Inc.")) return true;
return false;
}
static bool is_NVIDIA(char* vendor) {
if (strstr(vendor, "NVIDIA")) return true;
return false;
}
static bool is_intel(char* vendor) {
if (strcasestr(vendor, "intel")) return true;
return false;
}
// If "loose", tolerate small diff
//
int opencl_compare(OPENCL_DEVICE_PROP& c1, OPENCL_DEVICE_PROP& c2, bool loose) {
@ -290,7 +299,7 @@ void COPROCS::get_opencl(
prop.get_device_version_int();
//////////// NVIDIA //////////////
if (strstr(prop.vendor, GPU_TYPE_NVIDIA)) {
if (is_NVIDIA(prop.vendor)) {
if (nvidia.have_cuda) {
// Mac OpenCL does not recognize all NVIDIA GPUs returned by
// CUDA but we assume that OpenCL and CUDA return devices in
@ -400,7 +409,8 @@ void COPROCS::get_opencl(
}
//////////// INTEL GPU //////////////
if (strcasestr(prop.vendor, "intel")) {
//
if (is_intel(prop.vendor)) {
cl_device_type device_type;
ciErrNum = (*__clGetDeviceInfo)(
@ -433,9 +443,11 @@ void COPROCS::get_opencl(
intel_gpu_opencls.push_back(prop);
// At present Intel GPUs only support OpenCL and do not have a native
// GPGPU framework, so treat each detected Intel OpenCL GPU device as
// At present Intel GPUs only support OpenCL
// and do not have a native GPGPU framework,
// so treat each detected Intel OpenCL GPU device as
// a native device.
//
intel_gpus.push_back(c);
}
}

36
doc/versions.inc
View File

@ -44,10 +44,10 @@ function linux_info() {
}
$w70dev = array(
"num"=>"7.0.62",
"num"=>"7.0.64",
"status"=>"Development version",
"file"=>"boinc_7.0.62_windows_intelx86.exe",
"date"=>"9 Apr 2013",
"file"=>"boinc_7.0.64_windows_intelx86.exe",
"date"=>"17 Apr 2013",
"type"=>"win_new",
);
@ -84,10 +84,10 @@ $w5816 = array(
);
$w70x64dev = array(
"num"=>"7.0.62",
"num"=>"7.0.64",
"status"=>"Development version",
"file"=>"boinc_7.0.62_windows_x86_64.exe",
"date"=>"9 Apr 2013",
"file"=>"boinc_7.0.64_windows_x86_64.exe",
"date"=>"17 Apr 2013",
"type"=>"win_new",
);
@ -108,10 +108,10 @@ $w612x64 = array(
);
$m70dev = array(
"num"=>"7.0.62",
"num"=>"7.0.65",
"status"=>"Development version (standard GUI)",
"file"=>"boinc_7.0.62_macOSX_i686.zip",
"date"=>"10 Apr 2013",
"file"=>"boinc_7.0.65_macOSX_i686.zip",
"date"=>"17 Apr 2013",
"type"=>"mac_advanced",
);
@ -148,10 +148,10 @@ $m66 = array(
);
$m70cdev = array(
"num"=>"7.0.62",
"num"=>"7.0.65",
"status"=>"Development version (Unix command-line version)",
"file"=>"boinc_7.0.62_i686-apple-darwin.zip",
"date"=>"10 Apr 2013",
"file"=>"boinc_7.0.65_i686-apple-darwin.zip",
"date"=>"17 Apr 2013",
"type"=>"bare_core",
);
@ -204,10 +204,10 @@ $l66 = array(
);
$l70ubuntudev = array(
"num"=>"7.0.62",
"num"=>"7.0.65",
"status"=>"Development version",
"file"=>"boinc_7.0.62_i686-pc-linux-gnu.sh",
"date"=>"9 Apr 2013",
"file"=>"boinc_7.0.65_i686-pc-linux-gnu.sh",
"date"=>"17 Apr 2013",
"type"=>"sea",
);
@ -228,10 +228,10 @@ $l612ubuntu = array(
);
$l70ubuntux64dev = array(
"num"=>"7.0.62",
"num"=>"7.0.65",
"status"=>"Development version",
"file"=>"boinc_7.0.62_x86_64-pc-linux-gnu.sh",
"date"=>"9 Apr 2013",
"file"=>"boinc_7.0.65_x86_64-pc-linux-gnu.sh",
"date"=>"17 Apr 2013",
"type"=>"sea",
);