Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2025-12-23 19:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed NCNN RIFE 2.0 model dir workaround, no longer needed

Browse Source
This commit is contained in:
N00MKRAD
2021-05-17 17:21:55 +02:00
parent ed2a2257ca
commit ad3daccff1
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Code/OS/AiProcess.cs
View File

@@ -310,9 +310,6 @@ namespace Flowframes
string uhdStr = await InterpolateUtils.UseUhd() ? "-u" : "";
string ttaStr = Config.GetBool("rifeNcnnUseTta", false) ? "-x" : "";
string oldMdlName = mdl;
mdl = RifeNcnn2Workaround(mdl); // TODO: REMOVE ONCE NIHUI HAS GOTTEN RID OF THE SHITTY HARDCODED VERSION CHECK
rifeNcnn.StartInfo.Arguments = $"{OSUtils.GetCmdArg()} cd /D {Path.Combine(Paths.GetPkgPath(), Networks.rifeNcnn.pkgDir).Wrap()} & rife-ncnn-vulkan.exe " +
$" -v -i {inPath.Wrap()} -o {outPath.Wrap()} -m {mdl.ToLower()} {ttaStr} {uhdStr} -g {Config.Get("ncnnGpus")} -f {GetNcnnPattern()} -j {GetNcnnThreads()}";
@@ -333,7 +330,6 @@ namespace Flowframes
}
while (!rifeNcnn.HasExited) await Task.Delay(1);
RifeNcnn2Workaround(oldMdlName, true);
}
public static async Task RunDainNcnn(string framesPath, string outPath, float factor, string mdl, int tilesize)
@@ -522,27 +518,5 @@ namespace Flowframes
return $"4:{progThreadsStr}:4"; ;
}
static string RifeNcnn2Workaround (string modelName, bool reset = false)
{
if (!modelName.StartsWith("RIFE2")) return modelName;
string validMdlName = "rife-v2";
string rifeFolderPath = Path.Combine(Paths.GetPkgPath(), Networks.rifeNcnn.pkgDir);
string modelFolderPath = Path.Combine(rifeFolderPath, modelName);
string fixedModelFolderPath = Path.Combine(rifeFolderPath, validMdlName);
if (!reset)
{
IOUtils.TryDeleteIfExists(fixedModelFolderPath);
Directory.Move(modelFolderPath, fixedModelFolderPath);
}
else
{
IOUtils.TryDeleteIfExists(modelFolderPath);
Directory.Move(fixedModelFolderPath, modelFolderPath);
}
return validMdlName;
}
}
}