UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-03-09 22:00:31 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add enable-cuda-compat hook to CDI spec generation

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2025-02-06 23:17:21 +01:00
parent c9422f12b3
commit 70b1f5af98
No known key found for this signature in database
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/nvidia-ctk-installer/container/toolkit/toolkit_test.go
View File

@ -80,6 +80,12 @@ containerEdits:
- libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so - libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so
hookName: createContainer hookName: createContainer
path: {{ .toolkitRoot }}/nvidia-cdi-hook path: {{ .toolkitRoot }}/nvidia-cdi-hook
- args:
- nvidia-cdi-hook
- enable-cuda-compat
- --host-driver-version=999.88.77
hookName: createContainer
path: {{ .toolkitRoot }}/nvidia-cdi-hook
- args: - args:
- nvidia-cdi-hook - nvidia-cdi-hook
- update-ldcache - update-ldcache

6
cmd/nvidia-ctk/cdi/generate/generate_test.go
View File

@ -79,6 +79,12 @@ containerEdits:
- libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so - libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so
hookName: createContainer hookName: createContainer
path: /usr/bin/nvidia-cdi-hook path: /usr/bin/nvidia-cdi-hook
- args:
- nvidia-cdi-hook
- enable-cuda-compat
- --host-driver-version=999.88.77
hookName: createContainer
path: /usr/bin/nvidia-cdi-hook
- args: - args:
- nvidia-cdi-hook - nvidia-cdi-hook
- update-ldcache - update-ldcache

3
pkg/nvcdi/driver-nvml.go
View File

@ -97,6 +97,8 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv
libraryPaths, libraryPaths,
) )
// TODO: The following should use the version directly.
cudaCompatLibHookDiscoverer := discover.NewCUDACompatHookDiscoverer(logger, nvidiaCDIHookPath, driver)
updateLDCache, _ := discover.NewLDCacheUpdateHook(logger, libraries, nvidiaCDIHookPath, ldconfigPath) updateLDCache, _ := discover.NewLDCacheUpdateHook(logger, libraries, nvidiaCDIHookPath, ldconfigPath)
d := discover.Merge( d := discover.Merge(
@ -105,6 +107,7 @@ func NewDriverLibraryDiscoverer(logger logger.Interface, driver *root.Driver, nv
version, version,
nvidiaCDIHookPath, nvidiaCDIHookPath,
), ),
cudaCompatLibHookDiscoverer,
updateLDCache, updateLDCache,
) )