Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sayakpaul merged 5 commits into from
Feb 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca84cd1
harmonize the module structure for models in tests
sayakpaul Jan 28, 2024
ad65102
make the folders modules.
sayakpaul Jan 28, 2024
65da843
Merge branch 'main' into move-models-tests-folder
sayakpaul Jan 31, 2024
5bd5cf9
Merge branch 'main' into move-models-tests-folder
sayakpaul Feb 1, 2024
399c580
Merge branch 'main' into move-models-tests-folder
yiyixuxu Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added tests/models/autoencoders/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion tests/models/test_models_vae.py → tests/models/autoencoders/test_models_vae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tests/models/test_models_vae_flax.py → ...dels/autoencoders/test_models_vae_flax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion tests/models/test_models_vq.py → tests/models/autoencoders/test_models_vq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
torch_device,
)

from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin


enable_full_determinism()
Expand Down
Empty file added tests/models/unets/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion tests/models/test_models_unet_1d.py → tests/models/unets/test_models_unet_1d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion tests/models/test_models_unet_2d.py → tests/models/unets/test_models_unet_2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion ...s/models/test_models_unet_2d_condition.py → ...ls/unets/test_models_unet_2d_condition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
0 tests/models/test_models_unet_2d_flax.py → .../models/unets/test_models_unet_2d_flax.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/models/test_models_unet_3d_condition.py → ...ls/unets/test_models_unet_3d_condition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tests/models/test_models_unet_motion.py → ...s/models/unets/test_models_unet_motion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion ...models/test_models_unet_spatiotemporal.py → .../unets/test_models_unet_spatiotemporal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
0 tests/models/test_unet_2d_blocks.py → tests/models/unets/test_unet_2d_blocks.py
View file
Open in desktop
File renamed without changes.
0 tests/models/test_unet_blocks_common.py → ...s/models/unets/test_unet_blocks_common.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/pipelines/test_pipelines_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down