keep sharedObjectRegex around

johnstcn · johnstcn · commit c3ad5b4219b8 · 2025-03-06T23:45:41.000Z
diff --git a/xunix/gpu.go b/xunix/gpu.go
@@ -18,9 +18,10 @@ import (
 )
 
 var (
-	gpuMountRegex = regexp.MustCompile(`(?i)(nvidia|vulkan|cuda)`)
-	gpuExtraRegex = regexp.MustCompile(`(?i)(libgl(e|sx|\.)|nvidia|vulkan|cuda)`)
-	gpuEnvRegex   = regexp.MustCompile(`(?i)nvidia`)
+	gpuMountRegex     = regexp.MustCompile(`(?i)(nvidia|vulkan|cuda)`)
+	gpuExtraRegex     = regexp.MustCompile(`(?i)(libgl(e|sx|\.)|nvidia|vulkan|cuda)`)
+	gpuEnvRegex       = regexp.MustCompile(`(?i)nvidia`)
+	sharedObjectRegex = regexp.MustCompile(`\.so(\.[0-9\.]+)?$`)
 )
 
 func GPUEnvs(ctx context.Context) []string {
@@ -125,6 +126,10 @@ func usrLibGPUs(ctx context.Context, log slog.Logger, usrLibDir string) ([]mount
 				return nil
 			}
 
+			if !sharedObjectRegex.MatchString(path) {
+				return nil
+			}
+
 			paths, err := recursiveSymlinks(afs, usrLibDir, path)
 			if err != nil {
 				log.Error(ctx, "find recursive symlinks", slog.F("path", path), slog.Error(err))
diff --git a/xunix/gpu_test.go b/xunix/gpu_test.go
@@ -111,7 +111,7 @@ func TestGPUs(t *testing.T) {
 		devices, binds, err := xunix.GPUs(ctx, log, usrLibMountpoint)
 		require.NoError(t, err)
 		require.Len(t, devices, 2, "unexpected 2 nvidia devices")
-		require.Len(t, binds, 5, "expected 5 nvidia binds")
+		require.Len(t, binds, 4, "expected 4 nvidia binds")
 		require.Contains(t, binds, mount.MountPoint{
 			Device: "/dev/sda1",
 			Path:   "/usr/local/nvidia",
