hcpdiff 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

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/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/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.data → hcpdiff-0.3.7.data}/data/hcpdiff/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.dist-info → hcpdiff-0.3.7.dist-info}/METADATA

@@ -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.dist-info → hcpdiff-0.3.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hcpdiff/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hcpdiff/train_ac.py,sha256=5pH5YX17UET4r6cM_rgX9_T4pVJbABBnI-bTvrGv-Uo,27094
+hcpdiff/train_ac.py,sha256=1ZHWKryEy-1JPzmJsnoSzn47M9pKdbjDGxWMSNDLOYs,27108
 hcpdiff/train_ac_single.py,sha256=v35IWDwla9tunDksozwMBijas2aMZuhDofAKHX1RHzE,4785
 hcpdiff/train_colo.py,sha256=gApEmLYETlpMlngkBaKvb1GvwCH3EIqElZn1k8TSmCo,9319
 hcpdiff/visualizer.py,sha256=6R3C-MdDJlMK3UCnw7is2jGfF18ens9rwaYYURKD1Ec,7544
@@ -7,7 +7,7 @@ hcpdiff/ckpt_manager/__init__.py,sha256=AQOsLRmYOVXVw-yhzuYadiMKE3vUhvDr86srqOuh
 hcpdiff/ckpt_manager/ckpt_pkl.py,sha256=WX-79vYZCeNnFixs7B3BDeo9659jUwVC9CZ5kVCjEpE,4173
 hcpdiff/ckpt_manager/ckpt_safetensor.py,sha256=UHrekZO9UfK9pa7lOjimbGxCHN65YX1NfC4w8N56rrM,1835
 hcpdiff/data/__init__.py,sha256=0enIUGK7Oo4k1FuSaLizWvPk1uI3QbvcPZuQlM9ZpaE,795
-hcpdiff/data/bucket.py,sha256=-p9Yr9ANMVPsksVmKmu8UunHkO0Q9SonBolPKZnrnGA,8554
+hcpdiff/data/bucket.py,sha256=5Wd5TRCZAhV6vLf2IGyPiV1lvLNrTC1yQGjxXn8iadY,8566
 hcpdiff/data/cond_pair_dataset.py,sha256=v12acr_m2l0k42yaXs-utyuvi8sqRSIuEOBG7Uqsll0,2214
 hcpdiff/data/pair_dataset.py,sha256=32H-wUWufXL7qtN5G1dfc2wQEBSEv70erisQzsecH1I,6104
 hcpdiff/data/utils.py,sha256=HpqzeiDOHT1sUWP0_Sm90W5l-6Xv67MWDChR3LeHL7Q,2588
@@ -30,7 +30,7 @@ hcpdiff/models/text_emb_ex.py,sha256=JKd4Dta-CU0YATBVos6MWvLu-nUYGx_Qdjig-2alkvQ
 hcpdiff/models/textencoder_ex.py,sha256=zI_SXbvzZvsjxQb4m9vC_c82Y7JVjktn7MsBnfmYRqU,5674
 hcpdiff/models/tokenizer_ex.py,sha256=lb6_k0BZMskXHnYUXliqA47tjCVY44OvqATUrGn7DhM,2365
 hcpdiff/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hcpdiff/tools/convert_caption_txt2json.py,sha256=Yn5D6eINuEIfir3iOUrTa8aFPb-ErEesmlv9BSY4y_I,758
+hcpdiff/tools/convert_caption_txt2json.py,sha256=ToKhrfAcN4Vzxc2gTwQOr8RQwKkPBgvpRndUlHzJOOE,955
 hcpdiff/tools/create_embedding.py,sha256=tnPpeSY1vW1P-jsjH_XvnDK83_zGx5RLr34lD38WCz0,1870
 hcpdiff/tools/gen_from_ptlist.py,sha256=LyNyc7u1fWNX1f92AgVYH3w_ePhOXmAM9HEWWSB6_T4,1691
 hcpdiff/tools/init_proj.py,sha256=7W2bsD_Yt4q85s3-dG2hSatgqn5MQb0JpuUXwmNpSto,756
