From ca84cd1a298b37e38a406a526976eca95296e547 Mon Sep 17 00:00:00 2001 From: sayakpaul Date: Sun, 28 Jan 2024 11:01:30 +0530 Subject: [PATCH 1/2] harmonize the module structure for models in tests --- tests/models/{ => autoencoders}/test_models_vae.py | 2 +- tests/models/{ => autoencoders}/test_models_vae_flax.py | 2 +- tests/models/{ => autoencoders}/test_models_vq.py | 2 +- tests/models/{ => unets}/test_models_unet_1d.py | 2 +- tests/models/{ => unets}/test_models_unet_2d.py | 2 +- tests/models/{ => unets}/test_models_unet_2d_condition.py | 2 +- tests/models/{ => unets}/test_models_unet_2d_flax.py | 0 tests/models/{ => unets}/test_models_unet_3d_condition.py | 2 +- tests/models/{ => unets}/test_models_unet_motion.py | 2 +- tests/models/{ => unets}/test_models_unet_spatiotemporal.py | 2 +- tests/models/{ => unets}/test_unet_2d_blocks.py | 0 tests/models/{ => unets}/test_unet_blocks_common.py | 0 tests/pipelines/test_pipelines_common.py | 2 +- 13 files changed, 10 insertions(+), 10 deletions(-) rename tests/models/{ => autoencoders}/test_models_vae.py (99%) rename tests/models/{ => autoencoders}/test_models_vae_flax.py (94%) rename tests/models/{ => autoencoders}/test_models_vq.py (97%) rename tests/models/{ => unets}/test_models_unet_1d.py (99%) rename tests/models/{ => unets}/test_models_unet_2d.py (99%) rename tests/models/{ => unets}/test_models_unet_2d_condition.py (99%) rename tests/models/{ => unets}/test_models_unet_2d_flax.py (100%) rename tests/models/{ => unets}/test_models_unet_3d_condition.py (98%) rename tests/models/{ => unets}/test_models_unet_motion.py (99%) rename tests/models/{ => unets}/test_models_unet_spatiotemporal.py (99%) rename tests/models/{ => unets}/test_unet_2d_blocks.py (100%) rename tests/models/{ => unets}/test_unet_blocks_common.py (100%) diff --git a/tests/models/test_models_vae.py b/tests/models/autoencoders/test_models_vae.py similarity index 99% rename from tests/models/test_models_vae.py rename to tests/models/autoencoders/test_models_vae.py index a4ff31706be7..fd7931a9826c 100644 --- a/tests/models/test_models_vae.py +++ b/tests/models/autoencoders/test_models_vae.py @@ -46,7 +46,7 @@ ) from diffusers.utils.torch_utils import randn_tensor -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin enable_full_determinism() diff --git a/tests/models/test_models_vae_flax.py b/tests/models/autoencoders/test_models_vae_flax.py similarity index 94% rename from tests/models/test_models_vae_flax.py rename to tests/models/autoencoders/test_models_vae_flax.py index e5c56b61a5a4..8fedb85eccfc 100644 --- a/tests/models/test_models_vae_flax.py +++ b/tests/models/autoencoders/test_models_vae_flax.py @@ -4,7 +4,7 @@ from diffusers.utils import is_flax_available from diffusers.utils.testing_utils import require_flax -from .test_modeling_common_flax import FlaxModelTesterMixin +from ..test_modeling_common_flax import FlaxModelTesterMixin if is_flax_available(): diff --git a/tests/models/test_models_vq.py b/tests/models/autoencoders/test_models_vq.py similarity index 97% rename from tests/models/test_models_vq.py rename to tests/models/autoencoders/test_models_vq.py index a5a9288d6462..24ac5f63bd54 100644 --- a/tests/models/test_models_vq.py +++ b/tests/models/autoencoders/test_models_vq.py @@ -25,7 +25,7 @@ torch_device, ) -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin enable_full_determinism() diff --git a/tests/models/test_models_unet_1d.py b/tests/models/unets/test_models_unet_1d.py similarity index 99% rename from tests/models/test_models_unet_1d.py rename to tests/models/unets/test_models_unet_1d.py index aad496416508..7225f6409bf0 100644 --- a/tests/models/test_models_unet_1d.py +++ b/tests/models/unets/test_models_unet_1d.py @@ -25,7 +25,7 @@ torch_device, ) -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin class UNet1DModelTests(ModelTesterMixin, UNetTesterMixin, unittest.TestCase): diff --git a/tests/models/test_models_unet_2d.py b/tests/models/unets/test_models_unet_2d.py similarity index 99% rename from tests/models/test_models_unet_2d.py rename to tests/models/unets/test_models_unet_2d.py index 2be343e9d627..a06dd9cc02ba 100644 --- a/tests/models/test_models_unet_2d.py +++ b/tests/models/unets/test_models_unet_2d.py @@ -30,7 +30,7 @@ torch_device, ) -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin logger = logging.get_logger(__name__) diff --git a/tests/models/test_models_unet_2d_condition.py b/tests/models/unets/test_models_unet_2d_condition.py similarity index 99% rename from tests/models/test_models_unet_2d_condition.py rename to tests/models/unets/test_models_unet_2d_condition.py index 0e2a4765d6ca..513420e93e05 100644 --- a/tests/models/test_models_unet_2d_condition.py +++ b/tests/models/unets/test_models_unet_2d_condition.py @@ -44,7 +44,7 @@ torch_device, ) -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin logger = logging.get_logger(__name__) diff --git a/tests/models/test_models_unet_2d_flax.py b/tests/models/unets/test_models_unet_2d_flax.py similarity index 100% rename from tests/models/test_models_unet_2d_flax.py rename to tests/models/unets/test_models_unet_2d_flax.py diff --git a/tests/models/test_models_unet_3d_condition.py b/tests/models/unets/test_models_unet_3d_condition.py similarity index 98% rename from tests/models/test_models_unet_3d_condition.py rename to tests/models/unets/test_models_unet_3d_condition.py index 9efaea8d651b..88c88b1f495c 100644 --- a/tests/models/test_models_unet_3d_condition.py +++ b/tests/models/unets/test_models_unet_3d_condition.py @@ -23,7 +23,7 @@ from diffusers.utils.import_utils import is_xformers_available from diffusers.utils.testing_utils import enable_full_determinism, floats_tensor, skip_mps, torch_device -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin enable_full_determinism() diff --git a/tests/models/test_models_unet_motion.py b/tests/models/unets/test_models_unet_motion.py similarity index 99% rename from tests/models/test_models_unet_motion.py rename to tests/models/unets/test_models_unet_motion.py index 60c3399db537..681a88077b9b 100644 --- a/tests/models/test_models_unet_motion.py +++ b/tests/models/unets/test_models_unet_motion.py @@ -30,7 +30,7 @@ torch_device, ) -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin logger = logging.get_logger(__name__) diff --git a/tests/models/test_models_unet_spatiotemporal.py b/tests/models/unets/test_models_unet_spatiotemporal.py similarity index 99% rename from tests/models/test_models_unet_spatiotemporal.py rename to tests/models/unets/test_models_unet_spatiotemporal.py index fa07eaa736ba..a693645a205c 100644 --- a/tests/models/test_models_unet_spatiotemporal.py +++ b/tests/models/unets/test_models_unet_spatiotemporal.py @@ -28,7 +28,7 @@ torch_device, ) -from .test_modeling_common import ModelTesterMixin, UNetTesterMixin +from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin logger = logging.get_logger(__name__) diff --git a/tests/models/test_unet_2d_blocks.py b/tests/models/unets/test_unet_2d_blocks.py similarity index 100% rename from tests/models/test_unet_2d_blocks.py rename to tests/models/unets/test_unet_2d_blocks.py diff --git a/tests/models/test_unet_blocks_common.py b/tests/models/unets/test_unet_blocks_common.py similarity index 100% rename from tests/models/test_unet_blocks_common.py rename to tests/models/unets/test_unet_blocks_common.py diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py index e107c5772af9..e3c8a4ef503f 100644 --- a/tests/pipelines/test_pipelines_common.py +++ b/tests/pipelines/test_pipelines_common.py @@ -38,7 +38,7 @@ torch_device, ) -from ..models.test_models_vae import ( +from ..models.autoencoders.test_models_vae import ( get_asym_autoencoder_kl_config, get_autoencoder_kl_config, get_autoencoder_tiny_config, From ad65102df7d9ac55bee526d1cbdfbc94a395c4d7 Mon Sep 17 00:00:00 2001 From: sayakpaul Date: Sun, 28 Jan 2024 11:09:53 +0530 Subject: [PATCH 2/2] make the folders modules. --- tests/models/autoencoders/__init__.py | 0 tests/models/unets/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/models/autoencoders/__init__.py create mode 100644 tests/models/unets/__init__.py diff --git a/tests/models/autoencoders/__init__.py b/tests/models/autoencoders/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/models/unets/__init__.py b/tests/models/unets/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1