Merge branch 'libnvdxgdmal' into 'main'

Evan Lezar · elezar · commit c1eae0dedab7 · 2024-01-11T15:27:01.000+01:00
Add libnvdxgdmal library

See merge request nvidia/container-toolkit/container-toolkit!529
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Fixed bug in `nvidia-ctk config` command when using `--set`. The types of applied config options are now applied correctly.
 * Log explicitly requested runtime mode.
 * Remove package dependency on libseccomp.
+* Added detection of libnvdxgdmal.so.1 on WSL2.
 
 ## v1.14.3
 * [toolkit-container] Bump CUDA base image version to 12.2.2.
diff --git a/pkg/nvcdi/driver-wsl.go b/pkg/nvcdi/driver-wsl.go
@@ -33,6 +33,7 @@ var requiredDriverStoreFiles = []string{
 	"libnvidia-ml.so.1",             /* Core library for nvml */
 	"libnvidia-ml_loader.so",        /* Core library for nvml on WSL */
 	"libdxcore.so",                  /* Core library for dxcore support */
+	"libnvdxgdmal.so.1",             /* dxgdmal library for cuda */
 	"nvcubins.bin",                  /* Binary containing GPU code for cuda */
 	"nvidia-smi",                    /* nvidia-smi binary*/
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ var requiredDriverStoreFiles = []string{`
`33`	`33`	`"libnvidia-ml.so.1", /* Core library for nvml */`
`34`	`34`	`"libnvidia-ml_loader.so", /* Core library for nvml on WSL */`
`35`	`35`	`"libdxcore.so", /* Core library for dxcore support */`
	`36`	`+ "libnvdxgdmal.so.1", /* dxgdmal library for cuda */`
`36`	`37`	`"nvcubins.bin", /* Binary containing GPU code for cuda */`
`37`	`38`	`"nvidia-smi", /* nvidia-smi binary*/`
`38`	`39`	`}`