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
This commit is contained in:
Evan Lezar 2023-05-22 13:02:33 +00:00
commit 3ea02d13fc
2 changed files with 2 additions and 2 deletions

View File

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

View File

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