Commit 2c6bc0f1 authored by Patrick von Platen's avatar Patrick von Platen
Browse files

small fix

parent 29021090
...@@ -236,7 +236,7 @@ class AltDiffusionPipeline(DiffusionPipeline): ...@@ -236,7 +236,7 @@ class AltDiffusionPipeline(DiffusionPipeline):
if self.safety_checker is not None: if self.safety_checker is not None:
# TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate # TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate
# fix by only offloading self.safety_checker for now # fix by only offloading self.safety_checker for now
cpu_offload(self.safety_checker.vision_model) cpu_offload(self.safety_checker.vision_model, device)
@property @property
def _execution_device(self): def _execution_device(self):
......
...@@ -231,7 +231,7 @@ class AltDiffusionImg2ImgPipeline(DiffusionPipeline): ...@@ -231,7 +231,7 @@ class AltDiffusionImg2ImgPipeline(DiffusionPipeline):
if self.safety_checker is not None: if self.safety_checker is not None:
# TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate # TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate
# fix by only offloading self.safety_checker for now # fix by only offloading self.safety_checker for now
cpu_offload(self.safety_checker.vision_model) cpu_offload(self.safety_checker.vision_model, device)
@property @property
def _execution_device(self): def _execution_device(self):
......
...@@ -264,7 +264,7 @@ class CycleDiffusionPipeline(DiffusionPipeline): ...@@ -264,7 +264,7 @@ class CycleDiffusionPipeline(DiffusionPipeline):
if self.safety_checker is not None: if self.safety_checker is not None:
# TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate # TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate
# fix by only offloading self.safety_checker for now # fix by only offloading self.safety_checker for now
cpu_offload(self.safety_checker.vision_model) cpu_offload(self.safety_checker.vision_model, device)
@property @property
# Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._execution_device # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._execution_device
......
...@@ -235,7 +235,7 @@ class StableDiffusionPipeline(DiffusionPipeline): ...@@ -235,7 +235,7 @@ class StableDiffusionPipeline(DiffusionPipeline):
if self.safety_checker is not None: if self.safety_checker is not None:
# TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate # TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate
# fix by only offloading self.safety_checker for now # fix by only offloading self.safety_checker for now
cpu_offload(self.safety_checker.vision_model) cpu_offload(self.safety_checker.vision_model, device)
@property @property
def _execution_device(self): def _execution_device(self):
......
...@@ -233,7 +233,7 @@ class StableDiffusionImg2ImgPipeline(DiffusionPipeline): ...@@ -233,7 +233,7 @@ class StableDiffusionImg2ImgPipeline(DiffusionPipeline):
if self.safety_checker is not None: if self.safety_checker is not None:
# TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate # TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate
# fix by only offloading self.safety_checker for now # fix by only offloading self.safety_checker for now
cpu_offload(self.safety_checker.vision_model) cpu_offload(self.safety_checker.vision_model, device)
@property @property
# Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._execution_device # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._execution_device
......
...@@ -298,7 +298,7 @@ class StableDiffusionInpaintPipeline(DiffusionPipeline): ...@@ -298,7 +298,7 @@ class StableDiffusionInpaintPipeline(DiffusionPipeline):
if self.safety_checker is not None: if self.safety_checker is not None:
# TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate # TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate
# fix by only offloading self.safety_checker for now # fix by only offloading self.safety_checker for now
cpu_offload(self.safety_checker.vision_model) cpu_offload(self.safety_checker.vision_model, device)
# Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.enable_xformers_memory_efficient_attention # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.enable_xformers_memory_efficient_attention
def enable_xformers_memory_efficient_attention(self): def enable_xformers_memory_efficient_attention(self):
......
...@@ -246,7 +246,7 @@ class StableDiffusionInpaintPipelineLegacy(DiffusionPipeline): ...@@ -246,7 +246,7 @@ class StableDiffusionInpaintPipelineLegacy(DiffusionPipeline):
if self.safety_checker is not None: if self.safety_checker is not None:
# TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate # TODO(Patrick) - there is currently a bug with cpu offload of nn.Parameter in accelerate
# fix by only offloading self.safety_checker for now # fix by only offloading self.safety_checker for now
cpu_offload(self.safety_checker.vision_model) cpu_offload(self.safety_checker.vision_model, device)
# Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.enable_xformers_memory_efficient_attention # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.enable_xformers_memory_efficient_attention
def enable_xformers_memory_efficient_attention(self): def enable_xformers_memory_efficient_attention(self):
......
...@@ -54,5 +54,6 @@ class VersatileDiffusionImageVariationPipelineIntegrationTests(unittest.TestCase ...@@ -54,5 +54,6 @@ class VersatileDiffusionImageVariationPipelineIntegrationTests(unittest.TestCase
image_slice = image[0, 253:256, 253:256, -1] image_slice = image[0, 253:256, 253:256, -1]
assert image.shape == (1, 512, 512, 3) assert image.shape == (1, 512, 512, 3)
print(torch.from_numpy(image_slice.flatten()))
expected_slice = np.array([0.0113, 0.2241, 0.4024, 0.0839, 0.0871, 0.2725, 0.2581, 0.0, 0.1096]) expected_slice = np.array([0.0113, 0.2241, 0.4024, 0.0839, 0.0871, 0.2725, 0.2581, 0.0, 0.1096])
assert np.abs(image_slice.flatten() - expected_slice).max() < 1e-2 assert np.abs(image_slice.flatten() - expected_slice).max() < 1e-2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment