From 17a59a36a56167e9239ef42852805a46ed7e4807 Mon Sep 17 00:00:00 2001
From: N00MKRAD <me@nmkd.de>
Date: Mon, 4 Jan 2021 15:03:35 +0100
Subject: [PATCH] Updated build tools

---
 .gitignore                    |  1 +
 Build/Build-Distributable.bat | 24 ++++++++++++++++++------
 Build/HowToInstall.txt        | 10 +++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0ef2c96..52eae43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ bld/
 [Ll]og/
 [Ll]ogs/
 Flowframes*.7z
+FF*.7z
 
 # NMKD Python Redist Pkg
 [Pp]y*/
diff --git a/Build/Build-Distributable.bat b/Build/Build-Distributable.bat
index bca49b4..868e870 100644
--- a/Build/Build-Distributable.bat
+++ b/Build/Build-Distributable.bat
@@ -4,7 +4,7 @@ echo ===============================
 echo == NMKD'S FLOWFRAMES BUILDER ==
 echo ===============================
 echo.
-echo This script makes a build ready for distribution by creating two 7z archives, one with and one without embedded python.
+echo This script makes a build ready for distribution by creating three 7z archives, without python, with pytorch for Turing, and with pytorch for Ampere.
 echo.
 
 set "ver=16"
@@ -17,7 +17,12 @@ mkdir "FlowframesApp%ver%"
 mkdir "FlowframesApp%ver%/FlowframesData"
 mkdir "FlowframesApp%ver%/FlowframesData/pkgs"
 
-xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E
+rem xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E
+xcopy "../../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I
+xcopy "../../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I
+xcopy "../../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I
+xcopy "../../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I
+xcopy "../../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I
 
 echo %ver% >> "FlowframesApp%ver%/FlowframesData/ver.ini"
 
@@ -26,11 +31,18 @@ xcopy Flowframes.exe "FlowframesApp%ver%"
 cd ../../../../Build
 
 rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\logs
-7za.exe a FlowframesApp%ver%-Full.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%"
-rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py
+del ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\config.ini
+
+
+7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%"
+
+xcopy "../pkgs/py-tu" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu" /E /I
+7za.exe a FF-%ver%-Full.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%"
+
 rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu
-rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp
-7za.exe a FlowframesApp%ver%-NoPython.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%"
+xcopy "../pkgs/py-amp" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp" /E /I
+7za.exe a FF-%ver%-Full-RTX3000.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%"
+
 
 rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%
 
diff --git a/Build/HowToInstall.txt b/Build/HowToInstall.txt
index 41bf7e0..4e57d9a 100644
--- a/Build/HowToInstall.txt
+++ b/Build/HowToInstall.txt
@@ -1,7 +1,15 @@
-1) Download the 7z file with "-Full" if you want all dependencies (Python/Pytorch, etc) included, or the file with "-NoPython" if you already have a system pytorch installation, or if you have an AMD GPU that can't use pytorch anyway
+1) Download...
+   - FF-Slim if you have an AMD/Intel GPU, or if you have an Nvidia GPU and Pytorch already installed
+   - FF-Full if you have an Nvidia Turing (RTX 2000) or older GPU
+   - FF-Full-RTX3000 if you have an Nvidia Ampere (RTX 3000) GPU. Also compatible with older GPUs, but has bigger filesize.
+
 2) Extract the 7z file using 7zip or any other program that supports it
+
 3) Run Flowframes.exe
 
+
+
+
 If you updated from an older version, you can optionally copy "FlowframesData/config.ini" to your new installation if you want to keep your settings.
 You can delete your old installation after updating.