update ckpt to general_v0.1 (#696)

modelscope/models/cv/anydoor/ldm/models/diffusion/ddpm.py

@@ -7,6 +7,7 @@ https://github.com/CompVis/taming-transformers
 """
 
 import itertools
+import os
 from contextlib import contextmanager, nullcontext
 from functools import partial
 
@@ -741,7 +742,8 @@ class LatentDiffusion(DDPM):
             param.requires_grad = False
 
     def instantiate_cond_stage(self, config):
-        config.params.model_dir = self.model_dir
+        config.params.model_path = os.path.join(self.model_dir,
+                                                config.params.model_path)
         if not self.cond_stage_trainable:
             if config == '__is_first_stage__':
                 print('Using first stage also as cond stage.')

modelscope/models/cv/anydoor/ldm/modules/encoders/modules.py

@@ -331,9 +331,8 @@ class FrozenDinoV2Encoder(AbstractEncoder):
     Uses the DINOv2 encoder for image
     """
 
-    def __init__(self, model_dir, device='cuda', freeze=True):
-        DINOv2_weight_path = os.path.join(model_dir,
-                                          'dinov2_vitg14_pretrain.pth')
+    def __init__(self, model_path, device='cuda', freeze=True):
+        DINOv2_weight_path = model_path
 
         super().__init__()
         dinov2 = hubconf.dinov2_vitg14()

modelscope/pipelines/cv/anydoor_pipeline.py

@@ -52,7 +52,7 @@ class AnydoorPipeline(Pipeline):
         """
         super().__init__(model=model, **kwargs)
         model_ckpt = os.path.join(self.model.model_dir,
-                                  'epoch=1-step=8687.ckpt')
+                                  self.cfg.model.model_path)
         self.model.load_state_dict(
             self._get_state_dict(model_ckpt, location='cuda'))
         self.ddim_sampler = DDIMSampler(self.model)

tests/pipelines/test_anydoor.py

@@ -11,7 +11,7 @@ class AnydoorTest(unittest.TestCase):
 
     def setUp(self) -> None:
         self.task = Tasks.image_to_image_generation
-        self.model_id = 'damo/AnyDoor'
+        self.model_id = 'damo/AnyDoor_models'
 
     @unittest.skipUnless(test_level() >= 0, 'skip test in current test level')
     def test_run(self):