[Refactor] harmonize the module structure for models in tests (#6738)

sayakpaul · yiyixuxu · web-flow · commit ec9840a5db98 · 2024-02-01T14:23:39.000+05:30
* harmonize the module structure for models in tests

* make the folders modules.

---------

Co-authored-by: YiYi Xu &lt;yixu310@gmail.com&gt;
diff --git a/tests/models/autoencoders/__init__.py b/tests/models/autoencoders/__init__.py
diff --git a/tests/models/autoencoders/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/autoencoders/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/autoencoders/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/unets/__init__.py b/tests/models/unets/__init__.py
diff --git a/tests/models/unets/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/unets/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/unets/test_models_unet_2d_condition.py b/tests/models/unets/test_models_unet_2d_condition.py
@@ -48,7 +48,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/unets/test_models_unet_2d_flax.py b/tests/models/unets/test_models_unet_2d_flax.py
diff --git a/tests/models/unets/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/unets/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/unets/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/unets/test_unet_2d_blocks.py b/tests/models/unets/test_unet_2d_blocks.py
diff --git a/tests/models/unets/test_unet_blocks_common.py b/tests/models/unets/test_unet_blocks_common.py
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`)`
`47`	`47`	`from diffusers.utils.torch_utils import randn_tensor`
`48`	`48`
`49`		`-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin`
	`49`	`+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin`
`50`	`50`
`51`	`51`
`52`	`52`	`enable_full_determinism()`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`torch_device,`
`26`	`26`	`)`
`27`	`27`
`28`		`-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin`
	`28`	`+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin`
`29`	`29`
`30`	`30`
`31`	`31`	`enable_full_determinism()`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`torch_device,`
`31`	`31`	`)`
`32`	`32`
`33`		`-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin`
	`33`	`+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin`
`34`	`34`
`35`	`35`
`36`	`36`	`logger = logging.get_logger(__name__)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`torch_device,`
`49`	`49`	`)`
`50`	`50`
`51`		`-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin`
	`51`	`+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin`
`52`	`52`
`53`	`53`
`54`	`54`	`logger = logging.get_logger(__name__)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`torch_device,`
`29`	`29`	`)`
`30`	`30`
`31`		`-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin`
	`31`	`+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin`
`32`	`32`
`33`	`33`
`34`	`34`	`logger = logging.get_logger(__name__)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`torch_device,`
`39`	`39`	`)`
`40`	`40`
`41`		`-from ..models.test_models_vae import (`
	`41`	`+from ..models.autoencoders.test_models_vae import (`
`42`	`42`	`get_asym_autoencoder_kl_config,`
`43`	`43`	`get_autoencoder_kl_config,`
`44`	`44`	`get_autoencoder_tiny_config,`