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

change dataset config option to dataset_config

Browse Source
This commit is contained in:
Kohya S
2023-03-02 21:51:58 +09:00
parent 2d2407410e
commit 5602e0e5fc
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config_README-ja.md
View File

@@ -1,6 +1,6 @@
For non-Japanese speakers: this README is provided only in Japanese in the current state. Sorry for inconvenience. We will provide English version in the near future.
`--config_file` で渡すことができる設定ファイルに関する説明です。
`--dataset_config` で渡すことができる設定ファイルに関する説明です。
## 概要

6
fine_tune.py
View File

@@ -35,9 +35,9 @@ def train(args):
tokenizer = train_util.load_tokenizer(args)
blueprint_generator = BlueprintGenerator(ConfigSanitizer(False, True, True))
if args.config_file is not None:
print(f"Load config file from {args.config_file}")
user_config = config_util.load_user_config(args.config_file)
if args.dataset_config is not None:
print(f"Load dataset config from {args.dataset_config}")
user_config = config_util.load_user_config(args.dataset_config)
ignored = ["train_data_dir", "in_json"]
if any(getattr(args, attr) is not None for attr in ignored):
print("ignore following options because config file is found: {0} / 設定ファイルが利用されるため以下のオプションは無視されます: {0}".format(', '.join(ignored)))

6
library/config_util.py
View File

@@ -38,7 +38,7 @@ from .train_util import (
def add_config_arguments(parser: argparse.ArgumentParser):
parser.add_argument("--config_file", type=Path, default=None, help="config file for detail settings / 詳細な設定用の設定ファイル")
parser.add_argument("--dataset_config", type=Path, default=None, help="config file for detail settings / 詳細な設定用の設定ファイル")
# TODO: inherit Params class in Subset, Dataset
@@ -495,7 +495,7 @@ if __name__ == "__main__":
parser.add_argument("--support_dreambooth", action="store_true")
parser.add_argument("--support_finetuning", action="store_true")
parser.add_argument("--support_dropout", action="store_true")
parser.add_argument("config_file")
parser.add_argument("dataset_config")
config_args, remain = parser.parse_known_args()
parser = argparse.ArgumentParser()
@@ -507,7 +507,7 @@ if __name__ == "__main__":
print("[argparse_namespace]")
print(vars(argparse_namespace))
user_config = load_user_config(config_args.config_file)
user_config = load_user_config(config_args.dataset_config)
print("\n[user_config]")
print(user_config)

6
train_db.py
View File

@@ -38,9 +38,9 @@ def train(args):
tokenizer = train_util.load_tokenizer(args)
blueprint_generator = BlueprintGenerator(ConfigSanitizer(True, False, True))
if args.config_file is not None:
print(f"Load config file from {args.config_file}")
user_config = config_util.load_user_config(args.config_file)
if args.dataset_config is not None:
print(f"Load dataset config from {args.dataset_config}")
user_config = config_util.load_user_config(args.dataset_config)
ignored = ["train_data_dir", "reg_data_dir"]
if any(getattr(args, attr) is not None for attr in ignored):
print("ignore following options because config file is found: {0} / 設定ファイルが利用されるため以下のオプションは無視されます: {0}".format(', '.join(ignored)))

6
train_network.py
View File

@@ -54,7 +54,7 @@ def train(args):
cache_latents = args.cache_latents
use_dreambooth_method = args.in_json is None
use_user_config = args.config_file is not None
use_user_config = args.dataset_config is not None
if args.seed is not None:
set_seed(args.seed)
@@ -64,8 +64,8 @@ def train(args):
# データセットを準備する
blueprint_generator = BlueprintGenerator(ConfigSanitizer(True, True, True))
if use_user_config:
print(f"Load config file from {args.config_file}")
user_config = config_util.load_user_config(args.config_file)
print(f"Load dataset config from {args.dataset_config}")
user_config = config_util.load_user_config(args.dataset_config)
ignored = ["train_data_dir", "reg_data_dir", "in_json"]
if any(getattr(args, attr) is not None for attr in ignored):
print(

6
train_textual_inversion.py
View File

@@ -143,9 +143,9 @@ def train(args):
# データセットを準備する
blueprint_generator = BlueprintGenerator(ConfigSanitizer(True, True, False))
if args.config_file is not None:
print(f"Load config file from {args.config_file}")
user_config = config_util.load_user_config(args.config_file)
if args.dataset_config is not None:
print(f"Load dataset config from {args.dataset_config}")
user_config = config_util.load_user_config(args.dataset_config)
ignored = ["train_data_dir", "reg_data_dir", "in_json"]
if any(getattr(args, attr) is not None for attr in ignored):
print("ignore following options because config file is found: {0} / 設定ファイルが利用されるため以下のオプションは無視されます: {0}".format(', '.join(ignored)))