Merge branch 'use-major-minor-for-cuda-version' into 'main'

Use *.* pattern when locating libcuda.so

See merge request nvidia/container-toolkit/container-toolkit!397

Author: Evan Lezar

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Generate CDI specification files with `644` permissions to allow rootless applications (e.g. podman).
 * Fix bug causing incorrect nvidia-smi symlink to be created on WSL2 systems with multiple driver roots.
+* Fix bug when using driver versions that do not include a patch component in their version number.
 
 * [toolkit-container] Allow same envars for all runtime configs
 

internal/discover/graphics.go

@@ -271,7 +271,7 @@ func newXorgDiscoverer(logger *logrus.Logger, driverRoot string, nvidiaCTKPath s
 	libCudaPaths, err := cuda.New(
 		cuda.WithLogger(logger),
 		cuda.WithDriverRoot(driverRoot),
-	).Locate(".*.*.*")
+	).Locate(".*.*")
 	if err != nil {
 		return nil, fmt.Errorf("failed to locate libcuda.so: %v", err)
 	}

pkg/nvcdi/management.go

@@ -88,7 +88,7 @@ func (m *managementlib) getCudaVersion() (string, error) {
 	libCudaPaths, err := cuda.New(
 		cuda.WithLogger(m.logger),
 		cuda.WithDriverRoot(m.driverRoot),
-	).Locate(".*.*.*")
+	).Locate(".*.*")
 	if err != nil {
 		return "", fmt.Errorf("failed to locate libcuda.so: %v", err)
 	}