Skip to content

Commit f21f7a6

Browse files
committed
Add compat-lib hook to CDI spec generation
Signed-off-by: Evan Lezar <[email protected]>
1 parent e3361c4 commit f21f7a6

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

cmd/nvidia-ctk/cdi/generate/generate_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ containerEdits:
7878
- libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so
7979
hookName: createContainer
8080
path: /usr/bin/nvidia-cdi-hook
81+
- args:
82+
- nvidia-cdi-hook
83+
- compat-libs
84+
- --driver-version
85+
- 999.88.77
86+
hookName: createContainer
87+
path: /usr/bin/nvidia-cdi-hook
8188
- args:
8289
- nvidia-cdi-hook
8390
- update-ldcache

pkg/nvcdi/driver-nvml.go

+3
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv
9797
libraryPaths,
9898
)
9999

100+
// TODO: The following should use the version directly.
101+
compatLibHookDiscoverer := discover.NewCUDACompatLibsDiscoverer(logger, nvidiaCDIHookPath, driver)
100102
updateLDCache, _ := discover.NewLDCacheUpdateHook(logger, libraries, nvidiaCDIHookPath, ldconfigPath)
101103

102104
d := discover.Merge(
@@ -105,6 +107,7 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv
105107
version,
106108
nvidiaCDIHookPath,
107109
),
110+
compatLibHookDiscoverer,
108111
updateLDCache,
109112
)
110113

0 commit comments

Comments
 (0)