Merge branch 'dev/mattd/update-simple-cc-check' into 'master'

rwarmstr · rwarmstr · commit fbc40da31108 · 2025-08-04T11:06:48.000-07:00
[nvvm] Test the compute capability minor number prior to using the result value.

See merge request cuda-samples/cuda-samples!128
diff --git a/Samples/7_libNVVM/simple/simple.c b/Samples/7_libNVVM/simple/simple.c
@@ -74,11 +74,11 @@ static CUdevice cudaDeviceInit(int *devMajor, int *devMinor)
 
     // Obtain the device's compute capability.
     checkCudaErrors(cuDeviceGetAttribute(devMajor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, cuDevice));
+    checkCudaErrors(cuDeviceGetAttribute(devMinor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cuDevice));
     if (*devMajor < 7 && *devMinor < 5) {
         fprintf(stderr, "Device 0 is not sm_75 or later\n");
         exit(EXIT_FAILURE);
     }
-    checkCudaErrors(cuDeviceGetAttribute(devMinor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cuDevice));
 
     return cuDevice;
 }

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ static CUdevice cudaDeviceInit(int devMajor, int devMinor)`
`74`	`74`
`75`	`75`	`// Obtain the device's compute capability.`
`76`	`76`	`checkCudaErrors(cuDeviceGetAttribute(devMajor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, cuDevice));`
	`77`	`+ checkCudaErrors(cuDeviceGetAttribute(devMinor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cuDevice));`
`77`	`78`	`if (devMajor < 7 && devMinor < 5) {`
`78`	`79`	`fprintf(stderr, "Device 0 is not sm_75 or later\n");`
`79`	`80`	`exit(EXIT_FAILURE);`
`80`	`81`	`}`
`81`		`- checkCudaErrors(cuDeviceGetAttribute(devMinor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cuDevice));`
`82`	`82`
`83`	`83`	`return cuDevice;`
`84`	`84`	`}`