forked from bartvdbraak/blender
cycles, cuDeviceComputeCapability is deprecated as of cuda 5.0
This commit is contained in:
parent
f0ac661aa8
commit
c02cce7b75
@ -214,7 +214,8 @@ public:
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
int major, minor;
|
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;
|
cuDevArchitecture = major*100 + minor*10;
|
||||||
|
|
||||||
cuda_pop_context();
|
cuda_pop_context();
|
||||||
@ -234,7 +235,8 @@ public:
|
|||||||
bool support_device(const DeviceRequestedFeatures& /*requested_features*/)
|
bool support_device(const DeviceRequestedFeatures& /*requested_features*/)
|
||||||
{
|
{
|
||||||
int major, minor;
|
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 */
|
/* We only support sm_20 and above */
|
||||||
if(major < 2) {
|
if(major < 2) {
|
||||||
@ -316,7 +318,8 @@ public:
|
|||||||
{
|
{
|
||||||
/* Compute cubin name. */
|
/* Compute cubin name. */
|
||||||
int major, minor;
|
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. */
|
/* Attempt to use kernel provided with Blender. */
|
||||||
if(!use_adaptive_compilation()) {
|
if(!use_adaptive_compilation()) {
|
||||||
@ -1395,8 +1398,8 @@ void device_cuda_info(vector<DeviceInfo>& devices)
|
|||||||
if(cuDeviceGetName(name, 256, num) != CUDA_SUCCESS)
|
if(cuDeviceGetName(name, 256, num) != CUDA_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
int major, minor;
|
int major;
|
||||||
cuDeviceComputeCapability(&major, &minor, num);
|
cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, num);
|
||||||
if(major < 2) {
|
if(major < 2) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user