diff --git a/library/config_util.py b/library/config_util.py index afc9be75..e62bfb89 100644 --- a/library/config_util.py +++ b/library/config_util.py @@ -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 diff --git a/train_network.py b/train_network.py index ba2f4464..ef5a0831 100644 --- a/train_network.py +++ b/train_network.py @@ -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():