update

Author: faaany

tests/pipelines/animatediff/test_animatediff_video2video_controlnet.py

@@ -290,13 +290,13 @@ def test_to_device(self):
         output_cpu = pipe(**self.get_dummy_inputs("cpu"))[0]
         self.assertTrue(np.isnan(output_cpu).sum() == 0)
 
-        pipe.to("cuda")
+        pipe.to(torch_device)
         model_devices = [
             component.device.type for component in pipe.components.values() if hasattr(component, "device")
         ]
-        self.assertTrue(all(device == "cuda" for device in model_devices))
+        self.assertTrue(all(device == torch_device for device in model_devices))
 
-        output_cuda = pipe(**self.get_dummy_inputs("cuda"))[0]
+        output_cuda = pipe(**self.get_dummy_inputs(torch_device))[0]
         self.assertTrue(np.isnan(to_np(output_cuda)).sum() == 0)
 
     def test_to_dtype(self):

tests/pipelines/stable_video_diffusion/test_stable_video_diffusion.py

@@ -25,6 +25,7 @@
     enable_full_determinism,
     floats_tensor,
     numpy_cosine_similarity_distance,
+    require_accelerate_version_greater,
     require_non_cpu,
     require_torch_gpu,
     slow,
@@ -428,10 +429,8 @@ def test_sequential_cpu_offload_forward_pass(self, expected_max_diff=1e-4):
         max_diff = np.abs(to_np(output_with_offload) - to_np(output_without_offload)).max()
         self.assertLess(max_diff, expected_max_diff, "CPU offloading should not affect the inference results")
 
-    @unittest.skipIf(
-        not is_accelerate_available() or is_accelerate_version("<", "0.17.0"),
-        reason="CPU offload is only available with CUDA and `accelerate v0.17.0` or higher",
-    )
+    @require_non_cpu
+    @require_accelerate_version_greater("0.17.0")
     def test_model_cpu_offload_forward_pass(self, expected_max_diff=2e-4):
         generator_device = "cpu"
         components = self.get_dummy_components()

tests/pipelines/text_to_video_synthesis/test_text_to_video_zero_sdxl.py

@@ -23,10 +23,10 @@
 from transformers import CLIPTextConfig, CLIPTextModel, CLIPTextModelWithProjection, CLIPTokenizer
 
 from diffusers import AutoencoderKL, DDIMScheduler, TextToVideoZeroSDXLPipeline, UNet2DConditionModel
-from diffusers.utils.import_utils import is_accelerate_available, is_accelerate_version
 from diffusers.utils.testing_utils import (
     enable_full_determinism,
     nightly,
+    require_accelerate_version_greater,
     require_non_cpu,
     require_torch_gpu,
     torch_device,
@@ -261,10 +261,8 @@ def test_inference_batch_consistent(self):
     def test_inference_batch_single_identical(self):
         pass
 
-    @unittest.skipIf(
-        not is_accelerate_available() or is_accelerate_version("<", "0.17.0"),
-        reason="CPU offload is only available with CUDA and `accelerate v0.17.0` or higher",
-    )
+    @require_non_cpu
+    @require_accelerate_version_greater("0.17.0")
     def test_model_cpu_offload_forward_pass(self, expected_max_diff=2e-4):
         components = self.get_dummy_components()
         pipe = self.pipeline_class(**components)