Merge branch 'main' into chore/ui/cleanup

This commit is contained in:
psychedelicious 2023-11-13 16:33:08 +11:00 committed by GitHub
commit dcf0dc4274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -748,7 +748,7 @@ class ControlNetModel(ModelMixin, ConfigMixin, FromOriginalControlnetMixin):
scales = scales * conditioning_scale scales = scales * conditioning_scale
down_block_res_samples = [ down_block_res_samples = [
sample * scale for sample, scale in zip(down_block_res_samples, scales, strict=True) sample * scale for sample, scale in zip(down_block_res_samples, scales, strict=False)
] ]
mid_block_res_sample = mid_block_res_sample * scales[-1] # last one mid_block_res_sample = mid_block_res_sample * scales[-1] # last one
else: else:

View File

@ -32,7 +32,7 @@ classifiers = [
'Topic :: Scientific/Engineering :: Image Processing', 'Topic :: Scientific/Engineering :: Image Processing',
] ]
dependencies = [ dependencies = [
"accelerate~=0.23.0", "accelerate~=0.24.0",
"albumentations", "albumentations",
"click", "click",
"clip_anytorch", # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip", "clip_anytorch", # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip",