Unverified Commit 7aa6af11 authored by Dhruv Nair's avatar Dhruv Nair Committed by GitHub
Browse files

[Refactor] Move testing utils out of src (#12238)

* update

* update

* update

* update

* update

* merge main

* Revert "merge main"

This reverts commit 65efbcead58644b31596ed2d714f7cee0e0238d3.
parent 87b800e1
...@@ -15,7 +15,8 @@ from diffusers import ( ...@@ -15,7 +15,8 @@ from diffusers import (
StableDiffusion3Img2ImgPipeline, StableDiffusion3Img2ImgPipeline,
StableDiffusion3PAGImg2ImgPipeline, StableDiffusion3PAGImg2ImgPipeline,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
...@@ -24,7 +25,6 @@ from diffusers.utils.testing_utils import ( ...@@ -24,7 +25,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import ( from ..pipeline_params import (
IMAGE_TO_IMAGE_IMAGE_PARAMS, IMAGE_TO_IMAGE_IMAGE_PARAMS,
TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS,
......
...@@ -31,7 +31,8 @@ from diffusers import ( ...@@ -31,7 +31,8 @@ from diffusers import (
StableDiffusionPAGImg2ImgPipeline, StableDiffusionPAGImg2ImgPipeline,
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
...@@ -40,7 +41,6 @@ from diffusers.utils.testing_utils import ( ...@@ -40,7 +41,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import ( from ..pipeline_params import (
IMAGE_TO_IMAGE_IMAGE_PARAMS, IMAGE_TO_IMAGE_IMAGE_PARAMS,
TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS,
......
...@@ -29,7 +29,8 @@ from diffusers import ( ...@@ -29,7 +29,8 @@ from diffusers import (
StableDiffusionPAGInpaintPipeline, StableDiffusionPAGInpaintPipeline,
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
...@@ -38,7 +39,6 @@ from diffusers.utils.testing_utils import ( ...@@ -38,7 +39,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import ( from ..pipeline_params import (
TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS,
TEXT_GUIDED_IMAGE_INPAINTING_PARAMS, TEXT_GUIDED_IMAGE_INPAINTING_PARAMS,
......
...@@ -29,14 +29,14 @@ from diffusers import ( ...@@ -29,14 +29,14 @@ from diffusers import (
StableDiffusionXLPipeline, StableDiffusionXLPipeline,
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
require_torch_accelerator, require_torch_accelerator,
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import ( from ..pipeline_params import (
TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_BATCH_PARAMS,
TEXT_TO_IMAGE_CALLBACK_CFG_PARAMS, TEXT_TO_IMAGE_CALLBACK_CFG_PARAMS,
......
...@@ -38,7 +38,8 @@ from diffusers import ( ...@@ -38,7 +38,8 @@ from diffusers import (
StableDiffusionXLPAGImg2ImgPipeline, StableDiffusionXLPAGImg2ImgPipeline,
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
...@@ -47,7 +48,6 @@ from diffusers.utils.testing_utils import ( ...@@ -47,7 +48,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import ( from ..pipeline_params import (
IMAGE_TO_IMAGE_IMAGE_PARAMS, IMAGE_TO_IMAGE_IMAGE_PARAMS,
TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS,
......
...@@ -39,7 +39,8 @@ from diffusers import ( ...@@ -39,7 +39,8 @@ from diffusers import (
StableDiffusionXLPAGInpaintPipeline, StableDiffusionXLPAGInpaintPipeline,
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
...@@ -48,7 +49,6 @@ from diffusers.utils.testing_utils import ( ...@@ -48,7 +49,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import ( from ..pipeline_params import (
TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS, TEXT_GUIDED_IMAGE_INPAINTING_BATCH_PARAMS,
TEXT_GUIDED_IMAGE_INPAINTING_PARAMS, TEXT_GUIDED_IMAGE_INPAINTING_PARAMS,
......
...@@ -27,7 +27,8 @@ from diffusers import ( ...@@ -27,7 +27,8 @@ from diffusers import (
PixArtAlphaPipeline, PixArtAlphaPipeline,
PixArtTransformer2DModel, PixArtTransformer2DModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
numpy_cosine_similarity_distance, numpy_cosine_similarity_distance,
...@@ -35,7 +36,6 @@ from diffusers.utils.testing_utils import ( ...@@ -35,7 +36,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -27,7 +27,8 @@ from diffusers import ( ...@@ -27,7 +27,8 @@ from diffusers import (
PixArtSigmaPipeline, PixArtSigmaPipeline,
PixArtTransformer2DModel, PixArtTransformer2DModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
numpy_cosine_similarity_distance, numpy_cosine_similarity_distance,
...@@ -35,7 +36,6 @@ from diffusers.utils.testing_utils import ( ...@@ -35,7 +36,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import ( from ..test_pipelines_common import (
PipelineTesterMixin, PipelineTesterMixin,
......
...@@ -19,7 +19,8 @@ import numpy as np ...@@ -19,7 +19,8 @@ import numpy as np
import torch import torch
from diffusers import PNDMPipeline, PNDMScheduler, UNet2DModel from diffusers import PNDMPipeline, PNDMScheduler, UNet2DModel
from diffusers.utils.testing_utils import enable_full_determinism, nightly, require_torch, torch_device
from ...testing_utils import enable_full_determinism, nightly, require_torch, torch_device
enable_full_determinism() enable_full_determinism()
......
...@@ -24,8 +24,8 @@ from diffusers import ( ...@@ -24,8 +24,8 @@ from diffusers import (
QwenImagePipeline, QwenImagePipeline,
QwenImageTransformer2DModel, QwenImageTransformer2DModel,
) )
from diffusers.utils.testing_utils import enable_full_determinism, torch_device
from ...testing_utils import enable_full_determinism, torch_device
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -26,8 +26,8 @@ from diffusers import ( ...@@ -26,8 +26,8 @@ from diffusers import (
QwenImageEditPipeline, QwenImageEditPipeline,
QwenImageTransformer2DModel, QwenImageTransformer2DModel,
) )
from diffusers.utils.testing_utils import enable_full_determinism, torch_device
from ...testing_utils import enable_full_determinism, torch_device
from ..pipeline_params import TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -11,12 +11,12 @@ from diffusers import ( ...@@ -11,12 +11,12 @@ from diffusers import (
QwenImageImg2ImgPipeline, QwenImageImg2ImgPipeline,
QwenImageTransformer2DModel, QwenImageTransformer2DModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -25,8 +25,8 @@ from diffusers import ( ...@@ -25,8 +25,8 @@ from diffusers import (
QwenImageInpaintPipeline, QwenImageInpaintPipeline,
QwenImageTransformer2DModel, QwenImageTransformer2DModel,
) )
from diffusers.utils.testing_utils import enable_full_determinism, floats_tensor, torch_device
from ...testing_utils import enable_full_determinism, floats_tensor, torch_device
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -21,14 +21,14 @@ import torch ...@@ -21,14 +21,14 @@ import torch
from transformers import Gemma2Config, Gemma2Model, GemmaTokenizer from transformers import Gemma2Config, Gemma2Model, GemmaTokenizer
from diffusers import AutoencoderDC, FlowMatchEulerDiscreteScheduler, SanaPipeline, SanaTransformer2DModel from diffusers import AutoencoderDC, FlowMatchEulerDiscreteScheduler, SanaPipeline, SanaTransformer2DModel
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
require_torch_accelerator, require_torch_accelerator,
slow, slow,
torch_device, torch_device,
) )
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -26,12 +26,12 @@ from diffusers import ( ...@@ -26,12 +26,12 @@ from diffusers import (
SanaControlNetPipeline, SanaControlNetPipeline,
SanaTransformer2DModel, SanaTransformer2DModel,
) )
from diffusers.utils.testing_utils import ( from diffusers.utils.torch_utils import randn_tensor
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
torch_device, torch_device,
) )
from diffusers.utils.torch_utils import randn_tensor
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -20,11 +20,11 @@ import torch ...@@ -20,11 +20,11 @@ import torch
from transformers import Gemma2Config, Gemma2Model, GemmaTokenizer from transformers import Gemma2Config, Gemma2Model, GemmaTokenizer
from diffusers import AutoencoderDC, SanaSprintPipeline, SanaTransformer2DModel, SCMScheduler from diffusers import AutoencoderDC, SanaSprintPipeline, SanaTransformer2DModel, SCMScheduler
from diffusers.utils.testing_utils import (
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
torch_device, torch_device,
) )
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, to_np
......
...@@ -20,12 +20,12 @@ import torch ...@@ -20,12 +20,12 @@ import torch
from transformers import Gemma2Config, Gemma2Model, GemmaTokenizer from transformers import Gemma2Config, Gemma2Model, GemmaTokenizer
from diffusers import AutoencoderDC, SanaSprintImg2ImgPipeline, SanaTransformer2DModel, SCMScheduler from diffusers import AutoencoderDC, SanaSprintImg2ImgPipeline, SanaTransformer2DModel, SCMScheduler
from diffusers.utils.testing_utils import ( from diffusers.utils.torch_utils import randn_tensor
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
torch_device, torch_device,
) )
from diffusers.utils.torch_utils import randn_tensor
from ..pipeline_params import ( from ..pipeline_params import (
IMAGE_TO_IMAGE_IMAGE_PARAMS, IMAGE_TO_IMAGE_IMAGE_PARAMS,
TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS, TEXT_GUIDED_IMAGE_VARIATION_BATCH_PARAMS,
......
...@@ -21,14 +21,14 @@ from transformers import CLIPTextConfig, CLIPTextModelWithProjection, CLIPTokeni ...@@ -21,14 +21,14 @@ from transformers import CLIPTextConfig, CLIPTextModelWithProjection, CLIPTokeni
from diffusers import HeunDiscreteScheduler, PriorTransformer, ShapEPipeline from diffusers import HeunDiscreteScheduler, PriorTransformer, ShapEPipeline
from diffusers.pipelines.shap_e import ShapERenderer from diffusers.pipelines.shap_e import ShapERenderer
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
load_numpy, load_numpy,
nightly, nightly,
require_torch_accelerator, require_torch_accelerator,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference
......
...@@ -22,7 +22,8 @@ from transformers import CLIPImageProcessor, CLIPVisionConfig, CLIPVisionModel ...@@ -22,7 +22,8 @@ from transformers import CLIPImageProcessor, CLIPVisionConfig, CLIPVisionModel
from diffusers import HeunDiscreteScheduler, PriorTransformer, ShapEImg2ImgPipeline from diffusers import HeunDiscreteScheduler, PriorTransformer, ShapEImg2ImgPipeline
from diffusers.pipelines.shap_e import ShapERenderer from diffusers.pipelines.shap_e import ShapERenderer
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
floats_tensor, floats_tensor,
load_image, load_image,
...@@ -31,7 +32,6 @@ from diffusers.utils.testing_utils import ( ...@@ -31,7 +32,6 @@ from diffusers.utils.testing_utils import (
require_torch_accelerator, require_torch_accelerator,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference
......
...@@ -24,10 +24,10 @@ from diffusers import ( ...@@ -24,10 +24,10 @@ from diffusers import (
SkyReelsV2Transformer3DModel, SkyReelsV2Transformer3DModel,
UniPCMultistepScheduler, UniPCMultistepScheduler,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
) )
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_IMAGE_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import ( from ..test_pipelines_common import (
PipelineTesterMixin, PipelineTesterMixin,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment