Skip to content

Improve robustness of GPU detection #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
temotskipa merged 4 commits into from
Sep 17, 2025
Merged

Improve robustness of GPU detection #13

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b573bb
feat: Improve robustness of GPU detection
google-labs-jules[bot] Sep 17, 2025
aa128cd
feat: Broaden search path for CUDA Toolkit on Windows
google-labs-jules[bot] Sep 17, 2025
da2507c
feat: Add search path for standalone nvCOMP installation
google-labs-jules[bot] Sep 17, 2025
44323dc
feat: Update nvCOMP search path and DLL name pattern
google-labs-jules[bot] Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 69 additions & 11 deletions GDeflateConsole/NativeLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,29 @@ static NativeLibrary()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
string programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
string nvidiaGpuComputingToolkit = Path.Combine(programFiles, "NVIDIA GPU Computing Toolkit", "CUDA");
if (Directory.Exists(nvidiaGpuComputingToolkit))
string[] programFilesPaths = {
Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)
};

foreach (var programFilesPath in programFilesPaths.Distinct())
{
var versions = Directory.GetDirectories(nvidiaGpuComputingToolkit, "v*.*")
.Select(path => new { Path = path, Version = GetVersionFromPath(path) })
.OrderByDescending(x => x.Version)
.ToList();
if (string.IsNullOrEmpty(programFilesPath)) continue;

string nvidiaGpuComputingToolkit = Path.Combine(programFilesPath, "NVIDIA GPU Computing Toolkit", "CUDA");
if (Directory.Exists(nvidiaGpuComputingToolkit))
{
var versions = Directory.GetDirectories(nvidiaGpuComputingToolkit, "v*.*")
.Select(path => new { Path = path, Version = GetVersionFromPath(path) })
.OrderByDescending(x => x.Version)
.ToList();

return versions.FirstOrDefault()?.Path;
var latestVersion = versions.FirstOrDefault();
if (latestVersion != null)
{
return latestVersion.Path;
}
}
}
}
else
Expand Down Expand Up @@ -72,6 +85,17 @@ static NativeLibrary()

private static string? FindCudart()
{
// Search in common paths first
string[] searchPaths = { Directory.GetCurrentDirectory(), AppContext.BaseDirectory };
foreach (var path in searchPaths)
{
var dlls = Directory.GetFiles(path, "cudart64_*.dll", SearchOption.AllDirectories)
.Select(p => new { Path = p, Version = GetVersionFromFileName(p) })
.OrderByDescending(x => x.Version)
.ToList();
if (dlls.Any()) return dlls.First().Path;
}

if (_cudaToolkitPath == null) return null;

string binPath = Path.Combine(_cudaToolkitPath, "bin");
Expand Down Expand Up @@ -101,15 +125,49 @@ static NativeLibrary()

private static string? FindNvcomp()
{
// Search in common paths first
string[] searchPaths = { Directory.GetCurrentDirectory(), AppContext.BaseDirectory };
foreach (var path in searchPaths)
{
var nvcompPaths = Directory.GetFiles(path, "nvcomp*.dll", SearchOption.AllDirectories);
if (nvcompPaths.Any()) return nvcompPaths.First();
}

// Search in standard nvCOMP installation path on Windows
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
string[] programFilesPaths = {
Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)
};

foreach (var programFilesPath in programFilesPaths.Distinct())
{
if (string.IsNullOrEmpty(programFilesPath)) continue;

string nvcompInstallPath = Path.Combine(programFilesPath, "NVIDIA nvCOMP");
if (Directory.Exists(nvcompInstallPath))
{
var nvcompDllPaths = Directory.GetFiles(nvcompInstallPath, "nvcomp*.dll", SearchOption.AllDirectories);
if (nvcompDllPaths.Any())
{
return nvcompDllPaths.First();
}
}
}
}

if (_cudaToolkitPath == null) return null;

string binPath = Path.Combine(_cudaToolkitPath, "bin");
if (Directory.Exists(binPath))
{
string nvcompPath = Path.Combine(binPath, "nvcomp.dll");
if (File.Exists(nvcompPath))
// Search recursively for nvcomp.dll
var nvcompPaths = Directory.GetFiles(binPath, "nvcomp*.dll", SearchOption.AllDirectories);
if (nvcompPaths.Length > 0)
{
return nvcompPath;
// Return the first match
return nvcompPaths[0];
}
}
return null;
Expand Down
Loading