VictorMylle/Kohya-ss-sd-scripts
1
0
Fork 1
mirror of https://github.com/kohya-ss/sd-scripts.git synced 2026-04-08 06:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Kohya S
2023-03-06 17:49:47 +09:00
parent 573aa8b5e7 0cacefc749
commit 5bb571ccc0
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/config_util.py
View File

@@ -167,7 +167,7 @@ class ConfigSanitizer:
"enable_bucket": bool,
"max_bucket_reso": int,
"min_bucket_reso": int,
"resolution": functools.partial(__validate_and_convert_scalar_or_twodim, int),
"resolution": functools.partial(__validate_and_convert_scalar_or_twodim.__func__, int),
}
# options handled by argparse but not handled by user config
@@ -283,7 +283,9 @@ class ConfigSanitizer:
def __merge_dict(*dict_list: dict) -> dict:
merged = {}
for schema in dict_list:
merged |= schema
# merged |= schema
for k, v in schema.items():
merged[k] = v
return merged

4
train_network.py
View File

@@ -408,7 +408,7 @@ def train(args):
"img_count": subset.img_count
}
metadata |= {
metadata.update({
"ss_batch_size_per_device": args.train_batch_size,
"ss_total_batch_size": total_batch_size,
"ss_resolution": args.resolution,
@@ -425,7 +425,7 @@ def train(args):
"ss_reg_dataset_dirs": json.dumps(reg_dataset_dirs_info),
"ss_tag_frequency": json.dumps(dataset.tag_frequency),
"ss_bucket_info": json.dumps(dataset.bucket_info),
}
})
if args.network_args:
for key, value in net_kwargs.items():