Merge branch 'master' of https://github.com/storytold/storyteller-ml

.gitmodules

@@ -6,4 +6,4 @@
 	url = https://github.com/SingleZombie/ebsynth
 [submodule "animation/Rerender_A_Video/deps/gmflow"]
 	path = animation/Rerender_A_Video/deps/gmflow
-	url = https://github.com/SingleZombie/ebsynth
+	url = https://github.com/haofeixu/gmflow.git

animation/Rerender_A_Video/.gitmodules

@@ -0,0 +1,9 @@
+[submodule "deps/gmflow"]
+	path = deps/gmflow
+	url = https://github.com/haofeixu/gmflow.git
+[submodule "deps/ControlNet"]
+	path = deps/ControlNet
+	url = https://github.com/lllyasviel/ControlNet.git
+[submodule "deps/ebsynth"]
+	path = deps/ebsynth
+	url = https://github.com/SingleZombie/ebsynth.git

animation/Rerender_A_Video/inference_playground.ipynb

@@ -1053,8 +1053,8 @@
     "    else:\n",
     "        noise_rescale = torch.ones_like(mask)\n",
     "    masks = []\n",
-    "    for i in range(ddim_steps):\n",
-    "        if i <= ddim_steps * mask_period[0] or i >= ddim_steps * mask_period[1]:\n",
+    "    for j in range(ddim_steps):\n",
+    "        if j <= ddim_steps * mask_period[0] or j >= ddim_steps * mask_period[1]:\n",
     "            masks += [None]\n",
     "        else:\n",
     "            masks += [mask * mask_strength]\n",

animation/Rerender_A_Video/rerender.py

@@ -331,9 +331,9 @@ def rerender(cfg: RerenderConfig, first_img_only: bool, key_video_path: str):
             else:
                 noise_rescale = torch.ones_like(mask)
             masks = []
-            for i in range(ddim_steps):
-                if i <= ddim_steps * mask_period[
-                        0] or i >= ddim_steps * mask_period[1]:
+            for j in range(ddim_steps):
+                if j <= ddim_steps * mask_period[
+                        0] or j >= ddim_steps * mask_period[1]:
                     masks += [None]
                 else:
                     masks += [mask * cfg.mask_strength]