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
...@@ -21,7 +21,8 @@ import numpy as np ...@@ -21,7 +21,8 @@ import numpy as np
import torch import torch
from diffusers import DDIMScheduler, KandinskyV22Pipeline, KandinskyV22PriorPipeline, UNet2DConditionModel, VQModel from diffusers import DDIMScheduler, KandinskyV22Pipeline, KandinskyV22PriorPipeline, UNet2DConditionModel, VQModel
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,
...@@ -31,7 +32,6 @@ from diffusers.utils.testing_utils import ( ...@@ -31,7 +32,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -22,8 +22,8 @@ from diffusers import ( ...@@ -22,8 +22,8 @@ from diffusers import (
KandinskyV22Img2ImgCombinedPipeline, KandinskyV22Img2ImgCombinedPipeline,
KandinskyV22InpaintCombinedPipeline, KandinskyV22InpaintCombinedPipeline,
) )
from diffusers.utils.testing_utils import enable_full_determinism, require_torch_accelerator, torch_device
from ...testing_utils import enable_full_determinism, require_torch_accelerator, torch_device
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
from .test_kandinsky import Dummies from .test_kandinsky import Dummies
from .test_kandinsky_img2img import Dummies as Img2ImgDummies from .test_kandinsky_img2img import Dummies as Img2ImgDummies
......
...@@ -27,7 +27,8 @@ from diffusers import ( ...@@ -27,7 +27,8 @@ from diffusers import (
UNet2DConditionModel, UNet2DConditionModel,
VQModel, VQModel,
) )
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 (
require_torch_accelerator, require_torch_accelerator,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -28,7 +28,8 @@ from diffusers import ( ...@@ -28,7 +28,8 @@ from diffusers import (
UNet2DConditionModel, UNet2DConditionModel,
VQModel, VQModel,
) )
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,
...@@ -39,7 +40,6 @@ from diffusers.utils.testing_utils import ( ...@@ -39,7 +40,6 @@ from diffusers.utils.testing_utils import (
require_torch_accelerator, require_torch_accelerator,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -28,7 +28,8 @@ from diffusers import ( ...@@ -28,7 +28,8 @@ from diffusers import (
UNet2DConditionModel, UNet2DConditionModel,
VQModel, VQModel,
) )
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,
...@@ -39,7 +40,6 @@ from diffusers.utils.testing_utils import ( ...@@ -39,7 +40,6 @@ from diffusers.utils.testing_utils import (
slow, slow,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -28,7 +28,8 @@ from diffusers import ( ...@@ -28,7 +28,8 @@ from diffusers import (
UNet2DConditionModel, UNet2DConditionModel,
VQModel, VQModel,
) )
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 ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -29,8 +29,8 @@ from transformers import ( ...@@ -29,8 +29,8 @@ from transformers import (
) )
from diffusers import KandinskyV22PriorPipeline, PriorTransformer, UnCLIPScheduler from diffusers import KandinskyV22PriorPipeline, PriorTransformer, UnCLIPScheduler
from diffusers.utils.testing_utils import enable_full_determinism, skip_mps, torch_device
from ...testing_utils import enable_full_determinism, skip_mps, torch_device
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -30,13 +30,13 @@ from transformers import ( ...@@ -30,13 +30,13 @@ from transformers import (
) )
from diffusers import KandinskyV22PriorEmb2EmbPipeline, PriorTransformer, UnCLIPScheduler from diffusers import KandinskyV22PriorEmb2EmbPipeline, PriorTransformer, UnCLIPScheduler
from diffusers.utils.testing_utils import (
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
skip_mps, skip_mps,
torch_device, torch_device,
) )
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -30,7 +30,8 @@ from diffusers import ( ...@@ -30,7 +30,8 @@ from diffusers import (
) )
from diffusers.image_processor import VaeImageProcessor from diffusers.image_processor import VaeImageProcessor
from diffusers.schedulers.scheduling_ddpm import DDPMScheduler from diffusers.schedulers.scheduling_ddpm import DDPMScheduler
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
load_image, load_image,
...@@ -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_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_BATCH_PARAMS,
TEXT_TO_IMAGE_CALLBACK_CFG_PARAMS, TEXT_TO_IMAGE_CALLBACK_CFG_PARAMS,
......
...@@ -30,7 +30,8 @@ from diffusers import ( ...@@ -30,7 +30,8 @@ from diffusers import (
) )
from diffusers.image_processor import VaeImageProcessor from diffusers.image_processor import VaeImageProcessor
from diffusers.schedulers.scheduling_ddpm import DDPMScheduler from diffusers.schedulers.scheduling_ddpm import DDPMScheduler
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,
...@@ -39,7 +40,6 @@ from diffusers.utils.testing_utils import ( ...@@ -39,7 +40,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,
......
...@@ -25,8 +25,8 @@ from diffusers import ( ...@@ -25,8 +25,8 @@ from diffusers import (
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.pipelines.kolors import ChatGLMModel, ChatGLMTokenizer from diffusers.pipelines.kolors import ChatGLMModel, ChatGLMTokenizer
from diffusers.utils.testing_utils import enable_full_determinism
from ...testing_utils import enable_full_determinism
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,
......
...@@ -26,11 +26,11 @@ from diffusers import ( ...@@ -26,11 +26,11 @@ from diffusers import (
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.pipelines.kolors import ChatGLMModel, ChatGLMTokenizer from diffusers.pipelines.kolors import ChatGLMModel, ChatGLMTokenizer
from diffusers.utils.testing_utils import (
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
) )
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,
......
...@@ -12,14 +12,14 @@ from diffusers import ( ...@@ -12,14 +12,14 @@ from diffusers import (
LCMScheduler, LCMScheduler,
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 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 IPAdapterTesterMixin, PipelineLatentTesterMixin, PipelineTesterMixin from ..test_pipelines_common import IPAdapterTesterMixin, PipelineLatentTesterMixin, PipelineTesterMixin
......
...@@ -13,7 +13,8 @@ from diffusers import ( ...@@ -13,7 +13,8 @@ from diffusers import (
LCMScheduler, LCMScheduler,
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,
...@@ -22,7 +23,6 @@ from diffusers.utils.testing_utils import ( ...@@ -22,7 +23,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,
......
...@@ -21,7 +21,8 @@ import torch ...@@ -21,7 +21,8 @@ import torch
from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer
from diffusers import AutoencoderKL, DDIMScheduler, LDMTextToImagePipeline, UNet2DConditionModel from diffusers import AutoencoderKL, DDIMScheduler, LDMTextToImagePipeline, UNet2DConditionModel
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
load_numpy, load_numpy,
...@@ -29,7 +30,6 @@ from diffusers.utils.testing_utils import ( ...@@ -29,7 +30,6 @@ from diffusers.utils.testing_utils import (
require_torch_accelerator, require_torch_accelerator,
torch_device, torch_device,
) )
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -21,7 +21,8 @@ import torch ...@@ -21,7 +21,8 @@ import torch
from diffusers import DDIMScheduler, LDMSuperResolutionPipeline, UNet2DModel, VQModel from diffusers import DDIMScheduler, LDMSuperResolutionPipeline, UNet2DModel, VQModel
from diffusers.utils import PIL_INTERPOLATION from diffusers.utils import PIL_INTERPOLATION
from diffusers.utils.testing_utils import (
from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
load_image, load_image,
......
...@@ -31,7 +31,8 @@ from diffusers import ( ...@@ -31,7 +31,8 @@ from diffusers import (
PyramidAttentionBroadcastConfig, PyramidAttentionBroadcastConfig,
) )
from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.import_utils import is_xformers_available
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,
...@@ -39,7 +40,6 @@ from diffusers.utils.testing_utils import ( ...@@ -39,7 +40,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 (
FasterCacheTesterMixin, FasterCacheTesterMixin,
......
...@@ -28,7 +28,8 @@ from diffusers import ( ...@@ -28,7 +28,8 @@ from diffusers import (
LEditsPPPipelineStableDiffusion, LEditsPPPipelineStableDiffusion,
UNet2DConditionModel, UNet2DConditionModel,
) )
from diffusers.utils.testing_utils import (
from ...testing_utils import (
Expectations, Expectations,
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
......
...@@ -37,7 +37,7 @@ from diffusers import ( ...@@ -37,7 +37,7 @@ from diffusers import (
) )
# from diffusers.image_processor import VaeImageProcessor # from diffusers.image_processor import VaeImageProcessor
from diffusers.utils.testing_utils import ( from ...testing_utils import (
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
load_image, load_image,
......
...@@ -20,8 +20,8 @@ import torch ...@@ -20,8 +20,8 @@ import torch
from transformers import AutoTokenizer, T5EncoderModel from transformers import AutoTokenizer, T5EncoderModel
from diffusers import AutoencoderKLLTXVideo, FlowMatchEulerDiscreteScheduler, LTXPipeline, LTXVideoTransformer3DModel from diffusers import AutoencoderKLLTXVideo, FlowMatchEulerDiscreteScheduler, LTXPipeline, LTXVideoTransformer3DModel
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 FirstBlockCacheTesterMixin, PipelineTesterMixin, to_np from ..test_pipelines_common import FirstBlockCacheTesterMixin, PipelineTesterMixin, to_np
......
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