Auto-set NCNN GPU threads default value based on hardware

n00mkrad · Nov 14, 2024 · 8a578da · 8a578da
1 parent 7e043f5
commit 8a578da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CodeLegacy/Forms/SettingsForm.Designer.cs b/CodeLegacy/Forms/SettingsForm.Designer.cs
diff --git a/CodeLegacy/IO/Config.cs b/CodeLegacy/IO/Config.cs
@@ -282,7 +282,7 @@ private static string WriteDefaultValIfExists(string keyStr, Type type)
             if (key == Key.uhdThresh)         return WriteDefault(key, "1600");
             if (key == Key.torchGpus)         return WriteDefault(key, "0");
             if (key == Key.ncnnGpus)          return WriteDefault(key, "0");
-            if (key == Key.ncnnThreads)       return WriteDefault(key, "4");
+            if (key == Key.ncnnThreads)       return WriteDefault(key, "0");
             if (key == Key.dainNcnnTilesize)  return WriteDefault(key, "768");
             // Debug / Other / Experimental
             if (key == Key.ffEncPreset)   return WriteDefault(key, "fast");

diff --git a/CodeLegacy/Utilities/NcnnUtils.cs b/CodeLegacy/Utilities/NcnnUtils.cs
@@ -17,6 +17,11 @@ public static int GetRifeNcnnGpuThreads(Size res, int gpuId, AiInfo ai)
             int threads = Config.GetInt(Config.Key.ncnnThreads);
             int maxThreads = VulkanUtils.GetMaxNcnnThreads(gpuId).Clamp(1, 64);
 
+            if(threads == 0)
+            {
+                threads = (maxThreads / 2f).RoundToInt().Clamp(1, maxThreads); // Default to half of max threads
+            }
+
             threads = threads.Clamp(1, maxThreads); // To avoid exceeding the max queue count
             Logger.Log($"Using {threads}/{maxThreads} GPU compute threads.", true, false, ai.LogFilename);