hcpdiff 0.3.6__tar.gz → 0.3.7__tar.gz

{hcpdiff-0.3.6/hcpdiff.egg-info → hcpdiff-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hcpdiff
-Version: 0.3.6
+Version: 0.3.7
 Summary: A universal Stable-Diffusion toolbox
 Home-page: https://github.com/7eu7d7/HCP-Diffusion
 Author: Ziyi Dong

{hcpdiff-0.3.6 → hcpdiff-0.3.7}/cfgs/train/examples/Lion_optimizer.yaml

@@ -12,4 +12,4 @@ train:
   optimizer_pt:
     _target_: lion_pytorch.Lion
     _partial_: True
-    weight_decay_pt: 1e-3
+    weight_decay: 1e-3

{hcpdiff-0.3.6 → hcpdiff-0.3.7}/hcpdiff/data/bucket.py

@@ -194,7 +194,7 @@ class RatioBucket(BaseBucket):
             rs.shuffle(x)
 
         # shuffle of batches
-        bucket_list = np.hstack(bucket_list).reshape(-1, self.bs)
+        bucket_list = np.hstack(bucket_list).reshape(-1, self.bs).astype(int)
         rs.shuffle(bucket_list)
 
         self.idx_arb = bucket_list.reshape(-1)

{hcpdiff-0.3.6 → hcpdiff-0.3.7}/hcpdiff/tools/convert_caption_txt2json.py

@@ -6,6 +6,7 @@ from hcpdiff.utils.img_size_tool import types_support
 
 parser = argparse.ArgumentParser(description='Stable Diffusion Training')
 parser.add_argument('--data_root', type=str, default='')
+parser.add_argument('--with_imgs', action="store_true")
 args = parser.parse_args()
 
 
@@ -16,10 +17,13 @@ def get_txt_caption(path):
 
 captions = {}
 for file in os.listdir(args.data_root):
-    ext_idx = file.rfind('.')
-    file_name = file[:ext_idx]
-    if file[ext_idx + 1:] in types_support:
-        captions[file] = get_txt_caption(os.path.join(args.data_root, f'{file_name}.txt'))
+    file_name, file_ext = file.rsplit('.', 1)
+    if args.with_imgs:
+        if file_ext in types_support:
+            captions[file] = get_txt_caption(os.path.join(args.data_root, f'{file_name}.txt'))
+    else:
+        if file_ext == 'txt':
+            captions[file] = get_txt_caption(os.path.join(args.data_root, f'{file_name}.txt'))
 
 with open(os.path.join(args.data_root, f'image_captions.json'), "w", encoding='utf8') as f:
     json.dump(captions, f, indent=2, ensure_ascii=False)

{hcpdiff-0.3.6 → hcpdiff-0.3.7}/hcpdiff/train_ac.py

@@ -338,7 +338,7 @@ class Trainer:
             if isinstance(cfg_opt, partial):
                 if 'type' in cfg_opt.keywords:
                     del cfg_opt.keywords['type']
-                self.optimizer = cfg_opt(parameters, lr=self.lr)
+                self.optimizer = cfg_opt(params=parameters, lr=self.lr)
             elif cfg_opt.type == 'adamw_8bit':
                 import bitsandbytes as bnb
                 self.optimizer = bnb.optim.AdamW8bit(params=parameters, lr=self.lr, weight_decay=cfg_opt.weight_decay)
@@ -362,7 +362,7 @@ class Trainer:
             if isinstance(cfg_opt_pt, partial):
                 if 'type' in cfg_opt_pt.keywords:
                     del cfg_opt_pt.keywords['type']
-                self.optimizer_pt = cfg_opt_pt(parameters_pt, lr=self.lr)
+                self.optimizer_pt = cfg_opt_pt(params=parameters_pt, lr=self.lr)
             else:
                 self.optimizer_pt = torch.optim.AdamW(params=parameters_pt, lr=self.lr, weight_decay=cfg_opt_pt.weight_decay)
 

{hcpdiff-0.3.6 → hcpdiff-0.3.7/hcpdiff.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hcpdiff
-Version: 0.3.6
+Version: 0.3.7
 Summary: A universal Stable-Diffusion toolbox
 Home-page: https://github.com/7eu7d7/HCP-Diffusion
 Author: Ziyi Dong

{hcpdiff-0.3.6 → hcpdiff-0.3.7}/setup.py

@@ -23,7 +23,7 @@ def get_data_files(data_dir, prefix=''):
 setuptools.setup(
     name="hcpdiff",
     py_modules=["hcpdiff"],
-    version="0.3.6",
+    version="0.3.7",
     author="Ziyi Dong",
     author_email="dzy7eu7d7@gmail.com",
     description="A universal Stable-Diffusion toolbox",