diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-19 14:58:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-19 14:58:01 +0300 |
| commit | 0f8a57de68f706f73c25c8c456113f25ed634662 (patch) | |
| tree | 834d9b1e1049d3118c57dfe3eb88fd369b814d0f /intern/cycles/device/device_cuda.cpp | |
| parent | 335e454db65571e16756d7b287e81bc4dea6b7e6 (diff) | |
| parent | 1cddab18ded9489f2f29b0655698f2e2e4e2076a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 066be82d55b..44f9077188b 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -2136,12 +2136,17 @@ void device_cuda_info(vector<DeviceInfo>& devices) for(int num = 0; num < count; num++) { char name[256]; - if(cuDeviceGetName(name, 256, num) != CUDA_SUCCESS) + result = cuDeviceGetName(name, 256, num); + if(result != CUDA_SUCCESS) { + fprintf(stderr, "CUDA cuDeviceGetName: %s\n", cuewErrorString(result)); continue; + } int major; cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, num); if(major < 2) { + VLOG(1) << "Ignoring device \"" << name + << "\", compute capability is too low."; continue; } @@ -2174,6 +2179,7 @@ void device_cuda_info(vector<DeviceInfo>& devices) cuDeviceGetAttribute(&preempt_attr, CU_DEVICE_ATTRIBUTE_COMPUTE_PREEMPTION_SUPPORTED, num); if(timeout_attr && !preempt_attr) { + VLOG(1) << "Device is recognized as display."; info.description += " (Display)"; info.display_device = true; display_devices.push_back(info); @@ -2181,6 +2187,7 @@ void device_cuda_info(vector<DeviceInfo>& devices) else { devices.push_back(info); } + VLOG(1) << "Added device \"" << name << "\" with id \"" << info.id << "\"."; } if(!display_devices.empty()) |