@@ -44,40 +44,40 @@ hcpdiff/utils/ema.py,sha256=-ZEp0wsaG9yiH-Xy6KE4jj2VKFkaH0Nbz_u9RuTPyfo,2993
 hcpdiff/utils/img_size_tool.py,sha256=Yh3_jZnGyXjb_5fKc-GkCVbotWarTrr5B90A0GETv5I,8433
 hcpdiff/utils/net_utils.py,sha256=7Zg47SJw6BCBpl2Nd8E5taxcvnur1NyWSZld8mziLEs,7029
 hcpdiff/utils/utils.py,sha256=zv54E2DtCctHAr1fdod--68fSiDl0FrfYyposkrOF6E,2756
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/te_struct.txt,sha256=yL4_mZ1MFVYsXgZc2amL3HcfHhVU97huy0Kufd4Nm3c,9778
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/unet_struct.txt,sha256=tsyLnBNkBvOCgz9BguOkaD_WDgzDUSAOTREUh3lF1Ns,45190
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/infer/change_vae.yaml,sha256=vMqGIwHTNlI-8_UZ4GskH7ILOMRSRrxwlCRfmkkVVrw,174
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/infer/euler_a.yaml,sha256=_NVVhFhPLXNm1ywxxq6HXURAuSnPjutO9rx7zPFfZl8,646
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/infer/img2img.yaml,sha256=UxOxUMShKYk6uR5w5aTRITINwkfleGrp-YQUJcmdD64,1608
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/infer/img2img_controlnet.yaml,sha256=ucOHq0TD6CXWmrBKm1fzixH8jum3a092Iqgu5X3PpUA,960
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/infer/text2img.yaml,sha256=FlsXEhjAYaByOOHNEp_SloVVkVv2Rq9ANoV6s2eWFmk,1216
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/infer/text2img_DA++.yaml,sha256=xHHkMRklE4uH15WUBAy-BgzCcZp6hOKApEofIrcME80,1542
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/infer/webui_model_infer.yaml,sha256=A9id_rgF2MO9Hu2yFYZeqaWK2PmVHN4QC67c1R6fDPk,1330
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/plugins/plugin_controlnet.yaml,sha256=paoKVoYqxmMc4P65qVWTIBnPAcKvaWtWQSD9b6WrnTg,426
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/train_base.yaml,sha256=xxGXHZ5LiOzMzk59N6zCRWbGfsPnkcQCvYNQtHLLM70,2899
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/tuning_base.yaml,sha256=3sDKNvwe1ztqpQnE5kTvVXDNARdzz9_v7dhhyRZU6-E,984
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/CustomDiffusion.yaml,sha256=0ILjxlNRCrsadKj8d8md4hlHBAfpj0EUp-kQ4d7yBUU,2412
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/DreamArtist++.yaml,sha256=fIiLT2bslMHNMm2YVi401-iuFVdvp7ORI9gDT1M-4FY,3667
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/DreamArtist.yaml,sha256=GEoSf2lsOdL2rkE5vpjysL6dc6FBcpTnGhB2dVJnTkU,1431
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/DreamBooth.yaml,sha256=88jbKuEYmvCaZxtBtVZk4C4YZawPlRg08xWJd3xcyB4,2219
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/Lion_optimizer.yaml,sha256=xe-ibIGRSvoikKTzboZItEej-UnB8LU0Gsv98JrUO20,364
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/TextualInversion.yaml,sha256=ZGf-8oz2-X0ELTihy9TF2qurn1mCB9auMOYt7hbP3Ak,1224
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/controlnet.yaml,sha256=XeDgjcjmor_gY4Qsy86et0tYm9VR8RVAJaoW-jF3UvQ,1141
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/fine-tuning.yaml,sha256=_FV-ixk5UacI-opd7PJNO1rZs8Be0ofBGy9QAl_E8vg,1263
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/locon.yaml,sha256=1v3RxbwuG5iZmljcSqycq8IYvuTVC7pNlzmGb1RO2A8,1471
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/lora_conventional.yaml,sha256=0i1cl31v0n91Jmcq8LYuIr5ugvZ7pxmZNw0w3udkPtY,1310
-hcpdiff-0.3.6.data/data/hcpdiff/cfgs/train/examples/min_snr.yaml,sha256=ZftPXDHzkHOQ_6NtvZ1dbSdHw0-RGyr4B7uE8TAcdOE,149
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/caption.txt,sha256=BFF5IJffv3lvSo6Axoc9tNLeby0T84zYSFN49wHqgWc,14
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/name.txt,sha256=M5ZazRDxHC0Tj4HDe8iZ2BDklywaiRRk1UG0G_Sf01g,14
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/name_2pt_caption.txt,sha256=3hP46lbjvV480jkaHyjJ6kOh-RBuBt-qJ56XkdfFUts,55
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/name_caption.txt,sha256=r0J196gVkTGguSrkClVdQVrOi0m7UYHmjE-JPNS1eWg,25
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/object.txt,sha256=AAQFaMPewZpoCbz_GLqqb3G3BR9pKAXCSj3PBec2iNU,889
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/object_caption.txt,sha256=KykccgokzxIxIvJqUcqKZLNlmuWFQ2m__7eeTGRAeCo,1186
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/style.txt,sha256=JiYeLSWrDlDZ1xCiyFaoQUNDYsVXJwUPNCcW4VDlj2w,872
-hcpdiff-0.3.6.data/data/hcpdiff/prompt_tuning_template/style_caption.txt,sha256=p3LUkXf_AxO9U5fsdNxDoSYjvTkF1LxPwUX3KRio8P0,1081
-hcpdiff-0.3.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-hcpdiff-0.3.6.dist-info/METADATA,sha256=es5NBInET7oTE_ll_K1CTDKmznVdFKwjSfb5jLhgZWM,6304
-hcpdiff-0.3.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-hcpdiff-0.3.6.dist-info/entry_points.txt,sha256=TZu3cbc9T3KmoNHx6JfTdHV_Ff89yn4XD7DoluIjZWk,57
-hcpdiff-0.3.6.dist-info/top_level.txt,sha256=shyf78x-HVgykYpsmY22mKG0xIc7Qk30fDMdavdYWQ8,8
-hcpdiff-0.3.6.dist-info/RECORD,,
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/te_struct.txt,sha256=yL4_mZ1MFVYsXgZc2amL3HcfHhVU97huy0Kufd4Nm3c,9778
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/unet_struct.txt,sha256=tsyLnBNkBvOCgz9BguOkaD_WDgzDUSAOTREUh3lF1Ns,45190
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/infer/change_vae.yaml,sha256=vMqGIwHTNlI-8_UZ4GskH7ILOMRSRrxwlCRfmkkVVrw,174
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/infer/euler_a.yaml,sha256=_NVVhFhPLXNm1ywxxq6HXURAuSnPjutO9rx7zPFfZl8,646
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/infer/img2img.yaml,sha256=UxOxUMShKYk6uR5w5aTRITINwkfleGrp-YQUJcmdD64,1608
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/infer/img2img_controlnet.yaml,sha256=ucOHq0TD6CXWmrBKm1fzixH8jum3a092Iqgu5X3PpUA,960
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/infer/text2img.yaml,sha256=FlsXEhjAYaByOOHNEp_SloVVkVv2Rq9ANoV6s2eWFmk,1216
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/infer/text2img_DA++.yaml,sha256=xHHkMRklE4uH15WUBAy-BgzCcZp6hOKApEofIrcME80,1542
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/infer/webui_model_infer.yaml,sha256=A9id_rgF2MO9Hu2yFYZeqaWK2PmVHN4QC67c1R6fDPk,1330
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/plugins/plugin_controlnet.yaml,sha256=paoKVoYqxmMc4P65qVWTIBnPAcKvaWtWQSD9b6WrnTg,426
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/train_base.yaml,sha256=xxGXHZ5LiOzMzk59N6zCRWbGfsPnkcQCvYNQtHLLM70,2899
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/tuning_base.yaml,sha256=3sDKNvwe1ztqpQnE5kTvVXDNARdzz9_v7dhhyRZU6-E,984
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/CustomDiffusion.yaml,sha256=0ILjxlNRCrsadKj8d8md4hlHBAfpj0EUp-kQ4d7yBUU,2412
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/DreamArtist++.yaml,sha256=fIiLT2bslMHNMm2YVi401-iuFVdvp7ORI9gDT1M-4FY,3667
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/DreamArtist.yaml,sha256=GEoSf2lsOdL2rkE5vpjysL6dc6FBcpTnGhB2dVJnTkU,1431
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/DreamBooth.yaml,sha256=88jbKuEYmvCaZxtBtVZk4C4YZawPlRg08xWJd3xcyB4,2219
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/Lion_optimizer.yaml,sha256=06wR6KFhhzYJ9Pn2LFI1s5iUIwaZX229E7OrzqT_CsA,361
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/TextualInversion.yaml,sha256=ZGf-8oz2-X0ELTihy9TF2qurn1mCB9auMOYt7hbP3Ak,1224
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/controlnet.yaml,sha256=XeDgjcjmor_gY4Qsy86et0tYm9VR8RVAJaoW-jF3UvQ,1141
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/fine-tuning.yaml,sha256=_FV-ixk5UacI-opd7PJNO1rZs8Be0ofBGy9QAl_E8vg,1263
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/locon.yaml,sha256=1v3RxbwuG5iZmljcSqycq8IYvuTVC7pNlzmGb1RO2A8,1471
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/lora_conventional.yaml,sha256=0i1cl31v0n91Jmcq8LYuIr5ugvZ7pxmZNw0w3udkPtY,1310
+hcpdiff-0.3.7.data/data/hcpdiff/cfgs/train/examples/min_snr.yaml,sha256=ZftPXDHzkHOQ_6NtvZ1dbSdHw0-RGyr4B7uE8TAcdOE,149
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/caption.txt,sha256=BFF5IJffv3lvSo6Axoc9tNLeby0T84zYSFN49wHqgWc,14
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/name.txt,sha256=M5ZazRDxHC0Tj4HDe8iZ2BDklywaiRRk1UG0G_Sf01g,14
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/name_2pt_caption.txt,sha256=3hP46lbjvV480jkaHyjJ6kOh-RBuBt-qJ56XkdfFUts,55
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/name_caption.txt,sha256=r0J196gVkTGguSrkClVdQVrOi0m7UYHmjE-JPNS1eWg,25
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/object.txt,sha256=AAQFaMPewZpoCbz_GLqqb3G3BR9pKAXCSj3PBec2iNU,889
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/object_caption.txt,sha256=KykccgokzxIxIvJqUcqKZLNlmuWFQ2m__7eeTGRAeCo,1186
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/style.txt,sha256=JiYeLSWrDlDZ1xCiyFaoQUNDYsVXJwUPNCcW4VDlj2w,872
+hcpdiff-0.3.7.data/data/hcpdiff/prompt_tuning_template/style_caption.txt,sha256=p3LUkXf_AxO9U5fsdNxDoSYjvTkF1LxPwUX3KRio8P0,1081
+hcpdiff-0.3.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+hcpdiff-0.3.7.dist-info/METADATA,sha256=MfXHvfiw7MJmu95uMfkfeONiBN1f--kVZhchBgFSZPU,6304
+hcpdiff-0.3.7.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+hcpdiff-0.3.7.dist-info/entry_points.txt,sha256=TZu3cbc9T3KmoNHx6JfTdHV_Ff89yn4XD7DoluIjZWk,57
+hcpdiff-0.3.7.dist-info/top_level.txt,sha256=shyf78x-HVgykYpsmY22mKG0xIc7Qk30fDMdavdYWQ8,8
+hcpdiff-0.3.7.dist-info/RECORD,,