bug fix

app.py

@@ -69,7 +69,7 @@ def get_modelscope_pipeline(
     lora.merge_and_unload()
     pipe.unet = lora
 
-    # pipe = pipe.to(device)
+    pipe = pipe.to(device)
 
     return pipe
 
@@ -136,7 +136,7 @@ def get_animatediff_pipeline(
     lora.merge_and_unload()
     pipe.unet = lora
 
-    # pipe = pipe.to(device)
+    pipe = pipe.to(device)
     return pipe
 
 
@@ -146,42 +146,42 @@ pipe_dict = {
     "AnimateDiff (RealisticVision)": {"WebVid": None, "LAION-aes": None},
     "AnimateDiff (epiCRealism)": {"WebVid": None, "LAION-aes": None},
 }
-# cache_pipeline = {
-#     "base_model": None,
-#     "variant": None,
-#     "pipeline": None,
-# }
-
-def init_pipelines():
-    for base_model in variants.keys():
-        for variant in variants[base_model]:
-            if pipe_dict[base_model][variant] is None:
-                if base_model == "ModelScope T2V":
-                    pipe_dict[base_model][variant] = get_modelscope_pipeline(mcm_variant=variant)
-                elif base_model == "AnimateDiff (SD1.5)":
-                    pipe_dict[base_model][variant] = get_animatediff_pipeline(
-                        real_variant=None,
-                        motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
-                        mcm_variant=variant,
-                    )
-                elif base_model == "AnimateDiff (RealisticVision)":
-                    pipe_dict[base_model][variant] = get_animatediff_pipeline(
-                        real_variant="realvision",
-                        motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
-                        mcm_variant=variant,
-                    )
-                elif base_model == "AnimateDiff (epiCRealism)":
-                    pipe_dict[base_model][variant] = get_animatediff_pipeline(
-                        real_variant="epicrealism",
-                        motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
-                        mcm_variant=variant,
-                    )
-                else:
-                    raise ValueError(f"Unknown base_model {base_model}")
+cache_pipeline = {
+    "base_model": None,
+    "variant": None,
+    "pipeline": None,
+}
+
+# def init_pipelines():
+#     for base_model in variants.keys():
+#         for variant in variants[base_model]:
+#             if pipe_dict[base_model][variant] is None:
+#                 if base_model == "ModelScope T2V":
+#                     pipe_dict[base_model][variant] = get_modelscope_pipeline(mcm_variant=variant)
+#                 elif base_model == "AnimateDiff (SD1.5)":
+#                     pipe_dict[base_model][variant] = get_animatediff_pipeline(
+#                         real_variant=None,
+#                         motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
+#                         mcm_variant=variant,
+#                     )
+#                 elif base_model == "AnimateDiff (RealisticVision)":
+#                     pipe_dict[base_model][variant] = get_animatediff_pipeline(
+#                         real_variant="realvision",
+#                         motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
+#                         mcm_variant=variant,
+#                     )
+#                 elif base_model == "AnimateDiff (epiCRealism)":
+#                     pipe_dict[base_model][variant] = get_animatediff_pipeline(
+#                         real_variant="epicrealism",
+#                         motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
+#                         mcm_variant=variant,
+#                     )
+#                 else:
+#                     raise ValueError(f"Unknown base_model {base_model}")
 
 @spaces.GPU(duration=120)
 def infer(
-    base_model, variant, prompt, num_inference_steps=4, seed=0, randomize_seed=True, progress=gr.Progress(track_tqdm=True),
+    base_model, variant, prompt, num_inference_steps=4, seed=0, randomize_seed=True,
 ):
     # if pipe_dict[base_model][variant] is None:
     #     if base_model == "ModelScope T2V":
@@ -206,46 +206,47 @@ def infer(
     #         )
     #     else:
     #         raise ValueError(f"Unknown base_model {base_model}")
-    # if (
-    #     cache_pipeline["base_model"] == base_model
-    #     and cache_pipeline["variant"] == variant
-    # ):
-    #     pass
-    # else:
-    #     if base_model == "ModelScope T2V":
-    #         pipeline = get_modelscope_pipeline(mcm_variant=variant)
-    #     elif base_model == "AnimateDiff (SD1.5)":
-    #         pipeline = get_animatediff_pipeline(
-    #             real_variant=None,
-    #             motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
-    #             mcm_variant=variant,
-    #         )
-    #     elif base_model == "AnimateDiff (RealisticVision)":
-    #         pipeline = get_animatediff_pipeline(
-    #             real_variant="realvision",
-    #             motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
-    #             mcm_variant=variant,
-    #         )
-    #     elif base_model == "AnimateDiff (epiCRealism)":
-    #         pipeline = get_animatediff_pipeline(
-    #             real_variant="epicrealism",
-    #             motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
-    #             mcm_variant=variant,
-    #         )
-    #     else:
-    #         raise ValueError(f"Unknown base_model {base_model}")
+    if (
+        cache_pipeline["base_model"] == base_model
+        and cache_pipeline["variant"] == variant
+    ):
+        pass
+    else:
+        if base_model == "ModelScope T2V":
+            pipeline = get_modelscope_pipeline(mcm_variant=variant)
+        elif base_model == "AnimateDiff (SD1.5)":
+            pipeline = get_animatediff_pipeline(
+                real_variant=None,
+                motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
+                mcm_variant=variant,
+            )
+        elif base_model == "AnimateDiff (RealisticVision)":
+            pipeline = get_animatediff_pipeline(
+                real_variant="realvision",
+                motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
+                mcm_variant=variant,
+            )
+        elif base_model == "AnimateDiff (epiCRealism)":
+            pipeline = get_animatediff_pipeline(
+                real_variant="epicrealism",
+                motion_module_path="guoyww/animatediff-motion-adapter-v1-5-2",
+                mcm_variant=variant,
+            )
+        else:
+            raise ValueError(f"Unknown base_model {base_model}")
 
-    #     cache_pipeline["base_model"] = base_model
-    #     cache_pipeline["variant"] = variant
-    #     cache_pipeline["pipeline"] = pipeline
+        cache_pipeline["base_model"] = base_model
+        cache_pipeline["variant"] = variant
+        cache_pipeline["pipeline"] = pipeline
 
-    pipe_dict[base_model][variant] = pipe_dict[base_model][variant].to(device)
+    # pipe_dict[base_model][variant] = pipe_dict[base_model][variant].to(device)
     if randomize_seed:
         seed = random.randint(0, MAX_SEED)
 
     generator = torch.Generator("cpu").manual_seed(seed)
 
-    output = pipe_dict[base_model][variant](
+    progress=gr.Progress(track_tqdm=True)
+    output = cache_pipeline["pipeline"](
         prompt=prompt,
         num_frames=16,
         guidance_scale=1.0,
@@ -265,7 +266,7 @@ def infer(
         fps=7,
     )
     print(f"Saved to {save_path}")
-    pipe_dict[base_model][variant] = pipe_dict[base_model][variant].to("cpu")
+    # pipe_dict[base_model][variant] = pipe_dict[base_model][variant].to("cpu")
     return save_path, seed
 
 
@@ -276,7 +277,7 @@ examples = [
         "Aerial uhd 4k view. mid-air flight over fresh and clean mountain river at sunny summer morning. Green trees and sun rays on horizon. Direct on sun.",
         4
     ],
-    ["ModelScope T2V", "Anime", "Timelapse misty mountain landscape"],
+    ["ModelScope T2V", "Anime", "Timelapse misty mountain landscape", 4],
     [
         "ModelScope T2V",
         "WebVid",
@@ -338,7 +339,7 @@ variants = {
 def update_variant(rs):
     return gr.update(choices=variants[rs], value=None)
 
-init_pipelines()
+# init_pipelines()
 
 with gr.Blocks(css=css) as demo: