Merge branch 'main' into chore/ui/cleanup

psychedelicious · web-flow · commit dcf0dc4274f8 · 2023-11-13T16:33:08.000+11:00
diff --git a/invokeai/backend/util/hotfixes.py b/invokeai/backend/util/hotfixes.py
@@ -748,7 +748,7 @@ def forward(
 
             scales = scales * conditioning_scale
             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
         else:
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,7 +32,7 @@ classifiers = [
   'Topic :: Scientific/Engineering :: Image Processing',
 ]
 dependencies = [
-  "accelerate~=0.23.0",
+  "accelerate~=0.24.0",
   "albumentations",
   "click",
   "clip_anytorch",                         # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip",

Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,7 @@ def forward(`
`748`	`748`
`749`	`749`	`scales = scales * conditioning_scale`
`750`	`750`	`down_block_res_samples = [`
`751`		`- sample * scale for sample, scale in zip(down_block_res_samples, scales, strict=True)`
	`751`	`+ sample * scale for sample, scale in zip(down_block_res_samples, scales, strict=False)`
`752`	`752`	`]`
`753`	`753`	`mid_block_res_sample = mid_block_res_sample * scales[-1] # last one`
`754`	`754`	`else:`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ classifiers = [`
`32`	`32`	`'Topic :: Scientific/Engineering :: Image Processing',`
`33`	`33`	`]`
`34`	`34`	`dependencies = [`
`35`		`- "accelerate~=0.23.0",`
	`35`	`+ "accelerate~=0.24.0",`
`36`	`36`	`"albumentations",`
`37`	`37`	`"click",`
`38`	`38`	`"clip_anytorch", # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip",`