From d49a29116b7baec9884f479ac65cabcdc60520b9 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 00:40:58 +0200 Subject: [PATCH 01/20] up --- src/diffusers/training_utils.py | 5 +++-- tests/models/test_models_unet_2d.py | 5 ++++- tests/models/test_models_unet_2d_condition.py | 5 ++++- tests/models/test_models_unet_3d_condition.py | 5 ++++- tests/models/test_models_vae.py | 5 ++++- tests/models/test_models_vq.py | 5 ++++- tests/others/test_ema.py | 5 ++++- tests/pipelines/altdiffusion/test_alt_diffusion.py | 5 ++++- tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py | 5 ++++- tests/pipelines/audio_diffusion/test_audio_diffusion.py | 5 ++++- tests/pipelines/audioldm/test_audioldm.py | 5 ++++- tests/pipelines/controlnet/test_controlnet.py | 5 ++++- tests/pipelines/controlnet/test_controlnet_img2img.py | 5 ++++- tests/pipelines/controlnet/test_controlnet_inpaint.py | 5 ++++- tests/pipelines/paint_by_example/test_paint_by_example.py | 5 ++++- tests/pipelines/repaint/test_repaint.py | 5 ++++- tests/pipelines/stable_diffusion/test_cycle_diffusion.py | 5 ++++- tests/pipelines/stable_diffusion/test_stable_diffusion.py | 5 ++++- .../test_stable_diffusion_image_variation.py | 5 ++++- .../stable_diffusion/test_stable_diffusion_img2img.py | 5 ++++- .../stable_diffusion/test_stable_diffusion_inpaint.py | 5 ++++- .../test_stable_diffusion_inpaint_legacy.py | 5 ++++- .../test_stable_diffusion_instruction_pix2pix.py | 5 ++++- .../test_stable_diffusion_model_editing.py | 5 ++++- .../stable_diffusion/test_stable_diffusion_panorama.py | 5 ++++- .../stable_diffusion/test_stable_diffusion_pix2pix_zero.py | 5 ++++- .../stable_diffusion/test_stable_diffusion_sag.py | 5 ++++- .../pipelines/stable_diffusion_2/test_stable_diffusion.py | 5 ++++- .../stable_diffusion_2/test_stable_diffusion_depth.py | 5 ++++- .../stable_diffusion_2/test_stable_diffusion_diffedit.py | 5 ++++- .../stable_diffusion_2/test_stable_diffusion_inpaint.py | 5 ++++- .../stable_diffusion_2/test_stable_diffusion_v_pred.py | 5 ++++- tests/pipelines/stable_unclip/test_stable_unclip.py | 5 ++++- .../pipelines/stable_unclip/test_stable_unclip_img2img.py | 5 ++++- tests/pipelines/test_pipelines.py | 7 ++++--- tests/pipelines/text_to_video/test_text_to_video.py | 5 ++++- tests/pipelines/unclip/test_unclip.py | 5 ++++- tests/pipelines/unclip/test_unclip_image_variation.py | 5 ++++- 38 files changed, 151 insertions(+), 41 deletions(-) diff --git a/src/diffusers/training_utils.py b/src/diffusers/training_utils.py index 1a3abb49a065..6a39054a7cb2 100644 --- a/src/diffusers/training_utils.py +++ b/src/diffusers/training_utils.py @@ -14,13 +14,14 @@ import transformers -def enable_full_determinism(seed: int): +def enable_full_determinism(seed: Optional[int] = None): """ Helper function for reproducible behavior during distributed training. See - https://pytorch.org/docs/stable/notes/randomness.html for pytorch """ # set seed first - set_seed(seed) + if seed is not None: + set_seed(seed) # Enable PyTorch deterministic mode. This potentially requires either the environment # variable 'CUDA_LAUNCH_BLOCKING' or 'CUBLAS_WORKSPACE_CONFIG' to be set, diff --git a/tests/models/test_models_unet_2d.py b/tests/models/test_models_unet_2d.py index 8f9a6b813f19..4c6b6a7a8199 100644 --- a/tests/models/test_models_unet_2d.py +++ b/tests/models/test_models_unet_2d.py @@ -27,7 +27,10 @@ logger = logging.get_logger(__name__) torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class Unet2DModelTests(ModelTesterMixin, unittest.TestCase): diff --git a/tests/models/test_models_unet_2d_condition.py b/tests/models/test_models_unet_2d_condition.py index d3ca5ea3048e..414f674ef609 100644 --- a/tests/models/test_models_unet_2d_condition.py +++ b/tests/models/test_models_unet_2d_condition.py @@ -39,7 +39,10 @@ logger = logging.get_logger(__name__) torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() def create_lora_layers(model, mock_weights: bool = True): diff --git a/tests/models/test_models_unet_3d_condition.py b/tests/models/test_models_unet_3d_condition.py index 08863adfeaac..ee70ad682cc8 100644 --- a/tests/models/test_models_unet_3d_condition.py +++ b/tests/models/test_models_unet_3d_condition.py @@ -35,7 +35,10 @@ logger = logging.get_logger(__name__) torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() def create_lora_layers(model, mock_weights: bool = True): diff --git a/tests/models/test_models_vae.py b/tests/models/test_models_vae.py index fd4cf0114f51..4df7ceb57846 100644 --- a/tests/models/test_models_vae.py +++ b/tests/models/test_models_vae.py @@ -27,7 +27,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class AutoencoderKLTests(ModelTesterMixin, unittest.TestCase): diff --git a/tests/models/test_models_vq.py b/tests/models/test_models_vq.py index f0be6f6a6d64..ae4dbce28274 100644 --- a/tests/models/test_models_vq.py +++ b/tests/models/test_models_vq.py @@ -24,7 +24,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class VQModelTests(ModelTesterMixin, unittest.TestCase): diff --git a/tests/others/test_ema.py b/tests/others/test_ema.py index 5526aadc4757..9869f84e65aa 100644 --- a/tests/others/test_ema.py +++ b/tests/others/test_ema.py @@ -24,7 +24,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class EMAModelTests(unittest.TestCase): diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion.py b/tests/pipelines/altdiffusion/test_alt_diffusion.py index 9237f7435b95..0a44e79d6404 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion.py @@ -33,7 +33,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class AltDiffusionPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py index 35a4e91284cd..4b88895f60d5 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py @@ -37,7 +37,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class AltDiffusionImg2ImgPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/audio_diffusion/test_audio_diffusion.py b/tests/pipelines/audio_diffusion/test_audio_diffusion.py index a848bd031797..33b7f034439f 100644 --- a/tests/pipelines/audio_diffusion/test_audio_diffusion.py +++ b/tests/pipelines/audio_diffusion/test_audio_diffusion.py @@ -34,7 +34,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class PipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/audioldm/test_audioldm.py b/tests/pipelines/audioldm/test_audioldm.py index 566b2c2d2cd0..cdaa16585069 100644 --- a/tests/pipelines/audioldm/test_audioldm.py +++ b/tests/pipelines/audioldm/test_audioldm.py @@ -43,7 +43,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class AudioLDMPipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/controlnet/test_controlnet.py b/tests/pipelines/controlnet/test_controlnet.py index 0453bb38e1ee..f5a2fe62d91c 100644 --- a/tests/pipelines/controlnet/test_controlnet.py +++ b/tests/pipelines/controlnet/test_controlnet.py @@ -42,7 +42,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class ControlNetPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/controlnet/test_controlnet_img2img.py b/tests/pipelines/controlnet/test_controlnet_img2img.py index b83a8af2778b..0364b9b1d0bd 100644 --- a/tests/pipelines/controlnet/test_controlnet_img2img.py +++ b/tests/pipelines/controlnet/test_controlnet_img2img.py @@ -45,7 +45,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class ControlNetImg2ImgPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/controlnet/test_controlnet_inpaint.py b/tests/pipelines/controlnet/test_controlnet_inpaint.py index 786b0e608ef0..de90ad14b953 100644 --- a/tests/pipelines/controlnet/test_controlnet_inpaint.py +++ b/tests/pipelines/controlnet/test_controlnet_inpaint.py @@ -45,7 +45,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class ControlNetInpaintPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/paint_by_example/test_paint_by_example.py b/tests/pipelines/paint_by_example/test_paint_by_example.py index 80ba3f5ed37f..d58edb3ef252 100644 --- a/tests/pipelines/paint_by_example/test_paint_by_example.py +++ b/tests/pipelines/paint_by_example/test_paint_by_example.py @@ -32,7 +32,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class PaintByExamplePipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/repaint/test_repaint.py b/tests/pipelines/repaint/test_repaint.py index 59968eaf101c..76eaa66d1507 100644 --- a/tests/pipelines/repaint/test_repaint.py +++ b/tests/pipelines/repaint/test_repaint.py @@ -27,7 +27,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class RepaintPipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py index 3d6bfff1bbd1..01e5b31f97c9 100644 --- a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py @@ -30,7 +30,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class CycleDiffusionPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index 1f52a09b672b..729a20779a07 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -47,7 +47,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py index 0ce55ae78ae0..ff25465f7649 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py @@ -37,7 +37,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionImageVariationPipelineFastTests( diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py index 4afc16d9b65f..67d7610fa6af 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py @@ -45,7 +45,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionImg2ImgPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py index 5c2d9d7c44f7..6d85c585970b 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py @@ -41,7 +41,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionInpaintPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py index 8647041fbb6f..f0af7ec6cf00 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py @@ -38,7 +38,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionInpaintLegacyPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py index 99a069493885..caace34b47b3 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py @@ -39,7 +39,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionInstructPix2PixPipelineFastTests( diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py index b448dbef1ebe..692154800c02 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py @@ -36,7 +36,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() @skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py index 61708b36bfee..fc9dfb7907b8 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py @@ -37,7 +37,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() @skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py index 90cc85646462..aa8f08393f50 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py @@ -40,7 +40,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() @skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py index 7cb8ab409a9b..6d898c9d2771 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py @@ -34,7 +34,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionSAGPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py index bc4ab7d66431..31ed68a12eac 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py @@ -40,7 +40,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusion2PipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py index ae1eefa68242..a4764903fbda 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py @@ -56,7 +56,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() @skip_mps diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py index c9da7b06893f..5fd22c16b5f5 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py @@ -40,7 +40,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusionDiffEditPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py index 77242add93e9..8ff6cb6f52dd 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py @@ -31,7 +31,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusion2InpaintPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py index a874cbb7e0c5..5dc26bf6c7a8 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py @@ -34,7 +34,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableDiffusion2VPredictionPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/stable_unclip/test_stable_unclip.py b/tests/pipelines/stable_unclip/test_stable_unclip.py index 78775a938b5b..c114ec4eb967 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip.py @@ -20,7 +20,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableUnCLIPPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py index dcd4300b85c1..1ebbeac900ea 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py @@ -36,7 +36,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class StableUnCLIPImg2ImgPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/test_pipelines.py b/tests/pipelines/test_pipelines.py index df1a3b6ac7bb..ea819dcff6ee 100644 --- a/tests/pipelines/test_pipelines.py +++ b/tests/pipelines/test_pipelines.py @@ -74,7 +74,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class DownloadTests(unittest.TestCase): @@ -700,7 +703,6 @@ def test_local_custom_pipeline_file(self): def test_download_from_git(self): # Because adaptive_avg_pool2d_backward_cuda # does not have a deterministic implementation. - torch.use_deterministic_algorithms(False) clip_model_id = "laion/CLIP-ViT-B-32-laion2B-s34B-b79K" feature_extractor = CLIPImageProcessor.from_pretrained(clip_model_id) @@ -722,7 +724,6 @@ def test_download_from_git(self): image = pipeline("a prompt", num_inference_steps=2, output_type="np").images[0] assert image.shape == (512, 512, 3) - torch.use_deterministic_algorithms(True) def test_save_pipeline_change_config(self): pipe = DiffusionPipeline.from_pretrained( diff --git a/tests/pipelines/text_to_video/test_text_to_video.py b/tests/pipelines/text_to_video/test_text_to_video.py index 212becbb6729..27c9f6da9a73 100644 --- a/tests/pipelines/text_to_video/test_text_to_video.py +++ b/tests/pipelines/text_to_video/test_text_to_video.py @@ -33,7 +33,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() @skip_mps diff --git a/tests/pipelines/unclip/test_unclip.py b/tests/pipelines/unclip/test_unclip.py index 5357e5b0e7ef..dc35f7c802dc 100644 --- a/tests/pipelines/unclip/test_unclip.py +++ b/tests/pipelines/unclip/test_unclip.py @@ -30,7 +30,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class UnCLIPPipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/unclip/test_unclip_image_variation.py b/tests/pipelines/unclip/test_unclip_image_variation.py index ded162102dd6..29803250e274 100644 --- a/tests/pipelines/unclip/test_unclip_image_variation.py +++ b/tests/pipelines/unclip/test_unclip_image_variation.py @@ -44,7 +44,10 @@ torch.backends.cuda.matmul.allow_tf32 = False -torch.use_deterministic_algorithms(True) +from diffusers.testing_utils import enable_full_determinism + + +enable_full_determinism() class UnCLIPImageVariationPipelineFastTests(PipelineTesterMixin, unittest.TestCase): From 6eaf267f348f3103114a572d07842fbffbdbe42a Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 00:44:13 +0200 Subject: [PATCH 02/20] fix more --- src/diffusers/training_utils.py | 1 + tests/models/test_layers_utils.py | 2 +- tests/models/test_models_unet_1d.py | 2 +- tests/models/test_models_unet_2d.py | 2 +- tests/models/test_models_unet_2d_condition.py | 2 +- tests/models/test_models_unet_3d_condition.py | 2 +- tests/models/test_models_vae.py | 2 +- tests/models/test_models_vq.py | 2 +- tests/others/test_ema.py | 2 +- tests/others/test_training.py | 2 +- tests/pipelines/altdiffusion/test_alt_diffusion.py | 2 +- tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py | 2 +- tests/pipelines/audio_diffusion/test_audio_diffusion.py | 2 +- tests/pipelines/audioldm/test_audioldm.py | 2 +- tests/pipelines/controlnet/test_controlnet.py | 2 +- tests/pipelines/controlnet/test_controlnet_img2img.py | 2 +- tests/pipelines/controlnet/test_controlnet_inpaint.py | 2 +- tests/pipelines/dance_diffusion/test_dance_diffusion.py | 2 +- tests/pipelines/ddim/test_ddim.py | 2 +- tests/pipelines/ddpm/test_ddpm.py | 2 +- tests/pipelines/dit/test_dit.py | 2 +- tests/pipelines/karras_ve/test_karras_ve.py | 2 +- tests/pipelines/latent_diffusion/test_latent_diffusion.py | 2 +- .../latent_diffusion/test_latent_diffusion_superresolution.py | 2 +- .../pipelines/latent_diffusion/test_latent_diffusion_uncond.py | 2 +- tests/pipelines/paint_by_example/test_paint_by_example.py | 2 +- tests/pipelines/pndm/test_pndm.py | 2 +- tests/pipelines/repaint/test_repaint.py | 2 +- tests/pipelines/score_sde_ve/test_score_sde_ve.py | 2 +- .../semantic_stable_diffusion/test_semantic_diffusion.py | 2 +- .../spectrogram_diffusion/test_spectrogram_diffusion.py | 2 +- tests/pipelines/stable_diffusion/test_cycle_diffusion.py | 2 +- tests/pipelines/stable_diffusion/test_stable_diffusion.py | 2 +- .../stable_diffusion/test_stable_diffusion_image_variation.py | 2 +- .../pipelines/stable_diffusion/test_stable_diffusion_img2img.py | 2 +- .../pipelines/stable_diffusion/test_stable_diffusion_inpaint.py | 2 +- .../stable_diffusion/test_stable_diffusion_inpaint_legacy.py | 2 +- .../test_stable_diffusion_instruction_pix2pix.py | 2 +- .../stable_diffusion/test_stable_diffusion_k_diffusion.py | 2 +- .../stable_diffusion/test_stable_diffusion_model_editing.py | 2 +- .../stable_diffusion/test_stable_diffusion_panorama.py | 2 +- .../stable_diffusion/test_stable_diffusion_pix2pix_zero.py | 2 +- tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py | 2 +- tests/pipelines/stable_diffusion_2/test_stable_diffusion.py | 2 +- .../test_stable_diffusion_attend_and_excite.py | 2 +- .../pipelines/stable_diffusion_2/test_stable_diffusion_depth.py | 2 +- .../stable_diffusion_2/test_stable_diffusion_diffedit.py | 2 +- .../stable_diffusion_2/test_stable_diffusion_inpaint.py | 2 +- .../stable_diffusion_2/test_stable_diffusion_latent_upscale.py | 2 +- .../stable_diffusion_2/test_stable_diffusion_upscale.py | 2 +- .../stable_diffusion_2/test_stable_diffusion_v_pred.py | 2 +- tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py | 2 +- tests/pipelines/stable_unclip/test_stable_unclip.py | 2 +- tests/pipelines/stable_unclip/test_stable_unclip_img2img.py | 2 +- tests/pipelines/test_pipelines.py | 2 +- tests/pipelines/test_pipelines_common.py | 2 +- tests/pipelines/text_to_video/test_text_to_video.py | 2 +- tests/pipelines/unclip/test_unclip.py | 2 +- tests/pipelines/unclip/test_unclip_image_variation.py | 2 +- .../versatile_diffusion/test_versatile_diffusion_dual_guided.py | 2 +- .../test_versatile_diffusion_image_variation.py | 2 +- .../versatile_diffusion/test_versatile_diffusion_mega.py | 2 +- .../test_versatile_diffusion_text_to_image.py | 2 +- tests/pipelines/vq_diffusion/test_vq_diffusion.py | 2 +- tests/schedulers/test_schedulers.py | 2 +- 65 files changed, 65 insertions(+), 64 deletions(-) diff --git a/src/diffusers/training_utils.py b/src/diffusers/training_utils.py index 6a39054a7cb2..88c9f01b24d9 100644 --- a/src/diffusers/training_utils.py +++ b/src/diffusers/training_utils.py @@ -33,6 +33,7 @@ def enable_full_determinism(seed: Optional[int] = None): # Enable CUDNN deterministic mode torch.backends.cudnn.deterministic = True torch.backends.cudnn.benchmark = False + torch.backends.cuda.matmul.allow_tf32 = False def set_seed(seed: int): diff --git a/tests/models/test_layers_utils.py b/tests/models/test_layers_utils.py index 98fa1afcbb9d..ea499ff5cab5 100644 --- a/tests/models/test_layers_utils.py +++ b/tests/models/test_layers_utils.py @@ -27,7 +27,7 @@ from diffusers.utils import torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class EmbeddingsTests(unittest.TestCase): diff --git a/tests/models/test_models_unet_1d.py b/tests/models/test_models_unet_1d.py index 78f759cb1a24..15253097cd86 100644 --- a/tests/models/test_models_unet_1d.py +++ b/tests/models/test_models_unet_1d.py @@ -23,7 +23,7 @@ from .test_modeling_common import ModelTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + class UNet1DModelTests(ModelTesterMixin, unittest.TestCase): diff --git a/tests/models/test_models_unet_2d.py b/tests/models/test_models_unet_2d.py index 4c6b6a7a8199..ae17b8fb2ff1 100644 --- a/tests/models/test_models_unet_2d.py +++ b/tests/models/test_models_unet_2d.py @@ -26,7 +26,7 @@ logger = logging.get_logger(__name__) -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/models/test_models_unet_2d_condition.py b/tests/models/test_models_unet_2d_condition.py index 414f674ef609..6953405adc5d 100644 --- a/tests/models/test_models_unet_2d_condition.py +++ b/tests/models/test_models_unet_2d_condition.py @@ -38,7 +38,7 @@ logger = logging.get_logger(__name__) -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/models/test_models_unet_3d_condition.py b/tests/models/test_models_unet_3d_condition.py index ee70ad682cc8..1a807b738fff 100644 --- a/tests/models/test_models_unet_3d_condition.py +++ b/tests/models/test_models_unet_3d_condition.py @@ -34,7 +34,7 @@ logger = logging.get_logger(__name__) -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/models/test_models_vae.py b/tests/models/test_models_vae.py index 4df7ceb57846..4cea743c750f 100644 --- a/tests/models/test_models_vae.py +++ b/tests/models/test_models_vae.py @@ -26,7 +26,7 @@ from .test_modeling_common import ModelTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/models/test_models_vq.py b/tests/models/test_models_vq.py index ae4dbce28274..5a8a488d37f7 100644 --- a/tests/models/test_models_vq.py +++ b/tests/models/test_models_vq.py @@ -23,7 +23,7 @@ from .test_modeling_common import ModelTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/others/test_ema.py b/tests/others/test_ema.py index 9869f84e65aa..efc5069660d2 100644 --- a/tests/others/test_ema.py +++ b/tests/others/test_ema.py @@ -23,7 +23,7 @@ from diffusers.utils.testing_utils import skip_mps, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/others/test_training.py b/tests/others/test_training.py index d540f9976221..0240887f4c14 100644 --- a/tests/others/test_training.py +++ b/tests/others/test_training.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import slow -torch.backends.cuda.matmul.allow_tf32 = False + class TrainingTests(unittest.TestCase): diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion.py b/tests/pipelines/altdiffusion/test_alt_diffusion.py index 0a44e79d6404..46399467a0b7 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion.py @@ -32,7 +32,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py index 4b88895f60d5..c15ecf0c451d 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py @@ -36,7 +36,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/audio_diffusion/test_audio_diffusion.py b/tests/pipelines/audio_diffusion/test_audio_diffusion.py index 33b7f034439f..12fab601f537 100644 --- a/tests/pipelines/audio_diffusion/test_audio_diffusion.py +++ b/tests/pipelines/audio_diffusion/test_audio_diffusion.py @@ -33,7 +33,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/audioldm/test_audioldm.py b/tests/pipelines/audioldm/test_audioldm.py index cdaa16585069..a86ddcdb8853 100644 --- a/tests/pipelines/audioldm/test_audioldm.py +++ b/tests/pipelines/audioldm/test_audioldm.py @@ -42,7 +42,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/controlnet/test_controlnet.py b/tests/pipelines/controlnet/test_controlnet.py index f5a2fe62d91c..b4dee94198c0 100644 --- a/tests/pipelines/controlnet/test_controlnet.py +++ b/tests/pipelines/controlnet/test_controlnet.py @@ -41,7 +41,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/controlnet/test_controlnet_img2img.py b/tests/pipelines/controlnet/test_controlnet_img2img.py index 0364b9b1d0bd..e71d304393a4 100644 --- a/tests/pipelines/controlnet/test_controlnet_img2img.py +++ b/tests/pipelines/controlnet/test_controlnet_img2img.py @@ -44,7 +44,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/controlnet/test_controlnet_inpaint.py b/tests/pipelines/controlnet/test_controlnet_inpaint.py index de90ad14b953..e3dc2236d99f 100644 --- a/tests/pipelines/controlnet/test_controlnet_inpaint.py +++ b/tests/pipelines/controlnet/test_controlnet_inpaint.py @@ -44,7 +44,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/dance_diffusion/test_dance_diffusion.py b/tests/pipelines/dance_diffusion/test_dance_diffusion.py index 361839043c9f..63992c1e9539 100644 --- a/tests/pipelines/dance_diffusion/test_dance_diffusion.py +++ b/tests/pipelines/dance_diffusion/test_dance_diffusion.py @@ -27,7 +27,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + class DanceDiffusionPipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/ddim/test_ddim.py b/tests/pipelines/ddim/test_ddim.py index e997ae45d975..b7660ec4bd51 100644 --- a/tests/pipelines/ddim/test_ddim.py +++ b/tests/pipelines/ddim/test_ddim.py @@ -25,7 +25,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + class DDIMPipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/ddpm/test_ddpm.py b/tests/pipelines/ddpm/test_ddpm.py index 5e3e47cb74fb..44eae4b283a0 100644 --- a/tests/pipelines/ddpm/test_ddpm.py +++ b/tests/pipelines/ddpm/test_ddpm.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class DDPMPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/dit/test_dit.py b/tests/pipelines/dit/test_dit.py index d8098178f339..90ce7903089e 100644 --- a/tests/pipelines/dit/test_dit.py +++ b/tests/pipelines/dit/test_dit.py @@ -30,7 +30,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + class DiTPipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/karras_ve/test_karras_ve.py b/tests/pipelines/karras_ve/test_karras_ve.py index 391e61a2b9c9..0f580068ad7e 100644 --- a/tests/pipelines/karras_ve/test_karras_ve.py +++ b/tests/pipelines/karras_ve/test_karras_ve.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class KarrasVePipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion.py b/tests/pipelines/latent_diffusion/test_latent_diffusion.py index 05ff4162e5c6..e151667a953b 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion.py @@ -27,7 +27,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + class LDMTextToImagePipelineFastTests(PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py index f1aa2f08efba..b4bf603518e4 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import require_torch -torch.backends.cuda.matmul.allow_tf32 = False + class LDMSuperResolutionPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py index aa7b33730d18..f81a371cf74c 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py @@ -23,7 +23,7 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class LDMPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/paint_by_example/test_paint_by_example.py b/tests/pipelines/paint_by_example/test_paint_by_example.py index d58edb3ef252..793e18f9c3a7 100644 --- a/tests/pipelines/paint_by_example/test_paint_by_example.py +++ b/tests/pipelines/paint_by_example/test_paint_by_example.py @@ -31,7 +31,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/pndm/test_pndm.py b/tests/pipelines/pndm/test_pndm.py index bed5fea561dc..495bd10c504e 100644 --- a/tests/pipelines/pndm/test_pndm.py +++ b/tests/pipelines/pndm/test_pndm.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class PNDMPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/repaint/test_repaint.py b/tests/pipelines/repaint/test_repaint.py index 76eaa66d1507..a671608a40a7 100644 --- a/tests/pipelines/repaint/test_repaint.py +++ b/tests/pipelines/repaint/test_repaint.py @@ -26,7 +26,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/score_sde_ve/test_score_sde_ve.py b/tests/pipelines/score_sde_ve/test_score_sde_ve.py index 036ecc3f6bf3..81cb71759756 100644 --- a/tests/pipelines/score_sde_ve/test_score_sde_ve.py +++ b/tests/pipelines/score_sde_ve/test_score_sde_ve.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class ScoreSdeVeipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py index ba42b1fe9c5f..9b9e4fcc0017 100644 --- a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py +++ b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py @@ -28,7 +28,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + class SafeDiffusionPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py index 3ec6f681be79..452f1af3ad82 100644 --- a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py +++ b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py @@ -28,7 +28,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + MIDI_FILE = "./tests/fixtures/elise_format0.mid" diff --git a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py index 01e5b31f97c9..ea74c0f14d6c 100644 --- a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py @@ -29,7 +29,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index 729a20779a07..6e3dcaf90718 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -46,7 +46,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py index ff25465f7649..4f5f45d942a1 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py @@ -36,7 +36,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py index 67d7610fa6af..c9607586d2a4 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py @@ -44,7 +44,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py index 6d85c585970b..c68632b45124 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py @@ -40,7 +40,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py index f0af7ec6cf00..7dbe78388087 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py @@ -37,7 +37,7 @@ from diffusers.utils.testing_utils import load_numpy, preprocess_image, require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py index caace34b47b3..f564808adfd8 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py @@ -38,7 +38,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py index 546b1d21252c..c07ea3c9ea16 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + @slow diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py index 692154800c02..a4a3f78f517d 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py @@ -35,7 +35,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py index fc9dfb7907b8..58ebc6a0d289 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py @@ -36,7 +36,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py index aa8f08393f50..ad1040c8d00a 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py @@ -39,7 +39,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py index 6d898c9d2771..82747a006616 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py @@ -33,7 +33,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py index 31ed68a12eac..e0abc46ada8d 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py @@ -39,7 +39,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py index 898d5741043f..211519973432 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py @@ -33,7 +33,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + torch.use_deterministic_algorithms(False) diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py index a4764903fbda..829520b4add2 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py @@ -55,7 +55,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py index 5fd22c16b5f5..7c99407d053b 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py @@ -39,7 +39,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py index 8ff6cb6f52dd..2c19fd1e083a 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py @@ -30,7 +30,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py index 539b4b1cc350..babab39054bf 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py @@ -35,7 +35,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + class StableDiffusionLatentUpscalePipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py index 747809a4fb2e..8055d2ba93ed 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py @@ -27,7 +27,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + class StableDiffusionUpscalePipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py index 5dc26bf6c7a8..1dfeef0adae9 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py @@ -33,7 +33,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py b/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py index c614fa48055e..2da1abb92105 100644 --- a/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py +++ b/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py @@ -28,7 +28,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + class SafeDiffusionPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/stable_unclip/test_stable_unclip.py b/tests/pipelines/stable_unclip/test_stable_unclip.py index c114ec4eb967..af64aec15cc3 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip.py @@ -19,7 +19,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin, assert_mean_pixel_difference -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py index 1ebbeac900ea..0db1d784ccf1 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py @@ -35,7 +35,7 @@ ) -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/test_pipelines.py b/tests/pipelines/test_pipelines.py index ea819dcff6ee..146731642dc6 100644 --- a/tests/pipelines/test_pipelines.py +++ b/tests/pipelines/test_pipelines.py @@ -73,7 +73,7 @@ ) -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py index f23e850f4d54..fcbf2b1c9b62 100644 --- a/tests/pipelines/test_pipelines_common.py +++ b/tests/pipelines/test_pipelines_common.py @@ -18,7 +18,7 @@ from diffusers.utils.testing_utils import require_torch, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + def to_np(tensor): diff --git a/tests/pipelines/text_to_video/test_text_to_video.py b/tests/pipelines/text_to_video/test_text_to_video.py index 27c9f6da9a73..e5ea390f0aea 100644 --- a/tests/pipelines/text_to_video/test_text_to_video.py +++ b/tests/pipelines/text_to_video/test_text_to_video.py @@ -32,7 +32,7 @@ from ..test_pipelines_common import PipelineTesterMixin -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/unclip/test_unclip.py b/tests/pipelines/unclip/test_unclip.py index dc35f7c802dc..a23188a0eb29 100644 --- a/tests/pipelines/unclip/test_unclip.py +++ b/tests/pipelines/unclip/test_unclip.py @@ -29,7 +29,7 @@ from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/unclip/test_unclip_image_variation.py b/tests/pipelines/unclip/test_unclip_image_variation.py index 29803250e274..78eb898b7e97 100644 --- a/tests/pipelines/unclip/test_unclip_image_variation.py +++ b/tests/pipelines/unclip/test_unclip_image_variation.py @@ -43,7 +43,7 @@ from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference -torch.backends.cuda.matmul.allow_tf32 = False + from diffusers.testing_utils import enable_full_determinism diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py index 4e2b89982a6a..362a6c5342e7 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import load_image, nightly, require_torch_gpu, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + @nightly diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py index b4eabb9e3a0e..9575ea580490 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import load_image, require_torch_gpu, slow, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class VersatileDiffusionImageVariationPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py index b77c1baf41d5..814fa15692c9 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import load_image, nightly, require_torch_gpu, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class VersatileDiffusionMegaPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py index 194f660f7055..c6f7413a0369 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import nightly, require_torch_gpu, torch_device -torch.backends.cuda.matmul.allow_tf32 = False + class VersatileDiffusionTextToImagePipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/vq_diffusion/test_vq_diffusion.py b/tests/pipelines/vq_diffusion/test_vq_diffusion.py index 3f5ef16cff72..baf13d05eb86 100644 --- a/tests/pipelines/vq_diffusion/test_vq_diffusion.py +++ b/tests/pipelines/vq_diffusion/test_vq_diffusion.py @@ -26,7 +26,7 @@ from diffusers.utils.testing_utils import require_torch_gpu -torch.backends.cuda.matmul.allow_tf32 = False + class VQDiffusionPipelineFastTests(unittest.TestCase): diff --git a/tests/schedulers/test_schedulers.py b/tests/schedulers/test_schedulers.py index 69cddb36dde2..8814751098a3 100755 --- a/tests/schedulers/test_schedulers.py +++ b/tests/schedulers/test_schedulers.py @@ -37,7 +37,7 @@ from diffusers.utils.testing_utils import CaptureLogger -torch.backends.cuda.matmul.allow_tf32 = False + class SchedulerObject(SchedulerMixin, ConfigMixin): From 51311ace8d05cf65284ce3bee29c23f9d562256c Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Thu, 18 May 2023 23:50:04 +0100 Subject: [PATCH 03/20] Apply suggestions from code review --- tests/others/test_training.py | 2 +- tests/pipelines/dance_diffusion/test_dance_diffusion.py | 3 +++ tests/pipelines/ddim/test_ddim.py | 3 +++ tests/pipelines/ddpm/test_ddpm.py | 3 +++ tests/pipelines/dit/test_dit.py | 3 +++ tests/pipelines/karras_ve/test_karras_ve.py | 3 +++ tests/pipelines/latent_diffusion/test_latent_diffusion.py | 3 +++ .../latent_diffusion/test_latent_diffusion_superresolution.py | 3 +++ .../pipelines/latent_diffusion/test_latent_diffusion_uncond.py | 3 +++ tests/pipelines/pndm/test_pndm.py | 3 +++ tests/pipelines/score_sde_ve/test_score_sde_ve.py | 3 +++ .../semantic_stable_diffusion/test_semantic_diffusion.py | 3 +++ .../spectrogram_diffusion/test_spectrogram_diffusion.py | 3 +++ .../stable_diffusion/test_stable_diffusion_k_diffusion.py | 3 +++ .../test_stable_diffusion_attend_and_excite.py | 2 +- .../stable_diffusion_2/test_stable_diffusion_latent_upscale.py | 3 +++ .../stable_diffusion_2/test_stable_diffusion_upscale.py | 3 +++ .../test_versatile_diffusion_dual_guided.py | 2 +- .../test_versatile_diffusion_image_variation.py | 2 +- .../versatile_diffusion/test_versatile_diffusion_mega.py | 2 +- .../test_versatile_diffusion_text_to_image.py | 2 +- tests/pipelines/vq_diffusion/test_vq_diffusion.py | 2 +- tests/schedulers/test_schedulers.py | 2 +- 23 files changed, 53 insertions(+), 8 deletions(-) diff --git a/tests/others/test_training.py b/tests/others/test_training.py index 0240887f4c14..d540f9976221 100644 --- a/tests/others/test_training.py +++ b/tests/others/test_training.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import slow - +torch.backends.cuda.matmul.allow_tf32 = False class TrainingTests(unittest.TestCase): diff --git a/tests/pipelines/dance_diffusion/test_dance_diffusion.py b/tests/pipelines/dance_diffusion/test_dance_diffusion.py index 63992c1e9539..7af612dbb0ed 100644 --- a/tests/pipelines/dance_diffusion/test_dance_diffusion.py +++ b/tests/pipelines/dance_diffusion/test_dance_diffusion.py @@ -27,8 +27,11 @@ from ..test_pipelines_common import PipelineTesterMixin +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class DanceDiffusionPipelineFastTests(PipelineTesterMixin, unittest.TestCase): pipeline_class = DanceDiffusionPipeline diff --git a/tests/pipelines/ddim/test_ddim.py b/tests/pipelines/ddim/test_ddim.py index b7660ec4bd51..064ee4077ba2 100644 --- a/tests/pipelines/ddim/test_ddim.py +++ b/tests/pipelines/ddim/test_ddim.py @@ -25,8 +25,11 @@ from ..test_pipelines_common import PipelineTesterMixin +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class DDIMPipelineFastTests(PipelineTesterMixin, unittest.TestCase): pipeline_class = DDIMPipeline diff --git a/tests/pipelines/ddpm/test_ddpm.py b/tests/pipelines/ddpm/test_ddpm.py index 44eae4b283a0..b68be1a16d2c 100644 --- a/tests/pipelines/ddpm/test_ddpm.py +++ b/tests/pipelines/ddpm/test_ddpm.py @@ -22,8 +22,11 @@ from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class DDPMPipelineFastTests(unittest.TestCase): @property diff --git a/tests/pipelines/dit/test_dit.py b/tests/pipelines/dit/test_dit.py index 90ce7903089e..75d88060ea26 100644 --- a/tests/pipelines/dit/test_dit.py +++ b/tests/pipelines/dit/test_dit.py @@ -30,8 +30,11 @@ from ..test_pipelines_common import PipelineTesterMixin +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class DiTPipelineFastTests(PipelineTesterMixin, unittest.TestCase): pipeline_class = DiTPipeline diff --git a/tests/pipelines/karras_ve/test_karras_ve.py b/tests/pipelines/karras_ve/test_karras_ve.py index 0f580068ad7e..2fe0aeba7bed 100644 --- a/tests/pipelines/karras_ve/test_karras_ve.py +++ b/tests/pipelines/karras_ve/test_karras_ve.py @@ -22,8 +22,11 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class KarrasVePipelineFastTests(unittest.TestCase): @property diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion.py b/tests/pipelines/latent_diffusion/test_latent_diffusion.py index e151667a953b..19c80e2768f4 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion.py @@ -27,8 +27,11 @@ from ..test_pipelines_common import PipelineTesterMixin +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class LDMTextToImagePipelineFastTests(PipelineTesterMixin, unittest.TestCase): pipeline_class = LDMTextToImagePipeline diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py index b4bf603518e4..9d7d37959752 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py @@ -24,8 +24,11 @@ from diffusers.utils.testing_utils import require_torch +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class LDMSuperResolutionPipelineFastTests(unittest.TestCase): @property diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py index f81a371cf74c..3c067bece0be 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py @@ -23,8 +23,11 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class LDMPipelineFastTests(unittest.TestCase): @property diff --git a/tests/pipelines/pndm/test_pndm.py b/tests/pipelines/pndm/test_pndm.py index 495bd10c504e..f85e9e5fbff2 100644 --- a/tests/pipelines/pndm/test_pndm.py +++ b/tests/pipelines/pndm/test_pndm.py @@ -22,8 +22,11 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class PNDMPipelineFastTests(unittest.TestCase): @property diff --git a/tests/pipelines/score_sde_ve/test_score_sde_ve.py b/tests/pipelines/score_sde_ve/test_score_sde_ve.py index 81cb71759756..37161addb0bc 100644 --- a/tests/pipelines/score_sde_ve/test_score_sde_ve.py +++ b/tests/pipelines/score_sde_ve/test_score_sde_ve.py @@ -22,8 +22,11 @@ from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class ScoreSdeVeipelineFastTests(unittest.TestCase): @property diff --git a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py index 9b9e4fcc0017..0b5cd6df557c 100644 --- a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py +++ b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py @@ -28,8 +28,11 @@ from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class SafeDiffusionPipelineFastTests(unittest.TestCase): def tearDown(self): diff --git a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py index 452f1af3ad82..67748474fc2f 100644 --- a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py +++ b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py @@ -28,8 +28,11 @@ from ..test_pipelines_common import PipelineTesterMixin +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + MIDI_FILE = "./tests/fixtures/elise_format0.mid" diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py index c07ea3c9ea16..86ddcbdb95dc 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py @@ -24,8 +24,11 @@ from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + @slow @require_torch_gpu diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py index 211519973432..898d5741043f 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_attend_and_excite.py @@ -33,7 +33,7 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - +torch.backends.cuda.matmul.allow_tf32 = False torch.use_deterministic_algorithms(False) diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py index babab39054bf..c7631d1c8f5f 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py @@ -35,8 +35,11 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class StableDiffusionLatentUpscalePipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): pipeline_class = StableDiffusionLatentUpscalePipeline diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py index 8055d2ba93ed..e64aa953adcb 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py @@ -27,8 +27,11 @@ from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.testing_utils import enable_full_determinism +enable_full_determinism() + class StableDiffusionUpscalePipelineFastTests(unittest.TestCase): def tearDown(self): diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py index 362a6c5342e7..4e2b89982a6a 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_dual_guided.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import load_image, nightly, require_torch_gpu, torch_device - +torch.backends.cuda.matmul.allow_tf32 = False @nightly diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py index 9575ea580490..b4eabb9e3a0e 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_image_variation.py @@ -22,7 +22,7 @@ from diffusers.utils.testing_utils import load_image, require_torch_gpu, slow, torch_device - +torch.backends.cuda.matmul.allow_tf32 = False class VersatileDiffusionImageVariationPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py index 814fa15692c9..b77c1baf41d5 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_mega.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import load_image, nightly, require_torch_gpu, torch_device - +torch.backends.cuda.matmul.allow_tf32 = False class VersatileDiffusionMegaPipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py index c6f7413a0369..194f660f7055 100644 --- a/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py +++ b/tests/pipelines/versatile_diffusion/test_versatile_diffusion_text_to_image.py @@ -24,7 +24,7 @@ from diffusers.utils.testing_utils import nightly, require_torch_gpu, torch_device - +torch.backends.cuda.matmul.allow_tf32 = False class VersatileDiffusionTextToImagePipelineFastTests(unittest.TestCase): diff --git a/tests/pipelines/vq_diffusion/test_vq_diffusion.py b/tests/pipelines/vq_diffusion/test_vq_diffusion.py index baf13d05eb86..3f5ef16cff72 100644 --- a/tests/pipelines/vq_diffusion/test_vq_diffusion.py +++ b/tests/pipelines/vq_diffusion/test_vq_diffusion.py @@ -26,7 +26,7 @@ from diffusers.utils.testing_utils import require_torch_gpu - +torch.backends.cuda.matmul.allow_tf32 = False class VQDiffusionPipelineFastTests(unittest.TestCase): diff --git a/tests/schedulers/test_schedulers.py b/tests/schedulers/test_schedulers.py index 8814751098a3..69cddb36dde2 100755 --- a/tests/schedulers/test_schedulers.py +++ b/tests/schedulers/test_schedulers.py @@ -37,7 +37,7 @@ from diffusers.utils.testing_utils import CaptureLogger - +torch.backends.cuda.matmul.allow_tf32 = False class SchedulerObject(SchedulerMixin, ConfigMixin): From 0a729043f1c55e1e707ec3e1ace32969b597ca3a Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 00:50:42 +0200 Subject: [PATCH 04/20] fix more --- tests/models/test_layers_utils.py | 3 --- tests/models/test_models_unet_1d.py | 3 --- tests/models/test_models_vae.py | 5 +---- tests/models/test_models_vq.py | 5 +---- tests/others/test_ema.py | 5 +---- tests/pipelines/altdiffusion/test_alt_diffusion.py | 5 +---- tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py | 5 +---- tests/pipelines/audio_diffusion/test_audio_diffusion.py | 5 +---- tests/pipelines/audioldm/test_audioldm.py | 5 +---- tests/pipelines/controlnet/test_controlnet.py | 5 +---- tests/pipelines/controlnet/test_controlnet_img2img.py | 5 +---- tests/pipelines/controlnet/test_controlnet_inpaint.py | 5 +---- tests/pipelines/dance_diffusion/test_dance_diffusion.py | 4 +--- tests/pipelines/ddim/test_ddim.py | 4 +--- tests/pipelines/ddpm/test_ddpm.py | 4 +--- tests/pipelines/dit/test_dit.py | 4 +--- tests/pipelines/karras_ve/test_karras_ve.py | 4 +--- tests/pipelines/latent_diffusion/test_latent_diffusion.py | 4 +--- .../test_latent_diffusion_superresolution.py | 4 +--- .../latent_diffusion/test_latent_diffusion_uncond.py | 4 +--- tests/pipelines/paint_by_example/test_paint_by_example.py | 5 +---- tests/pipelines/pndm/test_pndm.py | 4 +--- tests/pipelines/repaint/test_repaint.py | 5 +---- tests/pipelines/score_sde_ve/test_score_sde_ve.py | 4 +--- .../semantic_stable_diffusion/test_semantic_diffusion.py | 4 +--- .../spectrogram_diffusion/test_spectrogram_diffusion.py | 4 +--- tests/pipelines/stable_diffusion/test_cycle_diffusion.py | 5 +---- tests/pipelines/stable_diffusion/test_stable_diffusion.py | 5 +---- .../test_stable_diffusion_image_variation.py | 5 +---- .../stable_diffusion/test_stable_diffusion_img2img.py | 5 +---- .../stable_diffusion/test_stable_diffusion_inpaint.py | 5 +---- .../stable_diffusion/test_stable_diffusion_inpaint_legacy.py | 5 +---- .../test_stable_diffusion_instruction_pix2pix.py | 5 +---- .../stable_diffusion/test_stable_diffusion_k_diffusion.py | 4 +--- .../stable_diffusion/test_stable_diffusion_model_editing.py | 5 +---- .../stable_diffusion/test_stable_diffusion_panorama.py | 5 +---- .../stable_diffusion/test_stable_diffusion_pix2pix_zero.py | 5 +---- .../pipelines/stable_diffusion/test_stable_diffusion_sag.py | 5 +---- tests/pipelines/stable_diffusion_2/test_stable_diffusion.py | 5 +---- .../stable_diffusion_2/test_stable_diffusion_depth.py | 5 +---- .../stable_diffusion_2/test_stable_diffusion_diffedit.py | 5 +---- .../stable_diffusion_2/test_stable_diffusion_inpaint.py | 5 +---- .../test_stable_diffusion_latent_upscale.py | 4 +--- .../stable_diffusion_2/test_stable_diffusion_upscale.py | 4 +--- .../stable_diffusion_2/test_stable_diffusion_v_pred.py | 5 +---- tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py | 3 --- tests/pipelines/stable_unclip/test_stable_unclip.py | 5 +---- tests/pipelines/stable_unclip/test_stable_unclip_img2img.py | 5 +---- tests/pipelines/test_pipelines.py | 5 +---- tests/pipelines/test_pipelines_common.py | 3 --- tests/pipelines/text_to_video/test_text_to_video.py | 5 +---- tests/pipelines/unclip/test_unclip.py | 5 +---- tests/pipelines/unclip/test_unclip_image_variation.py | 5 +---- 53 files changed, 49 insertions(+), 193 deletions(-) diff --git a/tests/models/test_layers_utils.py b/tests/models/test_layers_utils.py index ea499ff5cab5..b438b2ddb4af 100644 --- a/tests/models/test_layers_utils.py +++ b/tests/models/test_layers_utils.py @@ -27,9 +27,6 @@ from diffusers.utils import torch_device - - - class EmbeddingsTests(unittest.TestCase): def test_timestep_embeddings(self): embedding_dim = 256 diff --git a/tests/models/test_models_unet_1d.py b/tests/models/test_models_unet_1d.py index 15253097cd86..9fb1a61011e3 100644 --- a/tests/models/test_models_unet_1d.py +++ b/tests/models/test_models_unet_1d.py @@ -23,9 +23,6 @@ from .test_modeling_common import ModelTesterMixin - - - class UNet1DModelTests(ModelTesterMixin, unittest.TestCase): model_class = UNet1DModel diff --git a/tests/models/test_models_vae.py b/tests/models/test_models_vae.py index 4cea743c750f..952930725fe9 100644 --- a/tests/models/test_models_vae.py +++ b/tests/models/test_models_vae.py @@ -20,16 +20,13 @@ from parameterized import parameterized from diffusers import AutoencoderKL +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_hf_numpy, require_torch_gpu, slow, torch_all_close, torch_device from diffusers.utils.import_utils import is_xformers_available from .test_modeling_common import ModelTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/models/test_models_vq.py b/tests/models/test_models_vq.py index 5a8a488d37f7..2d68d7aa1fec 100644 --- a/tests/models/test_models_vq.py +++ b/tests/models/test_models_vq.py @@ -18,15 +18,12 @@ import torch from diffusers import VQModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, torch_device from .test_modeling_common import ModelTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/others/test_ema.py b/tests/others/test_ema.py index efc5069660d2..47dcb0e15481 100644 --- a/tests/others/test_ema.py +++ b/tests/others/test_ema.py @@ -19,14 +19,11 @@ import torch from diffusers import UNet2DConditionModel +from diffusers.testing_utils import enable_full_determinism from diffusers.training_utils import EMAModel from diffusers.utils.testing_utils import skip_mps, torch_device - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion.py b/tests/pipelines/altdiffusion/test_alt_diffusion.py index 46399467a0b7..afb0db427ffd 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion.py @@ -25,6 +25,7 @@ RobertaSeriesConfig, RobertaSeriesModelWithTransformation, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -32,10 +33,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py index c15ecf0c451d..a2f6044e7692 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py @@ -32,14 +32,11 @@ RobertaSeriesConfig, RobertaSeriesModelWithTransformation, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/audio_diffusion/test_audio_diffusion.py b/tests/pipelines/audio_diffusion/test_audio_diffusion.py index 12fab601f537..e3a671379448 100644 --- a/tests/pipelines/audio_diffusion/test_audio_diffusion.py +++ b/tests/pipelines/audio_diffusion/test_audio_diffusion.py @@ -29,14 +29,11 @@ UNet2DConditionModel, UNet2DModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/audioldm/test_audioldm.py b/tests/pipelines/audioldm/test_audioldm.py index a86ddcdb8853..6b22847cfe67 100644 --- a/tests/pipelines/audioldm/test_audioldm.py +++ b/tests/pipelines/audioldm/test_audioldm.py @@ -36,16 +36,13 @@ PNDMScheduler, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from ..pipeline_params import TEXT_TO_AUDIO_BATCH_PARAMS, TEXT_TO_AUDIO_PARAMS from ..test_pipelines_common import PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/controlnet/test_controlnet.py b/tests/pipelines/controlnet/test_controlnet.py index b4dee94198c0..0602607e639d 100644 --- a/tests/pipelines/controlnet/test_controlnet.py +++ b/tests/pipelines/controlnet/test_controlnet.py @@ -30,6 +30,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import require_torch_gpu @@ -41,10 +42,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/controlnet/test_controlnet_img2img.py b/tests/pipelines/controlnet/test_controlnet_img2img.py index e71d304393a4..6920318101a6 100644 --- a/tests/pipelines/controlnet/test_controlnet_img2img.py +++ b/tests/pipelines/controlnet/test_controlnet_img2img.py @@ -33,6 +33,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import require_torch_gpu @@ -44,10 +45,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/controlnet/test_controlnet_inpaint.py b/tests/pipelines/controlnet/test_controlnet_inpaint.py index e3dc2236d99f..4ee265331310 100644 --- a/tests/pipelines/controlnet/test_controlnet_inpaint.py +++ b/tests/pipelines/controlnet/test_controlnet_inpaint.py @@ -33,6 +33,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import require_torch_gpu @@ -44,10 +45,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/dance_diffusion/test_dance_diffusion.py b/tests/pipelines/dance_diffusion/test_dance_diffusion.py index 7af612dbb0ed..81fa72af54d3 100644 --- a/tests/pipelines/dance_diffusion/test_dance_diffusion.py +++ b/tests/pipelines/dance_diffusion/test_dance_diffusion.py @@ -20,6 +20,7 @@ import torch from diffusers import DanceDiffusionPipeline, IPNDMScheduler, UNet1DModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps @@ -27,9 +28,6 @@ from ..test_pipelines_common import PipelineTesterMixin -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/ddim/test_ddim.py b/tests/pipelines/ddim/test_ddim.py index 064ee4077ba2..d80c6993a31c 100644 --- a/tests/pipelines/ddim/test_ddim.py +++ b/tests/pipelines/ddim/test_ddim.py @@ -19,15 +19,13 @@ import torch from diffusers import DDIMPipeline, DDIMScheduler, UNet2DModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device from ..pipeline_params import UNCONDITIONAL_IMAGE_GENERATION_BATCH_PARAMS, UNCONDITIONAL_IMAGE_GENERATION_PARAMS from ..test_pipelines_common import PipelineTesterMixin -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/ddpm/test_ddpm.py b/tests/pipelines/ddpm/test_ddpm.py index b68be1a16d2c..7558543cbf98 100644 --- a/tests/pipelines/ddpm/test_ddpm.py +++ b/tests/pipelines/ddpm/test_ddpm.py @@ -19,10 +19,8 @@ import torch from diffusers import DDPMPipeline, DDPMScheduler, UNet2DModel -from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device - - from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/dit/test_dit.py b/tests/pipelines/dit/test_dit.py index 75d88060ea26..4131436f3a48 100644 --- a/tests/pipelines/dit/test_dit.py +++ b/tests/pipelines/dit/test_dit.py @@ -20,6 +20,7 @@ import torch from diffusers import AutoencoderKL, DDIMScheduler, DiTPipeline, DPMSolverMultistepScheduler, Transformer2DModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import is_xformers_available, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -30,9 +31,6 @@ from ..test_pipelines_common import PipelineTesterMixin -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/karras_ve/test_karras_ve.py b/tests/pipelines/karras_ve/test_karras_ve.py index 2fe0aeba7bed..01a2e06f13ac 100644 --- a/tests/pipelines/karras_ve/test_karras_ve.py +++ b/tests/pipelines/karras_ve/test_karras_ve.py @@ -19,10 +19,8 @@ import torch from diffusers import KarrasVePipeline, KarrasVeScheduler, UNet2DModel -from diffusers.utils.testing_utils import require_torch, slow, torch_device - - from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion.py b/tests/pipelines/latent_diffusion/test_latent_diffusion.py index 19c80e2768f4..b8c3d9bba9c8 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion.py @@ -21,15 +21,13 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, LDMTextToImagePipeline, UNet2DConditionModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import load_numpy, nightly, require_torch_gpu, slow, torch_device from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineTesterMixin -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py index 9d7d37959752..d3f665f27574 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py @@ -20,13 +20,11 @@ import torch from diffusers import DDIMScheduler, LDMSuperResolutionPipeline, UNet2DModel, VQModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import PIL_INTERPOLATION, floats_tensor, load_image, slow, torch_device from diffusers.utils.testing_utils import require_torch -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py index 3c067bece0be..24902ffc6f56 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py @@ -20,10 +20,8 @@ from transformers import CLIPTextConfig, CLIPTextModel from diffusers import DDIMScheduler, LDMPipeline, UNet2DModel, VQModel -from diffusers.utils.testing_utils import require_torch, slow, torch_device - - from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/paint_by_example/test_paint_by_example.py b/tests/pipelines/paint_by_example/test_paint_by_example.py index 793e18f9c3a7..d1965b8f5cc9 100644 --- a/tests/pipelines/paint_by_example/test_paint_by_example.py +++ b/tests/pipelines/paint_by_example/test_paint_by_example.py @@ -24,6 +24,7 @@ from diffusers import AutoencoderKL, PaintByExamplePipeline, PNDMScheduler, UNet2DConditionModel from diffusers.pipelines.paint_by_example import PaintByExampleImageEncoder +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -31,10 +32,6 @@ from ..test_pipelines_common import PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/pndm/test_pndm.py b/tests/pipelines/pndm/test_pndm.py index f85e9e5fbff2..bd8bbff38547 100644 --- a/tests/pipelines/pndm/test_pndm.py +++ b/tests/pipelines/pndm/test_pndm.py @@ -19,10 +19,8 @@ import torch from diffusers import PNDMPipeline, PNDMScheduler, UNet2DModel -from diffusers.utils.testing_utils import require_torch, slow, torch_device - - from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/repaint/test_repaint.py b/tests/pipelines/repaint/test_repaint.py index a671608a40a7..2dd29fc60160 100644 --- a/tests/pipelines/repaint/test_repaint.py +++ b/tests/pipelines/repaint/test_repaint.py @@ -20,16 +20,13 @@ import torch from diffusers import RePaintPipeline, RePaintScheduler, UNet2DModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import load_image, load_numpy, nightly, require_torch_gpu, skip_mps, torch_device from ..pipeline_params import IMAGE_INPAINTING_BATCH_PARAMS, IMAGE_INPAINTING_PARAMS from ..test_pipelines_common import PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/score_sde_ve/test_score_sde_ve.py b/tests/pipelines/score_sde_ve/test_score_sde_ve.py index 37161addb0bc..1627277ac320 100644 --- a/tests/pipelines/score_sde_ve/test_score_sde_ve.py +++ b/tests/pipelines/score_sde_ve/test_score_sde_ve.py @@ -19,10 +19,8 @@ import torch from diffusers import ScoreSdeVePipeline, ScoreSdeVeScheduler, UNet2DModel -from diffusers.utils.testing_utils import require_torch, slow, torch_device - - from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py index 0b5cd6df557c..447922152d0f 100644 --- a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py +++ b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py @@ -24,13 +24,11 @@ from diffusers import AutoencoderKL, DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler, UNet2DConditionModel from diffusers.pipelines.semantic_stable_diffusion import SemanticStableDiffusionPipeline as StableDiffusionPipeline +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, nightly, torch_device from diffusers.utils.testing_utils import require_torch_gpu -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py index 67748474fc2f..552d4f9690d8 100644 --- a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py +++ b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py @@ -21,6 +21,7 @@ from diffusers import DDPMScheduler, MidiProcessor, SpectrogramDiffusionPipeline from diffusers.pipelines.spectrogram_diffusion import SpectrogramContEncoder, SpectrogramNotesEncoder, T5FilmDecoder +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import require_torch_gpu, skip_mps, slow, torch_device from diffusers.utils.testing_utils import require_note_seq, require_onnxruntime @@ -28,9 +29,6 @@ from ..test_pipelines_common import PipelineTesterMixin -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py index ea74c0f14d6c..81a43b4aeafd 100644 --- a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py @@ -22,6 +22,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, CycleDiffusionPipeline, DDIMScheduler, UNet2DConditionModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps @@ -29,10 +30,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index 6e3dcaf90718..7af7683a9f03 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -38,6 +38,7 @@ logging, ) from diffusers.models.attention_processor import AttnProcessor +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import CaptureLogger, require_torch_gpu @@ -46,10 +47,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py index 4f5f45d942a1..c85ffd8cf109 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py @@ -29,6 +29,7 @@ StableDiffusionImageVariationPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -36,10 +37,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py index c9607586d2a4..13734a2e68d9 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py @@ -33,6 +33,7 @@ UNet2DConditionModel, ) from diffusers.image_processor import VaeImageProcessor +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps @@ -44,10 +45,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py index c68632b45124..e3ea90fb82e4 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py @@ -32,6 +32,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_inpaint import prepare_mask_and_masked_image +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -40,10 +41,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py index 7dbe78388087..a7c44e565660 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py @@ -33,14 +33,11 @@ UNet2DModel, VQModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, nightly, slow, torch_device from diffusers.utils.testing_utils import load_numpy, preprocess_image, require_torch_gpu - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py index f564808adfd8..53e24d79800d 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py @@ -31,6 +31,7 @@ StableDiffusionInstructPix2PixPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -38,10 +39,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py index 86ddcbdb95dc..304967f887fc 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py @@ -20,13 +20,11 @@ import torch from diffusers import StableDiffusionKDiffusionPipeline +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py index a4a3f78f517d..515f34482b3b 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py @@ -28,6 +28,7 @@ StableDiffusionModelEditingPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps @@ -35,10 +36,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py index 58ebc6a0d289..476d669674c2 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py @@ -29,6 +29,7 @@ StableDiffusionPanoramaPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps @@ -36,10 +37,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py index ad1040c8d00a..0fe5c6ca370a 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py @@ -32,6 +32,7 @@ StableDiffusionPix2PixZeroPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_numpy, slow, torch_device from diffusers.utils.testing_utils import load_image, load_pt, require_torch_gpu, skip_mps @@ -39,10 +40,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py index 82747a006616..ca2dff6baa97 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py @@ -26,6 +26,7 @@ StableDiffusionSAGPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -33,10 +34,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py index e0abc46ada8d..be97c3222ce9 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py @@ -32,6 +32,7 @@ UNet2DConditionModel, logging, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import CaptureLogger, require_torch_gpu @@ -39,10 +40,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py index 829520b4add2..7b6082e24435 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py @@ -39,6 +39,7 @@ StableDiffusionDepth2ImgPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, is_accelerate_available, @@ -55,10 +56,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py index 7c99407d053b..ec4e602855f2 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py @@ -32,6 +32,7 @@ StableDiffusionDiffEditPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import load_image, slow from diffusers.utils.testing_utils import floats_tensor, require_torch_gpu, torch_device @@ -39,10 +40,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py index 2c19fd1e083a..594d0ec8bdb5 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py @@ -23,6 +23,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, PNDMScheduler, StableDiffusionInpaintPipeline, UNet2DConditionModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, torch_device from diffusers.utils.testing_utils import require_torch_gpu, slow @@ -30,10 +31,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py index c7631d1c8f5f..c4721e7061da 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py @@ -28,6 +28,7 @@ StableDiffusionPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu @@ -35,9 +36,6 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py index e64aa953adcb..295d49fea350 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py @@ -23,13 +23,11 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, DDPMScheduler, StableDiffusionUpscalePipeline, UNet2DConditionModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py index 1dfeef0adae9..fd555d956f18 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py @@ -29,14 +29,11 @@ StableDiffusionPipeline, UNet2DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py b/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py index 2da1abb92105..09e31aacfbc9 100644 --- a/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py +++ b/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py @@ -28,9 +28,6 @@ from diffusers.utils.testing_utils import require_torch_gpu - - - class SafeDiffusionPipelineFastTests(unittest.TestCase): def tearDown(self): # clean up the VRAM after each test diff --git a/tests/pipelines/stable_unclip/test_stable_unclip.py b/tests/pipelines/stable_unclip/test_stable_unclip.py index af64aec15cc3..7f96175c9b59 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip.py @@ -13,16 +13,13 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.stable_unclip_image_normalizer import StableUnCLIPImageNormalizer +from diffusers.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import load_numpy, require_torch_gpu, slow, torch_device from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin, assert_mean_pixel_difference - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py index 0db1d784ccf1..a348cb938dd4 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py @@ -16,6 +16,7 @@ from diffusers import AutoencoderKL, DDIMScheduler, DDPMScheduler, StableUnCLIPImg2ImgPipeline, UNet2DConditionModel from diffusers.pipelines.pipeline_utils import DiffusionPipeline from diffusers.pipelines.stable_diffusion.stable_unclip_image_normalizer import StableUnCLIPImageNormalizer +from diffusers.testing_utils import enable_full_determinism from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import ( floats_tensor, @@ -35,10 +36,6 @@ ) - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/test_pipelines.py b/tests/pipelines/test_pipelines.py index 146731642dc6..34f31c6f330d 100644 --- a/tests/pipelines/test_pipelines.py +++ b/tests/pipelines/test_pipelines.py @@ -54,6 +54,7 @@ logging, ) from diffusers.schedulers.scheduling_utils import SCHEDULER_CONFIG_NAME +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import ( CONFIG_NAME, WEIGHTS_NAME, @@ -73,10 +74,6 @@ ) - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py index fcbf2b1c9b62..3984ed76edce 100644 --- a/tests/pipelines/test_pipelines_common.py +++ b/tests/pipelines/test_pipelines_common.py @@ -18,9 +18,6 @@ from diffusers.utils.testing_utils import require_torch, torch_device - - - def to_np(tensor): if isinstance(tensor, torch.Tensor): tensor = tensor.detach().cpu().numpy() diff --git a/tests/pipelines/text_to_video/test_text_to_video.py b/tests/pipelines/text_to_video/test_text_to_video.py index e5ea390f0aea..82dc1771a67e 100644 --- a/tests/pipelines/text_to_video/test_text_to_video.py +++ b/tests/pipelines/text_to_video/test_text_to_video.py @@ -26,16 +26,13 @@ TextToVideoSDPipeline, UNet3DConditionModel, ) +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, skip_mps, slow from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineTesterMixin - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/unclip/test_unclip.py b/tests/pipelines/unclip/test_unclip.py index a23188a0eb29..34e580956fa9 100644 --- a/tests/pipelines/unclip/test_unclip.py +++ b/tests/pipelines/unclip/test_unclip.py @@ -22,6 +22,7 @@ from diffusers import PriorTransformer, UnCLIPPipeline, UnCLIPScheduler, UNet2DConditionModel, UNet2DModel from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps @@ -29,10 +30,6 @@ from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/pipelines/unclip/test_unclip_image_variation.py b/tests/pipelines/unclip/test_unclip_image_variation.py index 78eb898b7e97..bcdb8c60a180 100644 --- a/tests/pipelines/unclip/test_unclip_image_variation.py +++ b/tests/pipelines/unclip/test_unclip_image_variation.py @@ -36,6 +36,7 @@ UNet2DModel, ) from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_numpy, slow, torch_device from diffusers.utils.testing_utils import load_image, require_torch_gpu, skip_mps @@ -43,10 +44,6 @@ from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() From 5a7ccbc40071d6a1fd26d01f398cf869079c5922 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 00:51:52 +0200 Subject: [PATCH 05/20] fix more --- tests/models/test_models_unet_2d.py | 4 +--- tests/models/test_models_unet_2d_condition.py | 4 +--- tests/models/test_models_unet_3d_condition.py | 8 +++----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tests/models/test_models_unet_2d.py b/tests/models/test_models_unet_2d.py index ae17b8fb2ff1..27597f787978 100644 --- a/tests/models/test_models_unet_2d.py +++ b/tests/models/test_models_unet_2d.py @@ -20,6 +20,7 @@ import torch from diffusers import UNet2DModel +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, logging, slow, torch_all_close, torch_device from .test_modeling_common import ModelTesterMixin @@ -27,9 +28,6 @@ logger = logging.get_logger(__name__) -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/models/test_models_unet_2d_condition.py b/tests/models/test_models_unet_2d_condition.py index 6953405adc5d..41ec1cb6baf7 100644 --- a/tests/models/test_models_unet_2d_condition.py +++ b/tests/models/test_models_unet_2d_condition.py @@ -23,6 +23,7 @@ from diffusers import UNet2DConditionModel from diffusers.models.attention_processor import CustomDiffusionAttnProcessor, LoRAAttnProcessor +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, load_hf_numpy, @@ -39,9 +40,6 @@ logger = logging.get_logger(__name__) -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() diff --git a/tests/models/test_models_unet_3d_condition.py b/tests/models/test_models_unet_3d_condition.py index 1a807b738fff..d93d998b82cd 100644 --- a/tests/models/test_models_unet_3d_condition.py +++ b/tests/models/test_models_unet_3d_condition.py @@ -22,6 +22,7 @@ from diffusers.models import ModelMixin, UNet3DConditionModel from diffusers.models.attention_processor import AttnProcessor, LoRAAttnProcessor +from diffusers.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, logging, @@ -33,13 +34,10 @@ from .test_modeling_common import ModelTesterMixin -logger = logging.get_logger(__name__) - -from diffusers.testing_utils import enable_full_determinism - - enable_full_determinism() +logger = logging.get_logger(__name__) + def create_lora_layers(model, mock_weights: bool = True): lora_attn_procs = {} From 65d40a58125586f0d9a9b6d830ccb08d0e5e18c8 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 00:54:08 +0200 Subject: [PATCH 06/20] Check it --- .github/workflows/push_tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 749da4dea81a..2b8977d5ef1f 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -1,7 +1,8 @@ name: Slow tests on main on: - push: + # push: + pull_request: branches: - main From b77275372a9e659ae135d483d7e943c07727d655 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 01:01:38 +0200 Subject: [PATCH 07/20] Remove 16:8 --- .github/workflows/push_tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 2b8977d5ef1f..4ab3172f2827 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -71,8 +71,6 @@ jobs: if: ${{ matrix.config.framework == 'pytorch' }} env: HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }} - # https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms - CUBLAS_WORKSPACE_CONFIG: :16:8 run: | python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \ From fe9b059e48f9dd82463dafd02f0ffb032c0ef25b Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 01:06:18 +0200 Subject: [PATCH 08/20] fix more --- src/diffusers/training_utils.py | 35 ------------------ src/diffusers/utils/testing_utils.py | 37 +++++++++++++++++++ tests/models/test_models_unet_2d.py | 2 +- tests/models/test_models_unet_2d_condition.py | 2 +- tests/models/test_models_unet_3d_condition.py | 2 +- tests/models/test_models_vae.py | 2 +- tests/models/test_models_vq.py | 2 +- tests/others/test_ema.py | 2 +- .../altdiffusion/test_alt_diffusion.py | 2 +- .../test_alt_diffusion_img2img.py | 2 +- .../audio_diffusion/test_audio_diffusion.py | 2 +- tests/pipelines/audioldm/test_audioldm.py | 2 +- tests/pipelines/controlnet/test_controlnet.py | 2 +- .../controlnet/test_controlnet_img2img.py | 2 +- .../controlnet/test_controlnet_inpaint.py | 2 +- .../dance_diffusion/test_dance_diffusion.py | 2 +- tests/pipelines/ddim/test_ddim.py | 2 +- tests/pipelines/ddpm/test_ddpm.py | 2 +- tests/pipelines/dit/test_dit.py | 2 +- tests/pipelines/karras_ve/test_karras_ve.py | 2 +- .../latent_diffusion/test_latent_diffusion.py | 2 +- .../test_latent_diffusion_superresolution.py | 2 +- .../test_latent_diffusion_uncond.py | 2 +- .../paint_by_example/test_paint_by_example.py | 2 +- tests/pipelines/pndm/test_pndm.py | 2 +- tests/pipelines/repaint/test_repaint.py | 2 +- .../score_sde_ve/test_score_sde_ve.py | 2 +- .../test_semantic_diffusion.py | 2 +- .../test_spectrogram_diffusion.py | 2 +- .../stable_diffusion/test_cycle_diffusion.py | 2 +- .../stable_diffusion/test_stable_diffusion.py | 2 +- .../test_stable_diffusion_image_variation.py | 2 +- .../test_stable_diffusion_img2img.py | 2 +- .../test_stable_diffusion_inpaint.py | 2 +- .../test_stable_diffusion_inpaint_legacy.py | 2 +- ...st_stable_diffusion_instruction_pix2pix.py | 2 +- .../test_stable_diffusion_k_diffusion.py | 2 +- .../test_stable_diffusion_model_editing.py | 2 +- .../test_stable_diffusion_panorama.py | 2 +- .../test_stable_diffusion_pix2pix_zero.py | 2 +- .../test_stable_diffusion_sag.py | 2 +- .../test_stable_diffusion.py | 2 +- .../test_stable_diffusion_depth.py | 2 +- .../test_stable_diffusion_diffedit.py | 2 +- .../test_stable_diffusion_inpaint.py | 2 +- .../test_stable_diffusion_latent_upscale.py | 2 +- .../test_stable_diffusion_upscale.py | 2 +- .../test_stable_diffusion_v_pred.py | 2 +- .../stable_unclip/test_stable_unclip.py | 2 +- .../test_stable_unclip_img2img.py | 2 +- tests/pipelines/test_pipelines.py | 2 +- .../text_to_video/test_text_to_video.py | 2 +- tests/pipelines/unclip/test_unclip.py | 2 +- .../unclip/test_unclip_image_variation.py | 2 +- 54 files changed, 89 insertions(+), 87 deletions(-) diff --git a/src/diffusers/training_utils.py b/src/diffusers/training_utils.py index 88c9f01b24d9..2aabdf670cde 100644 --- a/src/diffusers/training_utils.py +++ b/src/diffusers/training_utils.py @@ -14,41 +14,6 @@ import transformers -def enable_full_determinism(seed: Optional[int] = None): - """ - Helper function for reproducible behavior during distributed training. See - - https://pytorch.org/docs/stable/notes/randomness.html for pytorch - """ - # set seed first - if seed is not None: - set_seed(seed) - - # Enable PyTorch deterministic mode. This potentially requires either the environment - # variable 'CUDA_LAUNCH_BLOCKING' or 'CUBLAS_WORKSPACE_CONFIG' to be set, - # depending on the CUDA version, so we set them both here - os.environ["CUDA_LAUNCH_BLOCKING"] = "1" - os.environ["CUBLAS_WORKSPACE_CONFIG"] = ":16:8" - torch.use_deterministic_algorithms(True) - - # Enable CUDNN deterministic mode - torch.backends.cudnn.deterministic = True - torch.backends.cudnn.benchmark = False - torch.backends.cuda.matmul.allow_tf32 = False - - -def set_seed(seed: int): - """ - Args: - Helper function for reproducible behavior to set the seed in `random`, `numpy`, `torch`. - seed (`int`): The seed to set. - """ - random.seed(seed) - np.random.seed(seed) - torch.manual_seed(seed) - torch.cuda.manual_seed_all(seed) - # ^^ safe to call this function even if cuda is not available - - # Adapted from torch-ema https://github.com/fadel/pytorch_ema/blob/master/torch_ema/ema.py#L14 class EMAModel: """ diff --git a/src/diffusers/utils/testing_utils.py b/src/diffusers/utils/testing_utils.py index 4ad7d97b4462..95647567e190 100644 --- a/src/diffusers/utils/testing_utils.py +++ b/src/diffusers/utils/testing_utils.py @@ -514,3 +514,40 @@ def __exit__(self, *exc): def __repr__(self): return f"captured: {self.out}\n" + + +def enable_full_determinism(seed: Optional[int] = None): + """ + Helper function for reproducible behavior during distributed training. See + - https://pytorch.org/docs/stable/notes/randomness.html for pytorch + """ + # set seed first + if seed is not None: + set_seed(seed) + + # Enable PyTorch deterministic mode. This potentially requires either the environment + # variable 'CUDA_LAUNCH_BLOCKING' or 'CUBLAS_WORKSPACE_CONFIG' to be set, + # depending on the CUDA version, so we set them both here + os.environ["CUDA_LAUNCH_BLOCKING"] = "1" + os.environ["CUBLAS_WORKSPACE_CONFIG"] = ":16:8" + torch.use_deterministic_algorithms(True) + + # Enable CUDNN deterministic mode + torch.backends.cudnn.deterministic = True + torch.backends.cudnn.benchmark = False + torch.backends.cuda.matmul.allow_tf32 = False + + +def set_seed(seed: int): + """ + Args: + Helper function for reproducible behavior to set the seed in `random`, `numpy`, `torch`. + seed (`int`): The seed to set. + """ + random.seed(seed) + np.random.seed(seed) + torch.manual_seed(seed) + torch.cuda.manual_seed_all(seed) + # ^^ safe to call this function even if cuda is not available + + diff --git a/tests/models/test_models_unet_2d.py b/tests/models/test_models_unet_2d.py index 27597f787978..7a53a60b513f 100644 --- a/tests/models/test_models_unet_2d.py +++ b/tests/models/test_models_unet_2d.py @@ -20,7 +20,7 @@ import torch from diffusers import UNet2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, logging, slow, torch_all_close, torch_device from .test_modeling_common import ModelTesterMixin diff --git a/tests/models/test_models_unet_2d_condition.py b/tests/models/test_models_unet_2d_condition.py index 41ec1cb6baf7..73bea548d235 100644 --- a/tests/models/test_models_unet_2d_condition.py +++ b/tests/models/test_models_unet_2d_condition.py @@ -23,7 +23,7 @@ from diffusers import UNet2DConditionModel from diffusers.models.attention_processor import CustomDiffusionAttnProcessor, LoRAAttnProcessor -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, load_hf_numpy, diff --git a/tests/models/test_models_unet_3d_condition.py b/tests/models/test_models_unet_3d_condition.py index d93d998b82cd..57009e27266f 100644 --- a/tests/models/test_models_unet_3d_condition.py +++ b/tests/models/test_models_unet_3d_condition.py @@ -22,7 +22,7 @@ from diffusers.models import ModelMixin, UNet3DConditionModel from diffusers.models.attention_processor import AttnProcessor, LoRAAttnProcessor -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, logging, diff --git a/tests/models/test_models_vae.py b/tests/models/test_models_vae.py index 952930725fe9..1e554ded46c1 100644 --- a/tests/models/test_models_vae.py +++ b/tests/models/test_models_vae.py @@ -20,7 +20,7 @@ from parameterized import parameterized from diffusers import AutoencoderKL -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_hf_numpy, require_torch_gpu, slow, torch_all_close, torch_device from diffusers.utils.import_utils import is_xformers_available diff --git a/tests/models/test_models_vq.py b/tests/models/test_models_vq.py index 2d68d7aa1fec..1766860c03d6 100644 --- a/tests/models/test_models_vq.py +++ b/tests/models/test_models_vq.py @@ -18,7 +18,7 @@ import torch from diffusers import VQModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, torch_device from .test_modeling_common import ModelTesterMixin diff --git a/tests/others/test_ema.py b/tests/others/test_ema.py index 47dcb0e15481..915b4c00b74d 100644 --- a/tests/others/test_ema.py +++ b/tests/others/test_ema.py @@ -19,7 +19,7 @@ import torch from diffusers import UNet2DConditionModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.training_utils import EMAModel from diffusers.utils.testing_utils import skip_mps, torch_device diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion.py b/tests/pipelines/altdiffusion/test_alt_diffusion.py index afb0db427ffd..f58345af3d12 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion.py @@ -25,7 +25,7 @@ RobertaSeriesConfig, RobertaSeriesModelWithTransformation, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py index a2f6044e7692..5be3e0bc3303 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py @@ -32,7 +32,7 @@ RobertaSeriesConfig, RobertaSeriesModelWithTransformation, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/audio_diffusion/test_audio_diffusion.py b/tests/pipelines/audio_diffusion/test_audio_diffusion.py index e3a671379448..a05f8f3c13d2 100644 --- a/tests/pipelines/audio_diffusion/test_audio_diffusion.py +++ b/tests/pipelines/audio_diffusion/test_audio_diffusion.py @@ -29,7 +29,7 @@ UNet2DConditionModel, UNet2DModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/audioldm/test_audioldm.py b/tests/pipelines/audioldm/test_audioldm.py index 6b22847cfe67..18ee00cd4ceb 100644 --- a/tests/pipelines/audioldm/test_audioldm.py +++ b/tests/pipelines/audioldm/test_audioldm.py @@ -36,7 +36,7 @@ PNDMScheduler, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from ..pipeline_params import TEXT_TO_AUDIO_BATCH_PARAMS, TEXT_TO_AUDIO_PARAMS diff --git a/tests/pipelines/controlnet/test_controlnet.py b/tests/pipelines/controlnet/test_controlnet.py index 0602607e639d..82049a8c5177 100644 --- a/tests/pipelines/controlnet/test_controlnet.py +++ b/tests/pipelines/controlnet/test_controlnet.py @@ -30,7 +30,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/controlnet/test_controlnet_img2img.py b/tests/pipelines/controlnet/test_controlnet_img2img.py index 6920318101a6..1015fc8fa890 100644 --- a/tests/pipelines/controlnet/test_controlnet_img2img.py +++ b/tests/pipelines/controlnet/test_controlnet_img2img.py @@ -33,7 +33,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/controlnet/test_controlnet_inpaint.py b/tests/pipelines/controlnet/test_controlnet_inpaint.py index 4ee265331310..493e9e471698 100644 --- a/tests/pipelines/controlnet/test_controlnet_inpaint.py +++ b/tests/pipelines/controlnet/test_controlnet_inpaint.py @@ -33,7 +33,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/dance_diffusion/test_dance_diffusion.py b/tests/pipelines/dance_diffusion/test_dance_diffusion.py index 81fa72af54d3..caf8b158cedf 100644 --- a/tests/pipelines/dance_diffusion/test_dance_diffusion.py +++ b/tests/pipelines/dance_diffusion/test_dance_diffusion.py @@ -20,7 +20,7 @@ import torch from diffusers import DanceDiffusionPipeline, IPNDMScheduler, UNet1DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps diff --git a/tests/pipelines/ddim/test_ddim.py b/tests/pipelines/ddim/test_ddim.py index d80c6993a31c..16bbef263da0 100644 --- a/tests/pipelines/ddim/test_ddim.py +++ b/tests/pipelines/ddim/test_ddim.py @@ -19,7 +19,7 @@ import torch from diffusers import DDIMPipeline, DDIMScheduler, UNet2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device from ..pipeline_params import UNCONDITIONAL_IMAGE_GENERATION_BATCH_PARAMS, UNCONDITIONAL_IMAGE_GENERATION_PARAMS diff --git a/tests/pipelines/ddpm/test_ddpm.py b/tests/pipelines/ddpm/test_ddpm.py index 7558543cbf98..a72dfa1ad12b 100644 --- a/tests/pipelines/ddpm/test_ddpm.py +++ b/tests/pipelines/ddpm/test_ddpm.py @@ -19,7 +19,7 @@ import torch from diffusers import DDPMPipeline, DDPMScheduler, UNet2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device diff --git a/tests/pipelines/dit/test_dit.py b/tests/pipelines/dit/test_dit.py index 4131436f3a48..b6cd66a14a46 100644 --- a/tests/pipelines/dit/test_dit.py +++ b/tests/pipelines/dit/test_dit.py @@ -20,7 +20,7 @@ import torch from diffusers import AutoencoderKL, DDIMScheduler, DiTPipeline, DPMSolverMultistepScheduler, Transformer2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import is_xformers_available, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/karras_ve/test_karras_ve.py b/tests/pipelines/karras_ve/test_karras_ve.py index 01a2e06f13ac..9b8269e381e4 100644 --- a/tests/pipelines/karras_ve/test_karras_ve.py +++ b/tests/pipelines/karras_ve/test_karras_ve.py @@ -19,7 +19,7 @@ import torch from diffusers import KarrasVePipeline, KarrasVeScheduler, UNet2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import require_torch, slow, torch_device diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion.py b/tests/pipelines/latent_diffusion/test_latent_diffusion.py index b8c3d9bba9c8..8a6701c2af3a 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion.py @@ -21,7 +21,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, LDMTextToImagePipeline, UNet2DConditionModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import load_numpy, nightly, require_torch_gpu, slow, torch_device from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py index d3f665f27574..f33e9be8093b 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py @@ -20,7 +20,7 @@ import torch from diffusers import DDIMScheduler, LDMSuperResolutionPipeline, UNet2DModel, VQModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import PIL_INTERPOLATION, floats_tensor, load_image, slow, torch_device from diffusers.utils.testing_utils import require_torch diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py index 24902ffc6f56..3ac3a9cec485 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py @@ -20,7 +20,7 @@ from transformers import CLIPTextConfig, CLIPTextModel from diffusers import DDIMScheduler, LDMPipeline, UNet2DModel, VQModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import require_torch, slow, torch_device diff --git a/tests/pipelines/paint_by_example/test_paint_by_example.py b/tests/pipelines/paint_by_example/test_paint_by_example.py index d1965b8f5cc9..b515086238e8 100644 --- a/tests/pipelines/paint_by_example/test_paint_by_example.py +++ b/tests/pipelines/paint_by_example/test_paint_by_example.py @@ -24,7 +24,7 @@ from diffusers import AutoencoderKL, PaintByExamplePipeline, PNDMScheduler, UNet2DConditionModel from diffusers.pipelines.paint_by_example import PaintByExampleImageEncoder -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/pndm/test_pndm.py b/tests/pipelines/pndm/test_pndm.py index bd8bbff38547..12c20c978722 100644 --- a/tests/pipelines/pndm/test_pndm.py +++ b/tests/pipelines/pndm/test_pndm.py @@ -19,7 +19,7 @@ import torch from diffusers import PNDMPipeline, PNDMScheduler, UNet2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import require_torch, slow, torch_device diff --git a/tests/pipelines/repaint/test_repaint.py b/tests/pipelines/repaint/test_repaint.py index 2dd29fc60160..a32974dc1a7d 100644 --- a/tests/pipelines/repaint/test_repaint.py +++ b/tests/pipelines/repaint/test_repaint.py @@ -20,7 +20,7 @@ import torch from diffusers import RePaintPipeline, RePaintScheduler, UNet2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import load_image, load_numpy, nightly, require_torch_gpu, skip_mps, torch_device from ..pipeline_params import IMAGE_INPAINTING_BATCH_PARAMS, IMAGE_INPAINTING_PARAMS diff --git a/tests/pipelines/score_sde_ve/test_score_sde_ve.py b/tests/pipelines/score_sde_ve/test_score_sde_ve.py index 1627277ac320..8949f229aa8e 100644 --- a/tests/pipelines/score_sde_ve/test_score_sde_ve.py +++ b/tests/pipelines/score_sde_ve/test_score_sde_ve.py @@ -19,7 +19,7 @@ import torch from diffusers import ScoreSdeVePipeline, ScoreSdeVeScheduler, UNet2DModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import require_torch, slow, torch_device diff --git a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py index 447922152d0f..0d52bac229ba 100644 --- a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py +++ b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py @@ -24,7 +24,7 @@ from diffusers import AutoencoderKL, DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler, UNet2DConditionModel from diffusers.pipelines.semantic_stable_diffusion import SemanticStableDiffusionPipeline as StableDiffusionPipeline -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, nightly, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py index 552d4f9690d8..6806df985ef5 100644 --- a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py +++ b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py @@ -21,7 +21,7 @@ from diffusers import DDPMScheduler, MidiProcessor, SpectrogramDiffusionPipeline from diffusers.pipelines.spectrogram_diffusion import SpectrogramContEncoder, SpectrogramNotesEncoder, T5FilmDecoder -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import require_torch_gpu, skip_mps, slow, torch_device from diffusers.utils.testing_utils import require_note_seq, require_onnxruntime diff --git a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py index 81a43b4aeafd..3021d090d055 100644 --- a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py @@ -22,7 +22,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, CycleDiffusionPipeline, DDIMScheduler, UNet2DConditionModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index 7af7683a9f03..07e8068812b7 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -38,7 +38,7 @@ logging, ) from diffusers.models.attention_processor import AttnProcessor -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import CaptureLogger, require_torch_gpu diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py index c85ffd8cf109..e008080a8da8 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py @@ -29,7 +29,7 @@ StableDiffusionImageVariationPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py index 13734a2e68d9..455459bbfad4 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py @@ -33,7 +33,7 @@ UNet2DConditionModel, ) from diffusers.image_processor import VaeImageProcessor -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py index e3ea90fb82e4..01c9e6c00b7b 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py @@ -32,7 +32,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_inpaint import prepare_mask_and_masked_image -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py index a7c44e565660..07b2c24869cc 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py @@ -33,7 +33,7 @@ UNet2DModel, VQModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, nightly, slow, torch_device from diffusers.utils.testing_utils import load_numpy, preprocess_image, require_torch_gpu diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py index 53e24d79800d..bade65557840 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py @@ -31,7 +31,7 @@ StableDiffusionInstructPix2PixPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py index 304967f887fc..a1b79fa5ac55 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py @@ -20,7 +20,7 @@ import torch from diffusers import StableDiffusionKDiffusionPipeline -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py index 515f34482b3b..10aa83e8e022 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py @@ -28,7 +28,7 @@ StableDiffusionModelEditingPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py index 476d669674c2..2abc74ce9483 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py @@ -29,7 +29,7 @@ StableDiffusionPanoramaPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py index 0fe5c6ca370a..d5aba7529b0d 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py @@ -32,7 +32,7 @@ StableDiffusionPix2PixZeroPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_numpy, slow, torch_device from diffusers.utils.testing_utils import load_image, load_pt, require_torch_gpu, skip_mps diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py index ca2dff6baa97..a17b10c9a50e 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py @@ -26,7 +26,7 @@ StableDiffusionSAGPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py index be97c3222ce9..0116f5c1a05f 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py @@ -32,7 +32,7 @@ UNet2DConditionModel, logging, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import CaptureLogger, require_torch_gpu diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py index 7b6082e24435..a291135f478d 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py @@ -39,7 +39,7 @@ StableDiffusionDepth2ImgPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, is_accelerate_available, diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py index ec4e602855f2..5a76768bd55d 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py @@ -32,7 +32,7 @@ StableDiffusionDiffEditPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_image, slow from diffusers.utils.testing_utils import floats_tensor, require_torch_gpu, torch_device diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py index 594d0ec8bdb5..216ebc5208c1 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py @@ -23,7 +23,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, PNDMScheduler, StableDiffusionInpaintPipeline, UNet2DConditionModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, torch_device from diffusers.utils.testing_utils import require_torch_gpu, slow diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py index c4721e7061da..638c1a1e20f7 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py @@ -28,7 +28,7 @@ StableDiffusionPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py index 295d49fea350..9c89811bf736 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py @@ -23,7 +23,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, DDPMScheduler, StableDiffusionUpscalePipeline, UNet2DConditionModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py index fd555d956f18..25dff9a360fe 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py @@ -29,7 +29,7 @@ StableDiffusionPipeline, UNet2DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu diff --git a/tests/pipelines/stable_unclip/test_stable_unclip.py b/tests/pipelines/stable_unclip/test_stable_unclip.py index 7f96175c9b59..f46a6e60714d 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip.py @@ -13,7 +13,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.stable_unclip_image_normalizer import StableUnCLIPImageNormalizer -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.testing_utils import load_numpy, require_torch_gpu, slow, torch_device from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS diff --git a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py index a348cb938dd4..21783f46cc57 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py @@ -16,7 +16,7 @@ from diffusers import AutoencoderKL, DDIMScheduler, DDPMScheduler, StableUnCLIPImg2ImgPipeline, UNet2DConditionModel from diffusers.pipelines.pipeline_utils import DiffusionPipeline from diffusers.pipelines.stable_diffusion.stable_unclip_image_normalizer import StableUnCLIPImageNormalizer -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import ( floats_tensor, diff --git a/tests/pipelines/test_pipelines.py b/tests/pipelines/test_pipelines.py index 34f31c6f330d..05026d36441f 100644 --- a/tests/pipelines/test_pipelines.py +++ b/tests/pipelines/test_pipelines.py @@ -54,7 +54,7 @@ logging, ) from diffusers.schedulers.scheduling_utils import SCHEDULER_CONFIG_NAME -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( CONFIG_NAME, WEIGHTS_NAME, diff --git a/tests/pipelines/text_to_video/test_text_to_video.py b/tests/pipelines/text_to_video/test_text_to_video.py index 82dc1771a67e..3e7c8a7b9588 100644 --- a/tests/pipelines/text_to_video/test_text_to_video.py +++ b/tests/pipelines/text_to_video/test_text_to_video.py @@ -26,7 +26,7 @@ TextToVideoSDPipeline, UNet3DConditionModel, ) -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, skip_mps, slow from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS diff --git a/tests/pipelines/unclip/test_unclip.py b/tests/pipelines/unclip/test_unclip.py index 34e580956fa9..374a0ff666ad 100644 --- a/tests/pipelines/unclip/test_unclip.py +++ b/tests/pipelines/unclip/test_unclip.py @@ -22,7 +22,7 @@ from diffusers import PriorTransformer, UnCLIPPipeline, UnCLIPScheduler, UNet2DConditionModel, UNet2DModel from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device from diffusers.utils.testing_utils import require_torch_gpu, skip_mps diff --git a/tests/pipelines/unclip/test_unclip_image_variation.py b/tests/pipelines/unclip/test_unclip_image_variation.py index bcdb8c60a180..0b16b1f0dff3 100644 --- a/tests/pipelines/unclip/test_unclip_image_variation.py +++ b/tests/pipelines/unclip/test_unclip_image_variation.py @@ -36,7 +36,7 @@ UNet2DModel, ) from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel -from diffusers.testing_utils import enable_full_determinism +from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_numpy, slow, torch_device from diffusers.utils.testing_utils import load_image, require_torch_gpu, skip_mps From 7926218331172550e6014057f3e55fed3ed693d6 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 01:06:43 +0200 Subject: [PATCH 09/20] fix more --- src/diffusers/training_utils.py | 3 --- src/diffusers/utils/testing_utils.py | 2 -- tests/models/test_models_unet_2d.py | 2 +- tests/models/test_models_unet_2d_condition.py | 2 +- tests/models/test_models_unet_3d_condition.py | 2 +- tests/models/test_models_vae.py | 2 +- tests/models/test_models_vq.py | 2 +- tests/others/test_ema.py | 3 +-- tests/pipelines/altdiffusion/test_alt_diffusion.py | 3 +-- .../altdiffusion/test_alt_diffusion_img2img.py | 3 +-- .../pipelines/audio_diffusion/test_audio_diffusion.py | 3 +-- tests/pipelines/audioldm/test_audioldm.py | 2 +- tests/pipelines/controlnet/test_controlnet.py | 3 +-- tests/pipelines/controlnet/test_controlnet_img2img.py | 3 +-- tests/pipelines/controlnet/test_controlnet_inpaint.py | 3 +-- .../pipelines/dance_diffusion/test_dance_diffusion.py | 3 +-- tests/pipelines/ddim/test_ddim.py | 3 +-- tests/pipelines/ddpm/test_ddpm.py | 3 +-- tests/pipelines/dit/test_dit.py | 3 +-- tests/pipelines/karras_ve/test_karras_ve.py | 3 +-- .../latent_diffusion/test_latent_diffusion.py | 10 ++++++++-- .../test_latent_diffusion_superresolution.py | 3 +-- .../latent_diffusion/test_latent_diffusion_uncond.py | 3 +-- .../paint_by_example/test_paint_by_example.py | 3 +-- tests/pipelines/pndm/test_pndm.py | 3 +-- tests/pipelines/repaint/test_repaint.py | 11 +++++++++-- tests/pipelines/score_sde_ve/test_score_sde_ve.py | 3 +-- .../test_semantic_diffusion.py | 3 +-- .../test_spectrogram_diffusion.py | 3 +-- .../stable_diffusion/test_cycle_diffusion.py | 3 +-- .../stable_diffusion/test_stable_diffusion.py | 3 +-- .../test_stable_diffusion_image_variation.py | 3 +-- .../stable_diffusion/test_stable_diffusion_img2img.py | 3 +-- .../stable_diffusion/test_stable_diffusion_inpaint.py | 3 +-- .../test_stable_diffusion_inpaint_legacy.py | 3 +-- .../test_stable_diffusion_instruction_pix2pix.py | 3 +-- .../test_stable_diffusion_k_diffusion.py | 3 +-- .../test_stable_diffusion_model_editing.py | 3 +-- .../test_stable_diffusion_panorama.py | 3 +-- .../test_stable_diffusion_pix2pix_zero.py | 3 +-- .../stable_diffusion/test_stable_diffusion_sag.py | 3 +-- .../stable_diffusion_2/test_stable_diffusion.py | 3 +-- .../stable_diffusion_2/test_stable_diffusion_depth.py | 3 +-- .../test_stable_diffusion_diffedit.py | 3 +-- .../test_stable_diffusion_inpaint.py | 3 +-- .../test_stable_diffusion_latent_upscale.py | 3 +-- .../test_stable_diffusion_upscale.py | 3 +-- .../test_stable_diffusion_v_pred.py | 3 +-- tests/pipelines/stable_unclip/test_stable_unclip.py | 3 +-- .../stable_unclip/test_stable_unclip_img2img.py | 2 +- tests/pipelines/test_pipelines.py | 2 +- tests/pipelines/text_to_video/test_text_to_video.py | 2 +- tests/pipelines/unclip/test_unclip.py | 3 +-- tests/pipelines/unclip/test_unclip_image_variation.py | 3 +-- 54 files changed, 67 insertions(+), 100 deletions(-) diff --git a/src/diffusers/training_utils.py b/src/diffusers/training_utils.py index 2aabdf670cde..89a385d098d6 100644 --- a/src/diffusers/training_utils.py +++ b/src/diffusers/training_utils.py @@ -1,10 +1,7 @@ import contextlib import copy -import os -import random from typing import Any, Dict, Iterable, Optional, Union -import numpy as np import torch from .utils import deprecate, is_transformers_available diff --git a/src/diffusers/utils/testing_utils.py b/src/diffusers/utils/testing_utils.py index 95647567e190..6cd4a9b82cc5 100644 --- a/src/diffusers/utils/testing_utils.py +++ b/src/diffusers/utils/testing_utils.py @@ -549,5 +549,3 @@ def set_seed(seed: int): torch.manual_seed(seed) torch.cuda.manual_seed_all(seed) # ^^ safe to call this function even if cuda is not available - - diff --git a/tests/models/test_models_unet_2d.py b/tests/models/test_models_unet_2d.py index 7a53a60b513f..92a5664daa2b 100644 --- a/tests/models/test_models_unet_2d.py +++ b/tests/models/test_models_unet_2d.py @@ -20,8 +20,8 @@ import torch from diffusers import UNet2DModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, logging, slow, torch_all_close, torch_device +from diffusers.utils.testing_utils import enable_full_determinism from .test_modeling_common import ModelTesterMixin diff --git a/tests/models/test_models_unet_2d_condition.py b/tests/models/test_models_unet_2d_condition.py index 73bea548d235..43a487a32b43 100644 --- a/tests/models/test_models_unet_2d_condition.py +++ b/tests/models/test_models_unet_2d_condition.py @@ -23,7 +23,6 @@ from diffusers import UNet2DConditionModel from diffusers.models.attention_processor import CustomDiffusionAttnProcessor, LoRAAttnProcessor -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, load_hf_numpy, @@ -34,6 +33,7 @@ torch_device, ) from diffusers.utils.import_utils import is_xformers_available +from diffusers.utils.testing_utils import enable_full_determinism from .test_modeling_common import ModelTesterMixin diff --git a/tests/models/test_models_unet_3d_condition.py b/tests/models/test_models_unet_3d_condition.py index 57009e27266f..928f6bcbe960 100644 --- a/tests/models/test_models_unet_3d_condition.py +++ b/tests/models/test_models_unet_3d_condition.py @@ -22,7 +22,6 @@ from diffusers.models import ModelMixin, UNet3DConditionModel from diffusers.models.attention_processor import AttnProcessor, LoRAAttnProcessor -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, logging, @@ -30,6 +29,7 @@ torch_device, ) from diffusers.utils.import_utils import is_xformers_available +from diffusers.utils.testing_utils import enable_full_determinism from .test_modeling_common import ModelTesterMixin diff --git a/tests/models/test_models_vae.py b/tests/models/test_models_vae.py index 1e554ded46c1..3ffda657b5fa 100644 --- a/tests/models/test_models_vae.py +++ b/tests/models/test_models_vae.py @@ -20,9 +20,9 @@ from parameterized import parameterized from diffusers import AutoencoderKL -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_hf_numpy, require_torch_gpu, slow, torch_all_close, torch_device from diffusers.utils.import_utils import is_xformers_available +from diffusers.utils.testing_utils import enable_full_determinism from .test_modeling_common import ModelTesterMixin diff --git a/tests/models/test_models_vq.py b/tests/models/test_models_vq.py index 1766860c03d6..8ea6ef77ce63 100644 --- a/tests/models/test_models_vq.py +++ b/tests/models/test_models_vq.py @@ -18,8 +18,8 @@ import torch from diffusers import VQModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, torch_device +from diffusers.utils.testing_utils import enable_full_determinism from .test_modeling_common import ModelTesterMixin diff --git a/tests/others/test_ema.py b/tests/others/test_ema.py index 915b4c00b74d..32f7ae8a9a8e 100644 --- a/tests/others/test_ema.py +++ b/tests/others/test_ema.py @@ -19,9 +19,8 @@ import torch from diffusers import UNet2DConditionModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.training_utils import EMAModel -from diffusers.utils.testing_utils import skip_mps, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, skip_mps, torch_device enable_full_determinism() diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion.py b/tests/pipelines/altdiffusion/test_alt_diffusion.py index f58345af3d12..6842d29dc6c0 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion.py @@ -25,9 +25,8 @@ RobertaSeriesConfig, RobertaSeriesModelWithTransformation, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py index 5be3e0bc3303..61457e6ca01f 100644 --- a/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py +++ b/tests/pipelines/altdiffusion/test_alt_diffusion_img2img.py @@ -32,9 +32,8 @@ RobertaSeriesConfig, RobertaSeriesModelWithTransformation, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu enable_full_determinism() diff --git a/tests/pipelines/audio_diffusion/test_audio_diffusion.py b/tests/pipelines/audio_diffusion/test_audio_diffusion.py index a05f8f3c13d2..8c20f011cb86 100644 --- a/tests/pipelines/audio_diffusion/test_audio_diffusion.py +++ b/tests/pipelines/audio_diffusion/test_audio_diffusion.py @@ -29,9 +29,8 @@ UNet2DConditionModel, UNet2DModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu enable_full_determinism() diff --git a/tests/pipelines/audioldm/test_audioldm.py b/tests/pipelines/audioldm/test_audioldm.py index 18ee00cd4ceb..0825fc36a266 100644 --- a/tests/pipelines/audioldm/test_audioldm.py +++ b/tests/pipelines/audioldm/test_audioldm.py @@ -36,8 +36,8 @@ PNDMScheduler, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism from ..pipeline_params import TEXT_TO_AUDIO_BATCH_PARAMS, TEXT_TO_AUDIO_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/controlnet/test_controlnet.py b/tests/pipelines/controlnet/test_controlnet.py index 82049a8c5177..97b5e20f3c14 100644 --- a/tests/pipelines/controlnet/test_controlnet.py +++ b/tests/pipelines/controlnet/test_controlnet.py @@ -30,10 +30,9 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import ( TEXT_TO_IMAGE_BATCH_PARAMS, diff --git a/tests/pipelines/controlnet/test_controlnet_img2img.py b/tests/pipelines/controlnet/test_controlnet_img2img.py index 1015fc8fa890..9d3b10aa8283 100644 --- a/tests/pipelines/controlnet/test_controlnet_img2img.py +++ b/tests/pipelines/controlnet/test_controlnet_img2img.py @@ -33,10 +33,9 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import ( TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, diff --git a/tests/pipelines/controlnet/test_controlnet_inpaint.py b/tests/pipelines/controlnet/test_controlnet_inpaint.py index 493e9e471698..155286630c04 100644 --- a/tests/pipelines/controlnet/test_controlnet_inpaint.py +++ b/tests/pipelines/controlnet/test_controlnet_inpaint.py @@ -33,10 +33,9 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, randn_tensor, slow, torch_device from diffusers.utils.import_utils import is_xformers_available -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import ( TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, diff --git a/tests/pipelines/dance_diffusion/test_dance_diffusion.py b/tests/pipelines/dance_diffusion/test_dance_diffusion.py index caf8b158cedf..0ba86daa61fc 100644 --- a/tests/pipelines/dance_diffusion/test_dance_diffusion.py +++ b/tests/pipelines/dance_diffusion/test_dance_diffusion.py @@ -20,9 +20,8 @@ import torch from diffusers import DanceDiffusionPipeline, IPNDMScheduler, UNet1DModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, skip_mps from ..pipeline_params import UNCONDITIONAL_AUDIO_GENERATION_BATCH_PARAMS, UNCONDITIONAL_AUDIO_GENERATION_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/ddim/test_ddim.py b/tests/pipelines/ddim/test_ddim.py index 16bbef263da0..0861d7daab29 100644 --- a/tests/pipelines/ddim/test_ddim.py +++ b/tests/pipelines/ddim/test_ddim.py @@ -19,8 +19,7 @@ import torch from diffusers import DDIMPipeline, DDIMScheduler, UNet2DModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, slow, torch_device from ..pipeline_params import UNCONDITIONAL_IMAGE_GENERATION_BATCH_PARAMS, UNCONDITIONAL_IMAGE_GENERATION_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/ddpm/test_ddpm.py b/tests/pipelines/ddpm/test_ddpm.py index a72dfa1ad12b..a3c290215114 100644 --- a/tests/pipelines/ddpm/test_ddpm.py +++ b/tests/pipelines/ddpm/test_ddpm.py @@ -19,8 +19,7 @@ import torch from diffusers import DDPMPipeline, DDPMScheduler, UNet2DModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import require_torch_gpu, slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/dit/test_dit.py b/tests/pipelines/dit/test_dit.py index b6cd66a14a46..4937915696b4 100644 --- a/tests/pipelines/dit/test_dit.py +++ b/tests/pipelines/dit/test_dit.py @@ -20,9 +20,8 @@ import torch from diffusers import AutoencoderKL, DDIMScheduler, DiTPipeline, DPMSolverMultistepScheduler, Transformer2DModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import is_xformers_available, load_numpy, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import ( CLASS_CONDITIONED_IMAGE_GENERATION_BATCH_PARAMS, diff --git a/tests/pipelines/karras_ve/test_karras_ve.py b/tests/pipelines/karras_ve/test_karras_ve.py index 9b8269e381e4..142058bcd710 100644 --- a/tests/pipelines/karras_ve/test_karras_ve.py +++ b/tests/pipelines/karras_ve/test_karras_ve.py @@ -19,8 +19,7 @@ import torch from diffusers import KarrasVePipeline, KarrasVeScheduler, UNet2DModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion.py b/tests/pipelines/latent_diffusion/test_latent_diffusion.py index 8a6701c2af3a..88dc8ef9b17b 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion.py @@ -21,8 +21,14 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, LDMTextToImagePipeline, UNet2DConditionModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import load_numpy, nightly, require_torch_gpu, slow, torch_device +from diffusers.utils.testing_utils import ( + enable_full_determinism, + load_numpy, + nightly, + require_torch_gpu, + slow, + torch_device, +) from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py index f33e9be8093b..d21ead543af8 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_superresolution.py @@ -20,9 +20,8 @@ import torch from diffusers import DDIMScheduler, LDMSuperResolutionPipeline, UNet2DModel, VQModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import PIL_INTERPOLATION, floats_tensor, load_image, slow, torch_device -from diffusers.utils.testing_utils import require_torch +from diffusers.utils.testing_utils import enable_full_determinism, require_torch enable_full_determinism() diff --git a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py index 3ac3a9cec485..ff8670ea2950 100644 --- a/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py +++ b/tests/pipelines/latent_diffusion/test_latent_diffusion_uncond.py @@ -20,8 +20,7 @@ from transformers import CLIPTextConfig, CLIPTextModel from diffusers import DDIMScheduler, LDMPipeline, UNet2DModel, VQModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/paint_by_example/test_paint_by_example.py b/tests/pipelines/paint_by_example/test_paint_by_example.py index b515086238e8..14c16644889e 100644 --- a/tests/pipelines/paint_by_example/test_paint_by_example.py +++ b/tests/pipelines/paint_by_example/test_paint_by_example.py @@ -24,9 +24,8 @@ from diffusers import AutoencoderKL, PaintByExamplePipeline, PNDMScheduler, UNet2DConditionModel from diffusers.pipelines.paint_by_example import PaintByExampleImageEncoder -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import IMAGE_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, IMAGE_GUIDED_IMAGE_INPAINTING_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/pndm/test_pndm.py b/tests/pipelines/pndm/test_pndm.py index 12c20c978722..c2595713933c 100644 --- a/tests/pipelines/pndm/test_pndm.py +++ b/tests/pipelines/pndm/test_pndm.py @@ -19,8 +19,7 @@ import torch from diffusers import PNDMPipeline, PNDMScheduler, UNet2DModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/repaint/test_repaint.py b/tests/pipelines/repaint/test_repaint.py index a32974dc1a7d..e372cf979ebb 100644 --- a/tests/pipelines/repaint/test_repaint.py +++ b/tests/pipelines/repaint/test_repaint.py @@ -20,8 +20,15 @@ import torch from diffusers import RePaintPipeline, RePaintScheduler, UNet2DModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import load_image, load_numpy, nightly, require_torch_gpu, skip_mps, torch_device +from diffusers.utils.testing_utils import ( + enable_full_determinism, + load_image, + load_numpy, + nightly, + require_torch_gpu, + skip_mps, + torch_device, +) from ..pipeline_params import IMAGE_INPAINTING_BATCH_PARAMS, IMAGE_INPAINTING_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/score_sde_ve/test_score_sde_ve.py b/tests/pipelines/score_sde_ve/test_score_sde_ve.py index 8949f229aa8e..32505253f6c7 100644 --- a/tests/pipelines/score_sde_ve/test_score_sde_ve.py +++ b/tests/pipelines/score_sde_ve/test_score_sde_ve.py @@ -19,8 +19,7 @@ import torch from diffusers import ScoreSdeVePipeline, ScoreSdeVeScheduler, UNet2DModel -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import require_torch, slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, require_torch, slow, torch_device enable_full_determinism() diff --git a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py index 0d52bac229ba..9e810616dc56 100644 --- a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py +++ b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py @@ -24,9 +24,8 @@ from diffusers import AutoencoderKL, DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler, UNet2DConditionModel from diffusers.pipelines.semantic_stable_diffusion import SemanticStableDiffusionPipeline as StableDiffusionPipeline -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, nightly, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu enable_full_determinism() diff --git a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py index 6806df985ef5..cc8690eb87ca 100644 --- a/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py +++ b/tests/pipelines/spectrogram_diffusion/test_spectrogram_diffusion.py @@ -21,9 +21,8 @@ from diffusers import DDPMScheduler, MidiProcessor, SpectrogramDiffusionPipeline from diffusers.pipelines.spectrogram_diffusion import SpectrogramContEncoder, SpectrogramNotesEncoder, T5FilmDecoder -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import require_torch_gpu, skip_mps, slow, torch_device -from diffusers.utils.testing_utils import require_note_seq, require_onnxruntime +from diffusers.utils.testing_utils import enable_full_determinism, require_note_seq, require_onnxruntime from ..pipeline_params import TOKENS_TO_AUDIO_GENERATION_BATCH_PARAMS, TOKENS_TO_AUDIO_GENERATION_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py index 3021d090d055..a1ae3d2d0e7c 100644 --- a/tests/pipelines/stable_diffusion/test_cycle_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_cycle_diffusion.py @@ -22,9 +22,8 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, CycleDiffusionPipeline, DDIMScheduler, UNet2DConditionModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, skip_mps from ..pipeline_params import TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index 07e8068812b7..b9f250590825 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -38,9 +38,8 @@ logging, ) from diffusers.models.attention_processor import AttnProcessor -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device -from diffusers.utils.testing_utils import CaptureLogger, require_torch_gpu +from diffusers.utils.testing_utils import CaptureLogger, enable_full_determinism, require_torch_gpu from ...models.test_models_unet_2d_condition import create_lora_layers from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py index e008080a8da8..c35d84de9802 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_image_variation.py @@ -29,9 +29,8 @@ StableDiffusionImageVariationPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import IMAGE_VARIATION_BATCH_PARAMS, IMAGE_VARIATION_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py index 455459bbfad4..8ab252b9be80 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_img2img.py @@ -33,9 +33,8 @@ UNet2DConditionModel, ) from diffusers.image_processor import VaeImageProcessor -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, skip_mps from ..pipeline_params import ( IMAGE_TO_IMAGE_IMAGE_PARAMS, diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py index 01c9e6c00b7b..44de277ead07 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint.py @@ -32,9 +32,8 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_inpaint import prepare_mask_and_masked_image -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, nightly, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ...models.test_models_unet_2d_condition import create_lora_layers from ..pipeline_params import TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, TEXT_GUIDED_IMAGE_INPAINTING_PARAMS diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py index 07b2c24869cc..fa00a0d201af 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_inpaint_legacy.py @@ -33,9 +33,8 @@ UNet2DModel, VQModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, nightly, slow, torch_device -from diffusers.utils.testing_utils import load_numpy, preprocess_image, require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, load_numpy, preprocess_image, require_torch_gpu enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py index bade65557840..fbff6c554967 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_instruction_pix2pix.py @@ -31,9 +31,8 @@ StableDiffusionInstructPix2PixPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py index a1b79fa5ac55..4eccb871a0cb 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_k_diffusion.py @@ -20,9 +20,8 @@ import torch from diffusers import StableDiffusionKDiffusionPipeline -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py index 10aa83e8e022..cba20417bca0 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_model_editing.py @@ -28,9 +28,8 @@ StableDiffusionModelEditingPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, skip_mps from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py index 2abc74ce9483..02a15b2a29dc 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_panorama.py @@ -29,9 +29,8 @@ StableDiffusionPanoramaPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, skip_mps from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py index d5aba7529b0d..98f5910ab313 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_pix2pix_zero.py @@ -32,9 +32,8 @@ StableDiffusionPix2PixZeroPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_numpy, slow, torch_device -from diffusers.utils.testing_utils import load_image, load_pt, require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, load_image, load_pt, require_torch_gpu, skip_mps from ..pipeline_params import TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py index a17b10c9a50e..2b0f0bfc11a6 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion_sag.py @@ -26,9 +26,8 @@ StableDiffusionSAGPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py index 0116f5c1a05f..3f9867783b33 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion.py @@ -32,9 +32,8 @@ UNet2DConditionModel, logging, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device -from diffusers.utils.testing_utils import CaptureLogger, require_torch_gpu +from diffusers.utils.testing_utils import CaptureLogger, enable_full_determinism, require_torch_gpu from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py index a291135f478d..08ac29868971 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_depth.py @@ -39,7 +39,6 @@ StableDiffusionDepth2ImgPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( floats_tensor, is_accelerate_available, @@ -50,7 +49,7 @@ slow, torch_device, ) -from diffusers.utils.testing_utils import require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, skip_mps from ..pipeline_params import TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py index 5a76768bd55d..8df5b6da846c 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_diffedit.py @@ -32,9 +32,8 @@ StableDiffusionDiffEditPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_image, slow -from diffusers.utils.testing_utils import floats_tensor, require_torch_gpu, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, floats_tensor, require_torch_gpu, torch_device from ..pipeline_params import TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, TEXT_GUIDED_IMAGE_INPAINTING_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py index 216ebc5208c1..10d8561f0126 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_inpaint.py @@ -23,9 +23,8 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, PNDMScheduler, StableDiffusionInpaintPipeline, UNet2DConditionModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, torch_device -from diffusers.utils.testing_utils import require_torch_gpu, slow +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, slow from ..pipeline_params import TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, TEXT_GUIDED_IMAGE_INPAINTING_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py index 638c1a1e20f7..561536a44ea0 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_latent_upscale.py @@ -28,9 +28,8 @@ StableDiffusionPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu from ..pipeline_params import TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py index 9c89811bf736..7100e5023a5d 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_upscale.py @@ -23,9 +23,8 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, DDPMScheduler, StableDiffusionUpscalePipeline, UNet2DConditionModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_image, load_numpy, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu enable_full_determinism() diff --git a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py index 25dff9a360fe..d1a2c856659f 100644 --- a/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py +++ b/tests/pipelines/stable_diffusion_2/test_stable_diffusion_v_pred.py @@ -29,9 +29,8 @@ StableDiffusionPipeline, UNet2DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu enable_full_determinism() diff --git a/tests/pipelines/stable_unclip/test_stable_unclip.py b/tests/pipelines/stable_unclip/test_stable_unclip.py index f46a6e60714d..8b4a065cd4bf 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip.py @@ -13,8 +13,7 @@ UNet2DConditionModel, ) from diffusers.pipelines.stable_diffusion.stable_unclip_image_normalizer import StableUnCLIPImageNormalizer -from diffusers.utils.testing_utils import enable_full_determinism -from diffusers.utils.testing_utils import load_numpy, require_torch_gpu, slow, torch_device +from diffusers.utils.testing_utils import enable_full_determinism, load_numpy, require_torch_gpu, slow, torch_device from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin, assert_mean_pixel_difference diff --git a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py index 21783f46cc57..35cae61242c4 100644 --- a/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py +++ b/tests/pipelines/stable_unclip/test_stable_unclip_img2img.py @@ -16,9 +16,9 @@ from diffusers import AutoencoderKL, DDIMScheduler, DDPMScheduler, StableUnCLIPImg2ImgPipeline, UNet2DConditionModel from diffusers.pipelines.pipeline_utils import DiffusionPipeline from diffusers.pipelines.stable_diffusion.stable_unclip_image_normalizer import StableUnCLIPImageNormalizer -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import ( + enable_full_determinism, floats_tensor, load_image, load_numpy, diff --git a/tests/pipelines/test_pipelines.py b/tests/pipelines/test_pipelines.py index 05026d36441f..a9abb0b4fb62 100644 --- a/tests/pipelines/test_pipelines.py +++ b/tests/pipelines/test_pipelines.py @@ -54,7 +54,6 @@ logging, ) from diffusers.schedulers.scheduling_utils import SCHEDULER_CONFIG_NAME -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import ( CONFIG_NAME, WEIGHTS_NAME, @@ -66,6 +65,7 @@ ) from diffusers.utils.testing_utils import ( CaptureLogger, + enable_full_determinism, get_tests_dir, load_numpy, require_compel, diff --git a/tests/pipelines/text_to_video/test_text_to_video.py b/tests/pipelines/text_to_video/test_text_to_video.py index 3e7c8a7b9588..8b4bae2275e5 100644 --- a/tests/pipelines/text_to_video/test_text_to_video.py +++ b/tests/pipelines/text_to_video/test_text_to_video.py @@ -26,8 +26,8 @@ TextToVideoSDPipeline, UNet3DConditionModel, ) -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, skip_mps, slow +from diffusers.utils.testing_utils import enable_full_determinism from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/unclip/test_unclip.py b/tests/pipelines/unclip/test_unclip.py index 374a0ff666ad..393c3ba1635d 100644 --- a/tests/pipelines/unclip/test_unclip.py +++ b/tests/pipelines/unclip/test_unclip.py @@ -22,9 +22,8 @@ from diffusers import PriorTransformer, UnCLIPPipeline, UnCLIPScheduler, UNet2DConditionModel, UNet2DModel from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import load_numpy, nightly, slow, torch_device -from diffusers.utils.testing_utils import require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, require_torch_gpu, skip_mps from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference diff --git a/tests/pipelines/unclip/test_unclip_image_variation.py b/tests/pipelines/unclip/test_unclip_image_variation.py index 0b16b1f0dff3..75a26250807b 100644 --- a/tests/pipelines/unclip/test_unclip_image_variation.py +++ b/tests/pipelines/unclip/test_unclip_image_variation.py @@ -36,9 +36,8 @@ UNet2DModel, ) from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.utils import floats_tensor, load_numpy, slow, torch_device -from diffusers.utils.testing_utils import load_image, require_torch_gpu, skip_mps +from diffusers.utils.testing_utils import enable_full_determinism, load_image, require_torch_gpu, skip_mps from ..pipeline_params import IMAGE_VARIATION_BATCH_PARAMS, IMAGE_VARIATION_PARAMS from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference From 7e5e1b78078b8b416f53a36cbd1850f321e573b4 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 01:11:56 +0200 Subject: [PATCH 10/20] fix more --- src/diffusers/training_utils.py | 15 +++++++++++++++ src/diffusers/utils/testing_utils.py | 19 +------------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/diffusers/training_utils.py b/src/diffusers/training_utils.py index 89a385d098d6..df9c7e882682 100644 --- a/src/diffusers/training_utils.py +++ b/src/diffusers/training_utils.py @@ -1,7 +1,9 @@ import contextlib import copy +from random import random from typing import Any, Dict, Iterable, Optional, Union +import numpy as np import torch from .utils import deprecate, is_transformers_available @@ -11,6 +13,19 @@ import transformers +def set_seed(seed: int): + """ + Args: + Helper function for reproducible behavior to set the seed in `random`, `numpy`, `torch`. + seed (`int`): The seed to set. + """ + random.seed(seed) + np.random.seed(seed) + torch.manual_seed(seed) + torch.cuda.manual_seed_all(seed) + # ^^ safe to call this function even if cuda is not available + + # Adapted from torch-ema https://github.com/fadel/pytorch_ema/blob/master/torch_ema/ema.py#L14 class EMAModel: """ diff --git a/src/diffusers/utils/testing_utils.py b/src/diffusers/utils/testing_utils.py index 6cd4a9b82cc5..93d0ef5b7b5f 100644 --- a/src/diffusers/utils/testing_utils.py +++ b/src/diffusers/utils/testing_utils.py @@ -516,15 +516,11 @@ def __repr__(self): return f"captured: {self.out}\n" -def enable_full_determinism(seed: Optional[int] = None): +def enable_full_determinism(): """ Helper function for reproducible behavior during distributed training. See - https://pytorch.org/docs/stable/notes/randomness.html for pytorch """ - # set seed first - if seed is not None: - set_seed(seed) - # Enable PyTorch deterministic mode. This potentially requires either the environment # variable 'CUDA_LAUNCH_BLOCKING' or 'CUBLAS_WORKSPACE_CONFIG' to be set, # depending on the CUDA version, so we set them both here @@ -536,16 +532,3 @@ def enable_full_determinism(seed: Optional[int] = None): torch.backends.cudnn.deterministic = True torch.backends.cudnn.benchmark = False torch.backends.cuda.matmul.allow_tf32 = False - - -def set_seed(seed: int): - """ - Args: - Helper function for reproducible behavior to set the seed in `random`, `numpy`, `torch`. - seed (`int`): The seed to set. - """ - random.seed(seed) - np.random.seed(seed) - torch.manual_seed(seed) - torch.cuda.manual_seed_all(seed) - # ^^ safe to call this function even if cuda is not available From 4f5294ef39b0f21db66da412ce691e640889c5c3 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 01:26:56 +0200 Subject: [PATCH 11/20] up --- tests/pipelines/stable_diffusion/test_stable_diffusion.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index b9f250590825..d7bed15c9378 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -550,8 +550,7 @@ def test_inference_batch_single_identical(self): @slow @require_torch_gpu class StableDiffusionPipelineSlowTests(unittest.TestCase): - def tearDown(self): - super().tearDown() + def setUp(self): gc.collect() torch.cuda.empty_cache() From 8d8300764ed216cd7e160bdea4dfd076e73a574b Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 02:21:40 +0200 Subject: [PATCH 12/20] up --- src/diffusers/utils/testing_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/diffusers/utils/testing_utils.py b/src/diffusers/utils/testing_utils.py index 93d0ef5b7b5f..40d4276c0e21 100644 --- a/src/diffusers/utils/testing_utils.py +++ b/src/diffusers/utils/testing_utils.py @@ -521,6 +521,8 @@ def enable_full_determinism(): Helper function for reproducible behavior during distributed training. See - https://pytorch.org/docs/stable/notes/randomness.html for pytorch """ + + return # Enable PyTorch deterministic mode. This potentially requires either the environment # variable 'CUDA_LAUNCH_BLOCKING' or 'CUBLAS_WORKSPACE_CONFIG' to be set, # depending on the CUDA version, so we set them both here From 2802de5fd71394dcb630bc1e690ccf2fa7231b28 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 08:28:57 +0200 Subject: [PATCH 13/20] Test only stable diffusion --- .github/workflows/push_tests.yml | 2 +- src/diffusers/utils/testing_utils.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 4ab3172f2827..6993265f5f63 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -76,7 +76,7 @@ jobs: python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \ -s -v -k "not Flax and not Onnx" \ --make-reports=tests_${{ matrix.config.report }} \ - tests/ + tests/pipelines/stable_diffusion tests/pipelines/stable_diffusion_2 - name: Run slow Flax TPU tests if: ${{ matrix.config.framework == 'flax' }} diff --git a/src/diffusers/utils/testing_utils.py b/src/diffusers/utils/testing_utils.py index 40d4276c0e21..93d0ef5b7b5f 100644 --- a/src/diffusers/utils/testing_utils.py +++ b/src/diffusers/utils/testing_utils.py @@ -521,8 +521,6 @@ def enable_full_determinism(): Helper function for reproducible behavior during distributed training. See - https://pytorch.org/docs/stable/notes/randomness.html for pytorch """ - - return # Enable PyTorch deterministic mode. This potentially requires either the environment # variable 'CUDA_LAUNCH_BLOCKING' or 'CUBLAS_WORKSPACE_CONFIG' to be set, # depending on the CUDA version, so we set them both here From e429132e879a4b20d94765d74e83b38c1cca81e9 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 19 May 2023 18:17:23 +0200 Subject: [PATCH 14/20] Test only two files --- .github/workflows/push_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 6993265f5f63..161cc607df8b 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -76,7 +76,7 @@ jobs: python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \ -s -v -k "not Flax and not Onnx" \ --make-reports=tests_${{ matrix.config.report }} \ - tests/pipelines/stable_diffusion tests/pipelines/stable_diffusion_2 + tests/pipelines/stable_diffusion/test_stable_diffusion.py tests/pipelines/stable_diffusion_2/test_stable_diffusion.py - name: Run slow Flax TPU tests if: ${{ matrix.config.framework == 'flax' }} From 51e327b620bfe7f8f8bfd953e482ff10ef00477e Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Mon, 22 May 2023 10:09:02 +0200 Subject: [PATCH 15/20] up --- .github/workflows/push_tests.yml | 2 +- setup.py | 2 ++ src/diffusers/dependency_versions_table.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 161cc607df8b..4d42e78aee15 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -73,7 +73,7 @@ jobs: HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }} run: | - python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \ + python -m pytest -n 1 --max-worker-restart=0 --dist=no --maxprocesses=1 \ -s -v -k "not Flax and not Onnx" \ --make-reports=tests_${{ matrix.config.report }} \ tests/pipelines/stable_diffusion/test_stable_diffusion.py tests/pipelines/stable_diffusion_2/test_stable_diffusion.py diff --git a/setup.py b/setup.py index a972df80b509..19bcc2ab4846 100644 --- a/setup.py +++ b/setup.py @@ -102,6 +102,7 @@ "pytest", "pytest-timeout", "pytest-xdist", + "psutil", "ruff>=0.0.241", "safetensors", "sentencepiece>=0.1.91,!=0.1.92", @@ -197,6 +198,7 @@ def run(self): "pytest", "pytest-timeout", "pytest-xdist", + "psutil", "requests-mock", "safetensors", "sentencepiece", diff --git a/src/diffusers/dependency_versions_table.py b/src/diffusers/dependency_versions_table.py index 19a843470ee1..fd0d477c2869 100644 --- a/src/diffusers/dependency_versions_table.py +++ b/src/diffusers/dependency_versions_table.py @@ -26,6 +26,7 @@ "pytest": "pytest", "pytest-timeout": "pytest-timeout", "pytest-xdist": "pytest-xdist", + "psutil": "psutil", "ruff": "ruff>=0.0.241", "safetensors": "safetensors", "sentencepiece": "sentencepiece>=0.1.91,!=0.1.92", From 6e5b7e7803089c9306b0f59089c3d8d5808ce850 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Mon, 22 May 2023 10:36:46 +0200 Subject: [PATCH 16/20] Try out spinning up processes that can be killed --- .github/workflows/push_tests.yml | 86 +++++++++---------- .../stable_diffusion/test_stable_diffusion.py | 18 +++- 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 4d42e78aee15..3efd853e39e7 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -109,46 +109,46 @@ jobs: name: ${{ matrix.config.report }}_test_reports path: reports - run_examples_tests: - name: Examples PyTorch CUDA tests on Ubuntu - - runs-on: docker-gpu - - container: - image: diffusers/diffusers-pytorch-cuda - options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/hf_cache:/mnt/cache/ - - steps: - - name: Checkout diffusers - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - - name: NVIDIA-SMI - run: | - nvidia-smi - - - name: Install dependencies - run: | - python -m pip install -e .[quality,test,training] - - - name: Environment - run: | - python utils/print_env.py - - - name: Run example tests on GPU - env: - HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }} - run: | - python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile -s -v --make-reports=examples_torch_cuda examples/ - - - name: Failure short reports - if: ${{ failure() }} - run: cat reports/examples_torch_cuda_failures_short.txt - - - name: Test suite reports artifacts - if: ${{ always() }} - uses: actions/upload-artifact@v2 - with: - name: examples_test_reports - path: reports + # run_examples_tests: + # name: Examples PyTorch CUDA tests on Ubuntu + + # runs-on: docker-gpu + + # container: + # image: diffusers/diffusers-pytorch-cuda + # options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/hf_cache:/mnt/cache/ + + # steps: + # - name: Checkout diffusers + # uses: actions/checkout@v3 + # with: + # fetch-depth: 2 + + # - name: NVIDIA-SMI + # run: | + # nvidia-smi + + # - name: Install dependencies + # run: | + # python -m pip install -e .[quality,test,training] + + # - name: Environment + # run: | + # python utils/print_env.py + + # - name: Run example tests on GPU + # env: + # HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }} + # run: | + # python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile -s -v --make-reports=examples_torch_cuda examples/ + + # - name: Failure short reports + # if: ${{ failure() }} + # run: cat reports/examples_torch_cuda_failures_short.txt + + # - name: Test suite reports artifacts + # if: ${{ always() }} + # uses: actions/upload-artifact@v2 + # with: + # name: examples_test_reports + # path: reports diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index d7bed15c9378..26d1c44c41cd 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -18,6 +18,11 @@ import tempfile import time import unittest +import pytest +import subprocess +import os +import sys +import signal import numpy as np import torch @@ -46,7 +51,18 @@ from ..test_pipelines_common import PipelineLatentTesterMixin, PipelineTesterMixin -enable_full_determinism() +@pytest.fixture(autouse=True) +def process_fixture(): + # This will be run before each test + command = [sys.executable, os.path.abspath(__file__)] + process = subprocess.Popen(command) + enable_full_determinism() + yield process + # This will be run after each test + try: + os.kill(process.pid, signal.SIGTERM) # or signal.SIGKILL + except ProcessLookupError: + pass class StableDiffusionPipelineFastTests(PipelineLatentTesterMixin, PipelineTesterMixin, unittest.TestCase): From fda7f1786f908e0a975c0769f2d3ddbf74f639bf Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Mon, 22 May 2023 12:00:48 +0200 Subject: [PATCH 17/20] up --- .github/workflows/push_tests.yml | 95 ++++++++++++++++---------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 3efd853e39e7..749da4dea81a 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -1,8 +1,7 @@ name: Slow tests on main on: - # push: - pull_request: + push: branches: - main @@ -71,12 +70,14 @@ jobs: if: ${{ matrix.config.framework == 'pytorch' }} env: HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }} + # https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms + CUBLAS_WORKSPACE_CONFIG: :16:8 run: | - python -m pytest -n 1 --max-worker-restart=0 --dist=no --maxprocesses=1 \ + python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \ -s -v -k "not Flax and not Onnx" \ --make-reports=tests_${{ matrix.config.report }} \ - tests/pipelines/stable_diffusion/test_stable_diffusion.py tests/pipelines/stable_diffusion_2/test_stable_diffusion.py + tests/ - name: Run slow Flax TPU tests if: ${{ matrix.config.framework == 'flax' }} @@ -109,46 +110,46 @@ jobs: name: ${{ matrix.config.report }}_test_reports path: reports - # run_examples_tests: - # name: Examples PyTorch CUDA tests on Ubuntu - - # runs-on: docker-gpu - - # container: - # image: diffusers/diffusers-pytorch-cuda - # options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/hf_cache:/mnt/cache/ - - # steps: - # - name: Checkout diffusers - # uses: actions/checkout@v3 - # with: - # fetch-depth: 2 - - # - name: NVIDIA-SMI - # run: | - # nvidia-smi - - # - name: Install dependencies - # run: | - # python -m pip install -e .[quality,test,training] - - # - name: Environment - # run: | - # python utils/print_env.py - - # - name: Run example tests on GPU - # env: - # HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }} - # run: | - # python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile -s -v --make-reports=examples_torch_cuda examples/ - - # - name: Failure short reports - # if: ${{ failure() }} - # run: cat reports/examples_torch_cuda_failures_short.txt - - # - name: Test suite reports artifacts - # if: ${{ always() }} - # uses: actions/upload-artifact@v2 - # with: - # name: examples_test_reports - # path: reports + run_examples_tests: + name: Examples PyTorch CUDA tests on Ubuntu + + runs-on: docker-gpu + + container: + image: diffusers/diffusers-pytorch-cuda + options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/hf_cache:/mnt/cache/ + + steps: + - name: Checkout diffusers + uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - name: NVIDIA-SMI + run: | + nvidia-smi + + - name: Install dependencies + run: | + python -m pip install -e .[quality,test,training] + + - name: Environment + run: | + python utils/print_env.py + + - name: Run example tests on GPU + env: + HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGING_FACE_HUB_TOKEN }} + run: | + python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile -s -v --make-reports=examples_torch_cuda examples/ + + - name: Failure short reports + if: ${{ failure() }} + run: cat reports/examples_torch_cuda_failures_short.txt + + - name: Test suite reports artifacts + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: examples_test_reports + path: reports From aeb437ec2b6d0ac3a92e9c9f5e701bd1afc61d8d Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Mon, 22 May 2023 11:01:44 +0100 Subject: [PATCH 18/20] Apply suggestions from code review --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 19bcc2ab4846..a972df80b509 100644 --- a/setup.py +++ b/setup.py @@ -102,7 +102,6 @@ "pytest", "pytest-timeout", "pytest-xdist", - "psutil", "ruff>=0.0.241", "safetensors", "sentencepiece>=0.1.91,!=0.1.92", @@ -198,7 +197,6 @@ def run(self): "pytest", "pytest-timeout", "pytest-xdist", - "psutil", "requests-mock", "safetensors", "sentencepiece", From fc8ad580e0ec8723e047d58bb7cf7b23e81241a4 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Mon, 22 May 2023 12:02:31 +0200 Subject: [PATCH 19/20] up --- src/diffusers/dependency_versions_table.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/diffusers/dependency_versions_table.py b/src/diffusers/dependency_versions_table.py index fd0d477c2869..19a843470ee1 100644 --- a/src/diffusers/dependency_versions_table.py +++ b/src/diffusers/dependency_versions_table.py @@ -26,7 +26,6 @@ "pytest": "pytest", "pytest-timeout": "pytest-timeout", "pytest-xdist": "pytest-xdist", - "psutil": "psutil", "ruff": "ruff>=0.0.241", "safetensors": "safetensors", "sentencepiece": "sentencepiece>=0.1.91,!=0.1.92", From a2385a7dfc9a7d5f0942c88b4bc37b397b1e28c7 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Mon, 22 May 2023 12:04:58 +0200 Subject: [PATCH 20/20] up --- .../stable_diffusion/test_stable_diffusion.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/pipelines/stable_diffusion/test_stable_diffusion.py b/tests/pipelines/stable_diffusion/test_stable_diffusion.py index 26d1c44c41cd..aec4436710b9 100644 --- a/tests/pipelines/stable_diffusion/test_stable_diffusion.py +++ b/tests/pipelines/stable_diffusion/test_stable_diffusion.py @@ -15,16 +15,16 @@ import gc +import os +import signal +import subprocess +import sys import tempfile import time import unittest -import pytest -import subprocess -import os -import sys -import signal import numpy as np +import pytest import torch from huggingface_hub import hf_hub_download from packaging import version