Add enable-cuda-compat hook to CDI spec generation

elezar · elezar · commit e330a938fd68 · 2025-02-27T17:34:59.000+02:00
Signed-off-by: Evan Lezar &lt;elezar@nvidia.com&gt;
diff --git a/pkg/nvcdi/driver-nvml.go b/pkg/nvcdi/driver-nvml.go
@@ -97,6 +97,8 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv
 		libraryPaths,
 	)
 
+	// TODO: The following should use the version directly.
+	cudaCompatLibHookDiscoverer := discover.NewCUDACompatHookDiscoverer(logger, nvidiaCDIHookPath, driver)
 	updateLDCache, _ := discover.NewLDCacheUpdateHook(logger, libraries, nvidiaCDIHookPath, ldconfigPath)
 
 	d := discover.Merge(
@@ -105,6 +107,7 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv
 			version,
 			nvidiaCDIHookPath,
 		),
+		cudaCompatLibHookDiscoverer,
 		updateLDCache,
 	)
 

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,8 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv`
`97`	`97`	`libraryPaths,`
`98`	`98`	`)`
`99`	`99`
	`100`	`+ // TODO: The following should use the version directly.`
	`101`	`+ cudaCompatLibHookDiscoverer := discover.NewCUDACompatHookDiscoverer(logger, nvidiaCDIHookPath, driver)`
`100`	`102`	`updateLDCache, _ := discover.NewLDCacheUpdateHook(logger, libraries, nvidiaCDIHookPath, ldconfigPath)`
`101`	`103`
`102`	`104`	`d := discover.Merge(`
`@@ -105,6 +107,7 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv`
`105`	`107`	`version,`
`106`	`108`	`nvidiaCDIHookPath,`
`107`	`109`	`),`
	`110`	`+ cudaCompatLibHookDiscoverer,`
`108`	`111`	`updateLDCache,`
`109`	`112`	`)`
`110`	`113`