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,13 +21,13 @@ import torch ...@@ -21,13 +21,13 @@ import torch
from diffusers import UNetSpatioTemporalConditionModel from diffusers import UNetSpatioTemporalConditionModel
from diffusers.utils import logging from diffusers.utils import logging
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 (
enable_full_determinism, enable_full_determinism,
floats_tensor, floats_tensor,
skip_mps, skip_mps,
torch_device, torch_device,
) )
from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
import unittest import unittest
from diffusers.models.unets.unet_2d_blocks import * # noqa F403 from diffusers.models.unets.unet_2d_blocks import * # noqa F403
from diffusers.utils.testing_utils import torch_device
from ...testing_utils import torch_device
from .test_unet_blocks_common import UNetBlockTesterMixin from .test_unet_blocks_common import UNetBlockTesterMixin
......
...@@ -16,14 +16,15 @@ from typing import Tuple ...@@ -16,14 +16,15 @@ from typing import Tuple
import torch import torch
from diffusers.utils.testing_utils import ( from diffusers.utils.torch_utils import randn_tensor
from ...testing_utils import (
floats_tensor, floats_tensor,
require_torch, require_torch,
require_torch_accelerator_with_training, require_torch_accelerator_with_training,
torch_all_close, torch_all_close,
torch_device, torch_device,
) )
from diffusers.utils.torch_utils import randn_tensor
@require_torch @require_torch
......
...@@ -27,15 +27,15 @@ from diffusers import ( ...@@ -27,15 +27,15 @@ from diffusers import (
StableDiffusionXLModularPipeline, StableDiffusionXLModularPipeline,
) )
from diffusers.loaders import ModularIPAdapterMixin from diffusers.loaders import ModularIPAdapterMixin
from diffusers.utils.testing_utils import (
enable_full_determinism,
floats_tensor,
torch_device,
)
from ...models.unets.test_models_unet_2d_condition import ( from ...models.unets.test_models_unet_2d_condition import (
create_ip_adapter_state_dict, create_ip_adapter_state_dict,
) )
from ...testing_utils import (
enable_full_determinism,
floats_tensor,
torch_device,
)
from ..test_modular_pipelines_common import ( from ..test_modular_pipelines_common import (
ModularPipelineTesterMixin, ModularPipelineTesterMixin,
) )
......
...@@ -9,7 +9,8 @@ import torch ...@@ -9,7 +9,8 @@ import torch
import diffusers import diffusers
from diffusers import ComponentsManager, ModularPipeline, ModularPipelineBlocks from diffusers import ComponentsManager, ModularPipeline, ModularPipelineBlocks
from diffusers.utils import logging from diffusers.utils import logging
from diffusers.utils.testing_utils import (
from ..testing_utils import (
backend_empty_cache, backend_empty_cache,
numpy_cosine_similarity_distance, numpy_cosine_similarity_distance,
require_accelerator, require_accelerator,
......
...@@ -28,7 +28,8 @@ from diffusers import ( ...@@ -28,7 +28,8 @@ from diffusers import (
logging, logging,
) )
from diffusers.configuration_utils import ConfigMixin, register_to_config from diffusers.configuration_utils import ConfigMixin, register_to_config
from diffusers.utils.testing_utils import CaptureLogger
from ..testing_utils import CaptureLogger
class SampleObject(ConfigMixin): class SampleObject(ConfigMixin):
......
...@@ -20,7 +20,8 @@ import torch ...@@ -20,7 +20,8 @@ import torch
from diffusers import UNet2DConditionModel from diffusers import UNet2DConditionModel
from diffusers.training_utils import EMAModel from diffusers.training_utils import EMAModel
from diffusers.utils.testing_utils import enable_full_determinism, skip_mps, torch_device
from ..testing_utils import enable_full_determinism, skip_mps, torch_device
enable_full_determinism() enable_full_determinism()
......
...@@ -7,7 +7,8 @@ import numpy as np ...@@ -7,7 +7,8 @@ import numpy as np
import PIL.Image import PIL.Image
from diffusers.utils.outputs import BaseOutput from diffusers.utils.outputs import BaseOutput
from diffusers.utils.testing_utils import require_torch
from ..testing_utils import require_torch
@dataclass @dataclass
......
...@@ -19,7 +19,8 @@ import torch ...@@ -19,7 +19,8 @@ import torch
from diffusers import DDIMScheduler, DDPMScheduler, UNet2DModel from diffusers import DDIMScheduler, DDPMScheduler, UNet2DModel
from diffusers.training_utils import set_seed from diffusers.training_utils import set_seed
from diffusers.utils.testing_utils import slow
from ..testing_utils import slow
torch.backends.cuda.matmul.allow_tf32 = False torch.backends.cuda.matmul.allow_tf32 = False
......
...@@ -20,7 +20,8 @@ import pytest ...@@ -20,7 +20,8 @@ import pytest
from diffusers import __version__ from diffusers import __version__
from diffusers.utils import deprecate from diffusers.utils import deprecate
from diffusers.utils.testing_utils import Expectations, str_to_bool
from ..testing_utils import Expectations, str_to_bool
# Used to test the hub # Used to test the hub
......
...@@ -23,7 +23,8 @@ import torch ...@@ -23,7 +23,8 @@ import torch
from transformers import AutoTokenizer, T5Config, T5EncoderModel from transformers import AutoTokenizer, T5Config, T5EncoderModel
from diffusers import AllegroPipeline, AllegroTransformer3DModel, AutoencoderKLAllegro, DDIMScheduler from diffusers import AllegroPipeline, AllegroTransformer3DModel, AutoencoderKLAllegro, DDIMScheduler
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,
...@@ -33,7 +34,6 @@ from diffusers.utils.testing_utils import ( ...@@ -33,7 +34,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, PyramidAttentionBroadcastTesterMixin, to_np from ..test_pipelines_common import PipelineTesterMixin, PyramidAttentionBroadcastTesterMixin, to_np
......
...@@ -19,7 +19,8 @@ from diffusers import ( ...@@ -19,7 +19,8 @@ from diffusers import (
) )
from diffusers.models.attention import FreeNoiseTransformerBlock from diffusers.models.attention import FreeNoiseTransformerBlock
from diffusers.utils import is_xformers_available, logging from diffusers.utils import is_xformers_available, logging
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
numpy_cosine_similarity_distance, numpy_cosine_similarity_distance,
require_accelerator, require_accelerator,
...@@ -27,7 +28,6 @@ from diffusers.utils.testing_utils import ( ...@@ -27,7 +28,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_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import ( from ..test_pipelines_common import (
IPAdapterTesterMixin, IPAdapterTesterMixin,
......
...@@ -21,8 +21,8 @@ from diffusers import ( ...@@ -21,8 +21,8 @@ from diffusers import (
from diffusers.models.attention import FreeNoiseTransformerBlock from diffusers.models.attention import FreeNoiseTransformerBlock
from diffusers.utils import logging from diffusers.utils import logging
from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.import_utils import is_xformers_available
from diffusers.utils.testing_utils import require_accelerator, torch_device
from ...testing_utils import require_accelerator, 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 ( from ..test_pipelines_common import (
IPAdapterTesterMixin, IPAdapterTesterMixin,
......
...@@ -14,8 +14,8 @@ from diffusers import ( ...@@ -14,8 +14,8 @@ from diffusers import (
UNetMotionModel, UNetMotionModel,
) )
from diffusers.utils import is_xformers_available, logging from diffusers.utils import is_xformers_available, logging
from diffusers.utils.testing_utils import require_accelerator, torch_device
from ...testing_utils import require_accelerator, torch_device
from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_CALLBACK_CFG_PARAMS, TEXT_TO_IMAGE_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_BATCH_PARAMS, TEXT_TO_IMAGE_CALLBACK_CFG_PARAMS, TEXT_TO_IMAGE_PARAMS
from ..test_pipelines_common import ( from ..test_pipelines_common import (
IPAdapterTesterMixin, IPAdapterTesterMixin,
......
...@@ -20,8 +20,8 @@ from diffusers import ( ...@@ -20,8 +20,8 @@ from diffusers import (
) )
from diffusers.utils import logging from diffusers.utils import logging
from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.import_utils import is_xformers_available
from diffusers.utils.testing_utils import require_accelerator, torch_device
from ...testing_utils import require_accelerator, 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 ( from ..test_pipelines_common import (
IPAdapterTesterMixin, IPAdapterTesterMixin,
......
...@@ -19,8 +19,8 @@ from diffusers import ( ...@@ -19,8 +19,8 @@ from diffusers import (
) )
from diffusers.models.attention import FreeNoiseTransformerBlock from diffusers.models.attention import FreeNoiseTransformerBlock
from diffusers.utils import is_xformers_available, logging from diffusers.utils import is_xformers_available, logging
from diffusers.utils.testing_utils import require_accelerator, torch_device
from ...testing_utils import require_accelerator, torch_device
from ..pipeline_params import TEXT_TO_IMAGE_PARAMS, VIDEO_TO_VIDEO_BATCH_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_PARAMS, VIDEO_TO_VIDEO_BATCH_PARAMS
from ..test_pipelines_common import IPAdapterTesterMixin, PipelineFromPipeTesterMixin, PipelineTesterMixin from ..test_pipelines_common import IPAdapterTesterMixin, PipelineFromPipeTesterMixin, PipelineTesterMixin
......
...@@ -20,8 +20,8 @@ from diffusers import ( ...@@ -20,8 +20,8 @@ from diffusers import (
) )
from diffusers.models.attention import FreeNoiseTransformerBlock from diffusers.models.attention import FreeNoiseTransformerBlock
from diffusers.utils import is_xformers_available, logging from diffusers.utils import is_xformers_available, logging
from diffusers.utils.testing_utils import require_accelerator, torch_device
from ...testing_utils import require_accelerator, torch_device
from ..pipeline_params import TEXT_TO_IMAGE_PARAMS, VIDEO_TO_VIDEO_BATCH_PARAMS from ..pipeline_params import TEXT_TO_IMAGE_PARAMS, VIDEO_TO_VIDEO_BATCH_PARAMS
from ..test_pipelines_common import IPAdapterTesterMixin, PipelineFromPipeTesterMixin, PipelineTesterMixin from ..test_pipelines_common import IPAdapterTesterMixin, PipelineFromPipeTesterMixin, PipelineTesterMixin
......
...@@ -46,14 +46,14 @@ from diffusers import ( ...@@ -46,14 +46,14 @@ from diffusers import (
PNDMScheduler, PNDMScheduler,
) )
from diffusers.utils import is_transformers_version from diffusers.utils import is_transformers_version
from diffusers.utils.testing_utils import (
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
is_torch_version, is_torch_version,
nightly, nightly,
torch_device, torch_device,
) )
from ..pipeline_params import TEXT_TO_AUDIO_BATCH_PARAMS, TEXT_TO_AUDIO_PARAMS from ..pipeline_params import TEXT_TO_AUDIO_BATCH_PARAMS, TEXT_TO_AUDIO_PARAMS
from ..test_pipelines_common import PipelineTesterMixin from ..test_pipelines_common import PipelineTesterMixin
......
...@@ -27,7 +27,11 @@ from diffusers import ( ...@@ -27,7 +27,11 @@ from diffusers import (
FlowMatchEulerDiscreteScheduler, FlowMatchEulerDiscreteScheduler,
) )
from diffusers.pipelines.bria import BriaPipeline from diffusers.pipelines.bria import BriaPipeline
from diffusers.utils.testing_utils import (
# from ..test_pipelines_common import PipelineTesterMixin, check_qkv_fused_layers_exist
from tests.pipelines.test_pipelines_common import PipelineTesterMixin, to_np
from ...testing_utils import (
backend_empty_cache, backend_empty_cache,
enable_full_determinism, enable_full_determinism,
numpy_cosine_similarity_distance, numpy_cosine_similarity_distance,
...@@ -36,9 +40,6 @@ from diffusers.utils.testing_utils import ( ...@@ -36,9 +40,6 @@ from diffusers.utils.testing_utils import (
torch_device, torch_device,
) )
# from ..test_pipelines_common import PipelineTesterMixin, check_qkv_fused_layers_exist
from tests.pipelines.test_pipelines_common import PipelineTesterMixin, to_np
enable_full_determinism() enable_full_determinism()
......
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