diff options
| author | Martijn Berger <mberger@denc.com> | 2016-11-04 16:49:54 +0300 |
|---|---|---|
| committer | Martijn Berger <mberger@denc.com> | 2016-11-04 16:49:54 +0300 |
| commit | c02cce7b752f248b0f3fc4cd55082a9b6400effd (patch) | |
| tree | 10f92c416b8595ef3c3c3c345521ef4e55a36983 /intern/cycles/device | |
| parent | f0ac661aa8362f5c990b238a2366e2730cd4cb72 (diff) | |
cycles, cuDeviceComputeCapability is deprecated as of cuda 5.0
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 42e9cf75258..73c9221e6a2 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -214,7 +214,8 @@ public: return; int major, minor; - cuDeviceComputeCapability(&major, &minor, cuDevId); + cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, cuDevId); + cuDeviceGetAttribute(&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cuDevId); cuDevArchitecture = major*100 + minor*10; cuda_pop_context(); @@ -234,7 +235,8 @@ public: bool support_device(const DeviceRequestedFeatures& /*requested_features*/) { int major, minor; - cuDeviceComputeCapability(&major, &minor, cuDevId); + cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, cuDevId); + cuDeviceGetAttribute(&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cuDevId); /* We only support sm_20 and above */ if(major < 2) { @@ -316,7 +318,8 @@ public: { /* Compute cubin name. */ int major, minor; - cuDeviceComputeCapability(&major, &minor, cuDevId); + cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, cuDevId); + cuDeviceGetAttribute(&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cuDevId); /* Attempt to use kernel provided with Blender. */ if(!use_adaptive_compilation()) { @@ -1395,8 +1398,8 @@ void device_cuda_info(vector<DeviceInfo>& devices) if(cuDeviceGetName(name, 256, num) != CUDA_SUCCESS) continue; - int major, minor; - cuDeviceComputeCapability(&major, &minor, num); + int major; + cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, num); if(major < 2) { continue; } |