Skip to content

Commit af040e9

Browse files
committed
prevent two models from being marked default in models.yaml
1 parent 8dc7f11 commit af040e9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

ldm/invoke/model_cache.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,13 @@ def set_default_model(self,model_name:str):
109109
Set the default model. The change will not take
110110
effect until you call model_cache.commit()
111111
'''
112+
print(f'DEBUG: before set_default_model()\n{OmegaConf.to_yaml(self.config)}')
112113
assert model_name in self.models,f"unknown model '{model_name}'"
113-
for model in self.models:
114-
self.models[model].pop('default',None)
115-
self.models[model_name]['default'] = True
114+
config = self.config
115+
for model in config:
116+
config[model].pop('default',None)
117+
config[model_name]['default'] = True
118+
print(f'DEBUG: after set_default_model():\n{OmegaConf.to_yaml(self.config)}')
116119

117120
def list_models(self) -> dict:
118121
'''

scripts/invoke.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ def write_config_file(conf_path, gen, model_name, new_config, clobber=False, mak
584584

585585
try:
586586
print('>> Verifying that new model loads...')
587-
yaml_str = gen.model_cache.add_model(model_name, new_config, clobber)
587+
gen.model_cache.add_model(model_name, new_config, clobber)
588588
assert gen.set_model(model_name) is not None, 'model failed to load'
589589
except AssertionError as e:
590590
print(f'** aborting **')

0 commit comments

Comments
 (0)