Re-added DAIN, integrated into model downloader

Code/Data/AI.cs

@@ -14,10 +14,9 @@ namespace Flowframes.Data
         public string friendlyName;
         public string description;
         public FlowPackage pkg;
-        public int minPkgVer;
         public bool supportsAnyExp;
 
-        public AI(string aiNameArg, string friendlyNameArg, string descArg, FlowPackage pkgArg, int minPkgVerForThisBuild, bool supportsAnyExpArg)
+        public AI(string aiNameArg, string friendlyNameArg, string descArg, FlowPackage pkgArg, bool supportsAnyExpArg)
         {
             aiName = aiNameArg;
             aiNameShort = aiNameArg.Split(' ')[0];
@@ -25,7 +24,6 @@ namespace Flowframes.Data
             friendlyName = friendlyNameArg;
             description = descArg;
             pkg = pkgArg;
-            minPkgVer = minPkgVerForThisBuild;
             supportsAnyExp = supportsAnyExpArg;
         }
     }

Code/Data/Networks.cs

@@ -6,8 +6,9 @@ namespace Flowframes.Data
 {
     class Networks
     {
-        public static AI rifeCuda = new AI("RIFE_CUDA", "RIFE", "CUDA/Pytorch Implementation of RIFE", Packages.rifeCuda, 2, true);
-        public static AI rifeNcnn = new AI("RIFE_NCNN", "RIFE (NCNN)", "Vulkan/NCNN Implementation of RIFE", Packages.rifeNcnn, 1, false);
+        public static AI rifeCuda = new AI("RIFE_CUDA", "RIFE", "CUDA/Pytorch Implementation of RIFE", Packages.rifeCuda, true);
+        public static AI rifeNcnn = new AI("RIFE_NCNN", "RIFE (NCNN)", "Vulkan/NCNN Implementation of RIFE", Packages.rifeNcnn, false);
+        public static AI dainNcnn = new AI("DAIN_NCNN", "DAIN (NCNN)", "Vulkan/NCNN Implementation of DAIN", Packages.dainNcnn, true);
 
         public static List<AI> networks = new List<AI>();
 
@@ -16,6 +17,7 @@ namespace Flowframes.Data
             networks.Clear();
             networks.Add(rifeCuda);
             networks.Add(rifeNcnn);
+            networks.Add(dainNcnn);
         }
     }
-}
+}

Code/Data/Packages.cs

@@ -1,18 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 
 namespace Flowframes.IO
 {
     class Packages
     {
         public static FlowPackage dainNcnn = new FlowPackage("DAIN-NCNN (AMD/Nvidia)", "dain-ncnn.7z", 40, "NCNN/Vulkan implementation of DAIN. Very slow and VRAM-hungry.");
-        public static FlowPackage cainNcnn = new FlowPackage("CAIN-NCNN (AMD/Nvidia)", "cain-ncnn.7z", 75, "NCNN/Vulkan implementation of CAIN. About 8x faster than DAIN and very lightweight on VRAM.");
+        //public static FlowPackage cainNcnn = new FlowPackage("CAIN-NCNN (AMD/Nvidia)", "cain-ncnn.7z", 75, "NCNN/Vulkan implementation of CAIN. About 8x faster than DAIN and very lightweight on VRAM.");
         public static FlowPackage rifeCuda = new FlowPackage("RIFE (Nvidia)", "rife-cuda.7z", 50, "Pytorch implementation of RIFE. Very fast (~2x CAIN, >16x DAIN) and not too VRAM-heavy.");
         public static FlowPackage rifeNcnn = new FlowPackage("RIFE-NCNN (AMD/Nvidia) [EXPERIMENTAL]", "rife-ncnn.7z", 25, "NCNN/Vulkan implementation of RIFE. Similar speed and VRAM usage as CAIN, but can have better quality.");
-        public static FlowPackage python = new FlowPackage("Python Runtime", "py.7z", 640, "Embedded Python runtime including Pytorch and all other dependencies. Install this if you don't have system Python.");
+        //public static FlowPackage python = new FlowPackage("Python Runtime", "py.7z", 640, "Embedded Python runtime including Pytorch and all other dependencies. Install this if you don't have system Python.");
         public static FlowPackage audioVideo = new FlowPackage("Audio/Video Tools (Required)", "av.7z", 10, "Utilities for extracting frames, analysing videos, encoding videos and GIFs.");
         public static FlowPackage licenses = new FlowPackage("Licenses (Required)", "licenses.7z", 1, "License files for redistributed software.");
     }

Code/IO/Config.cs

@@ -65,9 +65,7 @@ namespace Flowframes.IO
                 {
                     string[] keyValuePair = cachedLines[i].Split('|');
                     if (keyValuePair[0] == key && !string.IsNullOrWhiteSpace(keyValuePair[1]))
-                    {
                         return keyValuePair[1];
-                    }
                 }
                 return WriteDefaultValIfExists(key, type);
             }

Code/IO/ModelDownloader.cs

