Skip to content

Commit

Permalink
Various windows bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jaretburkett committed Aug 4, 2023
1 parent 66c6f0f commit b865ac8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion jobs/process/GenerateProcess.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, **kwargs):
raise ValueError("Prompts must be set")
if isinstance(self.prompts, str):
if os.path.exists(self.prompts):
with open(self.prompts, 'r') as f:
with open(self.prompts, 'r', encoding='utf-8') as f:
self.prompts = f.read().splitlines()
self.prompts = [p.strip() for p in self.prompts if len(p.strip()) > 0]
else:
Expand Down
2 changes: 1 addition & 1 deletion jobs/process/TrainSDRescaleProcess.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def hook_before_train_loop(self):
self.print(f"Loading prompt file from {self.rescale_config.prompt_file}")

# read line by line from file
with open(self.rescale_config.prompt_file, 'r') as f:
with open(self.rescale_config.prompt_file, 'r', encoding='utf-8') as f:
self.prompt_txt_list = f.readlines()
# clean empty lines
self.prompt_txt_list = [line.strip() for line in self.prompt_txt_list if len(line.strip()) > 0]
Expand Down
2 changes: 1 addition & 1 deletion jobs/process/TrainSliderProcess.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def hook_before_train_loop(self):

# read line by line from file
if self.slider_config.prompt_file:
with open(self.slider_config.prompt_file, 'r') as f:
with open(self.slider_config.prompt_file, 'r', encoding='utf-8') as f:
self.prompt_txt_list = f.readlines()
# clean empty lines
self.prompt_txt_list = [line.strip() for line in self.prompt_txt_list if len(line.strip()) > 0]
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ diffusers
transformers
lycoris_lora
flatten_json
accelerator
pyyaml
oyaml
tensorboard
Expand Down
4 changes: 2 additions & 2 deletions toolkit/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ def get_config(config_file_path, name=None):

# if we found it, check if it is a json or yaml file
if real_config_path.endswith('.json') or real_config_path.endswith('.jsonc'):
with open(real_config_path, 'r') as f:
with open(real_config_path, 'r', encoding='utf-8') as f:
config = json.load(f, object_pairs_hook=OrderedDict)
elif real_config_path.endswith('.yaml') or real_config_path.endswith('.yml'):
with open(real_config_path, 'r') as f:
with open(real_config_path, 'r', encoding='utf-8') as f:
config = yaml.load(f, Loader=fixed_loader)
else:
raise ValueError(f"Config file {config_file_path} must be a json or yaml file")
Expand Down

0 comments on commit b865ac8

Please sign in to comment.