UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-04-10 15:25:33 +00:00
Code Issues Actions3 Packages Projects Releases Wiki Activity

Merge pull request from elezar/fix-libnvidia-allocator-so-1

Browse Source 
Skip explicit creation of libnvidia-allocator.so.1 symlink
This commit is contained in:
Evan Lezar 2024-09-30 11:06:08 +02:00 committed by GitHub
commit 006aebf31e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions

8
internal/discover/graphics.go
View File

@ -180,10 +180,10 @@ func (d graphicsDriverLibraries) Hooks() ([]Hook, error) {
switch { switch {
case d.isDriverLibrary(filename, "libnvidia-allocator.so"): case d.isDriverLibrary(filename, "libnvidia-allocator.so"):
// gbm/nvidia-drm_gbm.so is a symlink to ../libnvidia-allocator.so.1 which // gbm/nvidia-drm_gbm.so is a symlink to ../libnvidia-allocator.so.1 which
// in turn symlinks to libnvidia-allocator.so.RM_VERSION and is created // in turn symlinks to libnvidia-allocator.so.RM_VERSION.
// when ldconfig is run in the container. // The libnvidia-allocator.so.1 -> libnvidia-allocator.so.RM_VERSION symlink
// create libnvidia-allocate.so.1 -> libnvidia-allocate.so.RM_VERSION symlink // is created when ldconfig is run against the container and there
links = append(links, fmt.Sprintf("%s::%s", filename, filepath.Join(dir, "libnvidia-allocator.so.1"))) // is no explicit need to create it.
// create gbm/nvidia-drm_gbm.so -> ../libnvidia-allocate.so.1 symlink // create gbm/nvidia-drm_gbm.so -> ../libnvidia-allocate.so.1 symlink
linkPath := filepath.Join(dir, "gbm", "nvidia-drm_gbm.so") linkPath := filepath.Join(dir, "gbm", "nvidia-drm_gbm.so")
links = append(links, fmt.Sprintf("%s::%s", "../libnvidia-allocator.so.1", linkPath)) links = append(links, fmt.Sprintf("%s::%s", "../libnvidia-allocator.so.1", linkPath))

2
internal/discover/graphics_test.go
View File

@ -68,7 +68,6 @@ func TestGraphicsLibrariesDiscoverer(t *testing.T) {
Lifecycle: "createContainer", Lifecycle: "createContainer",
Path: "/usr/bin/nvidia-cdi-hook", Path: "/usr/bin/nvidia-cdi-hook",
Args: []string{"nvidia-cdi-hook", "create-symlinks", Args: []string{"nvidia-cdi-hook", "create-symlinks",
"--link", "libnvidia-allocator.so.123.45.67::/usr/lib64/libnvidia-allocator.so.1",
"--link", "../libnvidia-allocator.so.1::/usr/lib64/gbm/nvidia-drm_gbm.so", "--link", "../libnvidia-allocator.so.1::/usr/lib64/gbm/nvidia-drm_gbm.so",
}, },
}, },
@ -126,7 +125,6 @@ func TestGraphicsLibrariesDiscoverer(t *testing.T) {
Lifecycle: "createContainer", Lifecycle: "createContainer",
Path: "/usr/bin/nvidia-cdi-hook", Path: "/usr/bin/nvidia-cdi-hook",
Args: []string{"nvidia-cdi-hook", "create-symlinks", Args: []string{"nvidia-cdi-hook", "create-symlinks",
"--link", "libnvidia-allocator.so.123.45.67::/usr/lib64/libnvidia-allocator.so.1",
"--link", "../libnvidia-allocator.so.1::/usr/lib64/gbm/nvidia-drm_gbm.so", "--link", "../libnvidia-allocator.so.1::/usr/lib64/gbm/nvidia-drm_gbm.so",
"--link", "libnvidia-vulkan-producer.so.123.45.67::/usr/lib64/libnvidia-vulkan-producer.so", "--link", "libnvidia-vulkan-producer.so.123.45.67::/usr/lib64/libnvidia-vulkan-producer.so",
}, },