Skip to content

Merge dev branch #5453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oobabooga merged 1 commit into from
Feb 6, 2024
Merged

Merge dev branch #5453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions modules/presets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,12 @@ def generate_preset_yaml(state):
defaults = default_preset()
data = {k: state[k] for k in presets_params()}

# Remove entries that are identical to the defaults
# Remove entries that are identical to the defaults.
# sampler_priority is always saved because it is experimental
# and the default order may change.

for k in list(data.keys()):
if data[k] == defaults[k]:
if data[k] == defaults[k] and k != 'sampler_priority':
del data[k]

return yaml.dump(data, sort_keys=False)
7 changes: 3 additions & 4 deletions modules/sampler_hijack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,16 +428,15 @@ def custom_sort_key(obj):

# Sort the list using the custom key function
warpers = sorted(warpers, key=custom_sort_key)
if shared.args.verbose:
logger.info("WARPERS=")
pprint.PrettyPrinter(indent=4, sort_dicts=False).pprint([x.__class__.__name__ for x in warpers])

if normalize is not None:
warpers.append(normalize)

warpers.append(SpyLogitsWarper())
warpers = LogitsProcessorList(warpers)
if shared.args.verbose:
logger.info("WARPERS=")
pprint.PrettyPrinter(indent=4, sort_dicts=False).pprint([x.__class__.__name__ for x in warpers])

return warpers


Expand Down