@@ -92,6 +92,7 @@ namespace Flowframes.IO
 
         public static async Task DownloadModelFiles (string ai, string model)
         {
+            model = model.ToUpper();
             Logger.Log($"DownloadModelFiles(string ai = {ai}, string model = {model})", true);
 
             try
@@ -162,9 +163,9 @@ namespace Flowframes.IO
 
             string md5FilePath = Path.Combine(mdlDir, "md5.txt");
 
-            if (!File.Exists(md5FilePath))
+            if (!File.Exists(md5FilePath) || IOUtils.GetFilesize(md5FilePath) < 32)
             {
-                Logger.Log($"Files for model {model} not valid: {mdlDir} does not exist.", true);
+                Logger.Log($"Files for model {model} not valid: {mdlDir} does not exist or is incomplete.", true);
                 return false;
             }
 

Code/Main/Interpolate.cs

@@ -162,6 +162,9 @@ namespace Flowframes
             if (ai.aiName == Networks.rifeNcnn.aiName)
                 tasks.Add(AiProcess.RunRifeNcnn(current.framesFolder, outpath, current.interpFactor, current.model));
 
+            if (ai.aiName == Networks.dainNcnn.aiName)
+                tasks.Add(AiProcess.RunDainNcnn(current.framesFolder, outpath, current.interpFactor, current.model, Config.GetInt("dainNcnnTilesize", 512)));
+
             if (currentlyUsingAutoEnc)
             {
                 Logger.Log($"{Logger.GetLastLine()} (Using Auto-Encode)", true);

Code/OS/AiProcess.cs

@@ -193,7 +193,7 @@ namespace Flowframes
             string ttaStr = Config.GetBool("rifeNcnnUseTta", false) ? "-x" : "";
 
             rifeNcnn.StartInfo.Arguments = $"{OSUtils.GetCmdArg()} cd /D {PkgUtils.GetPkgFolder(Packages.rifeNcnn).Wrap()} & rife-ncnn-vulkan.exe " +
-                $" -v -i {inPath.Wrap()} -o {outPath.Wrap()} -m {mdl.ToLower()} {ttaStr} {uhdStr} -g {Config.Get("ncnnGpus")} -f {InterpolateUtils.GetOutExt()} -j {GetNcnnThreads()}";
+                $" -v -i {inPath.Wrap()} -o {outPath.Wrap()} -m {mdl.ToLower()} {ttaStr} {uhdStr} -g {Config.Get("ncnnGpus")} -f {GetNcnnPattern()} -j {GetNcnnThreads()}";
             
             Logger.Log("cmd.exe " + rifeNcnn.StartInfo.Arguments, true);
            
@@ -214,6 +214,47 @@ namespace Flowframes
             while (!rifeNcnn.HasExited) await Task.Delay(1);
         }
 
+        public static async Task RunDainNcnn(string framesPath, string outPath, int factor, string mdl, int tilesize)
+        {
+            string dainDir = Path.Combine(Paths.GetPkgPath(), Path.GetFileNameWithoutExtension(Packages.dainNcnn.fileName));
+            Process dain = OSUtils.NewProcess(!OSUtils.ShowHiddenCmd());
+
+            AiStarted(dain, 1500);
+            SetProgressCheck(outPath, factor);
+
+            int targetFrames = (IOUtils.GetAmountOfFiles(lastInPath, false, "*.png") * factor) - (factor - 1);
+
+            string args = $" -v -i {framesPath.Wrap()} -o {outPath.Wrap()} -n {targetFrames} -m {mdl.ToLower()}" +
+                $" -t {GetNcnnTilesize(tilesize)} -g {Config.Get("ncnnGpus")} -f {GetNcnnPattern()} -j 2:1:2";
+
+            dain.StartInfo.Arguments = $"{OSUtils.GetCmdArg()} cd /D {dainDir.Wrap()} & dain-ncnn-vulkan.exe {args}";
+            Logger.Log("Running DAIN...", false);
+            Logger.Log("cmd.exe " + dain.StartInfo.Arguments, true);
+
+            if (!OSUtils.ShowHiddenCmd())
+            {
+                dain.OutputDataReceived += (sender, outLine) => { LogOutput("[O] " + outLine.Data, "dain-ncnn-log"); };
+                dain.ErrorDataReceived += (sender, outLine) => { LogOutput("[E] " + outLine.Data, "dain-ncnn-log"); };
+            }
+
+            dain.Start();
+            if (!OSUtils.ShowHiddenCmd())
+            {
+                dain.BeginOutputReadLine();
+                dain.BeginErrorReadLine();
+            }
+
+            while (!dain.HasExited)
+                await Task.Delay(1);
+
+            if (Interpolate.canceled) return;
+
+            //if (!Interpolate.currentlyUsingAutoEnc)
+            //    IOUtils.ZeroPadDir(outPath, InterpolateUtils.GetOutExt(), Padding.interpFrames);
+
+            AiFinished("DAIN");
+        }
+
         static void LogOutput (string line, string logFilename)
         {
             if (string.IsNullOrWhiteSpace(line) || line.Length < 6)
@@ -266,6 +307,11 @@ namespace Flowframes
                 Interpolate.Cancel();
         }
 
+        static string GetNcnnPattern ()
+        {
+            return $"%0{Padding.interpFrames}d.{InterpolateUtils.GetOutExt()}";
+        }
+
         static string GetNcnnTilesize(int tilesize)
         {
             int gpusAmount = Config.Get("ncnnGpus").Split(',').Length;

pkgs/dain-ncnn/models.txt

@@ -0,0 +1 @@
+best - Default Pretrained Model