Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Suppress deprecation warnings in gpu. #3153

Merged
merged 1 commit into from
Jun 13, 2019
Merged

Suppress deprecation warnings in gpu. #3153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions cuda/common/include/pcl/cuda/cutil_inline_drvapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ inline int cutilDrvGetMaxGflopsDeviceId()

// Find the best major SM Architecture GPU device
while ( current_device < device_count ) {
cutilDrvSafeCallNoSync( cuDeviceComputeCapability(&major, &minor, current_device ) );
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, current_device));
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, current_device));
if (major > 0 && major < 9999) {
best_SM_arch = MAX(best_SM_arch, major);
}
Expand All @@ -111,7 +112,8 @@ inline int cutilDrvGetMaxGflopsDeviceId()
cutilDrvSafeCallNoSync( cuDeviceGetAttribute( &clockRate,
CU_DEVICE_ATTRIBUTE_CLOCK_RATE,
current_device ) );
cutilDrvSafeCallNoSync( cuDeviceComputeCapability(&major, &minor, current_device ) );
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, current_device));
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, current_device));

if (major == 9999 && minor == 9999) {
sm_per_multiproc = 1;
Expand Down Expand Up @@ -154,7 +156,8 @@ inline int cutilDrvGetMaxGflopsGraphicsDeviceId()
// Find the best major SM Architecture GPU device that are graphics devices
while ( current_device < device_count ) {
cutilDrvSafeCallNoSync( cuDeviceGetName(deviceName, 256, current_device) );
cutilDrvSafeCallNoSync( cuDeviceComputeCapability(&major, &minor, current_device ) );
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, current_device));
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, current_device));
cutilDrvSafeCallNoSync( cuDeviceGetAttribute(&bTCC, CU_DEVICE_ATTRIBUTE_TCC_DRIVER, current_device) );

if (!bTCC) {
Expand All @@ -174,7 +177,8 @@ inline int cutilDrvGetMaxGflopsGraphicsDeviceId()
cutilDrvSafeCallNoSync( cuDeviceGetAttribute( &clockRate,
CU_DEVICE_ATTRIBUTE_CLOCK_RATE,
current_device ) );
cutilDrvSafeCallNoSync( cuDeviceComputeCapability(&major, &minor, current_device ) );
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, current_device));
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, current_device));

cutilDrvSafeCallNoSync( cuDeviceGetAttribute( &bTCC, CU_DEVICE_ATTRIBUTE_TCC_DRIVER, current_device ) );

Expand Down Expand Up @@ -346,7 +350,8 @@ inline bool cutilDrvCudaDevCapabilities(int major_version, int minor_version, in
#endif

cutilDrvSafeCallNoSync( cuDeviceGet(&dev, deviceNum) );
cutilDrvSafeCallNoSync( cuDeviceComputeCapability(&major, &minor, dev));
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, dev));
cutilDrvSafeCallNoSync (cuDeviceGetAttribute (&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, dev));
cutilDrvSafeCallNoSync( cuDeviceGetName(device_name, 256, dev) );

if((major > major_version) ||
Expand Down