[CI] Refactor Cog Transformer Model Tests

tests/models/transformers/test_models_transformer_cogvideox.py

@@ -13,59 +13,52 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
-
 import torch
 
 from diffusers import CogVideoXTransformer3DModel
+from diffusers.utils.torch_utils import randn_tensor
 
-from ...testing_utils import (
-    enable_full_determinism,
-    torch_device,
+from ...testing_utils import enable_full_determinism, torch_device
+from ..testing_utils import (
+    BaseModelTesterConfig,
+    ModelTesterMixin,
+    TrainingTesterMixin,
 )
-from ..test_modeling_common import ModelTesterMixin
 
 
 enable_full_determinism()
 
 
-class CogVideoXTransformerTests(ModelTesterMixin, unittest.TestCase):
-    model_class = CogVideoXTransformer3DModel
-    main_input_name = "hidden_states"
-    uses_custom_attn_processor = True
-    model_split_percents = [0.7, 0.7, 0.8]
+# ======================== CogVideoX ========================
+
 
+class CogVideoXTransformerTesterConfig(BaseModelTesterConfig):
     @property
-    def dummy_input(self):
-        batch_size = 2
-        num_channels = 4
-        num_frames = 1
-        height = 8
-        width = 8
-        embedding_dim = 8
-        sequence_length = 8
+    def model_class(self):
+        return CogVideoXTransformer3DModel
 
-        hidden_states = torch.randn((batch_size, num_frames, num_channels, height, width)).to(torch_device)
-        encoder_hidden_states = torch.randn((batch_size, sequence_length, embedding_dim)).to(torch_device)
-        timestep = torch.randint(0, 1000, size=(batch_size,)).to(torch_device)
+    @property
+    def main_input_name(self) -> str:
+        return "hidden_states"
 
-        return {
-            "hidden_states": hidden_states,
-            "encoder_hidden_states": encoder_hidden_states,
-            "timestep": timestep,
-        }
+    @property
+    def model_split_percents(self) -> list:
+        return [0.7, 0.7, 0.8]
 
     @property
-    def input_shape(self):
+    def output_shape(self) -> tuple:
         return (1, 4, 8, 8)
 
     @property
-    def output_shape(self):
+    def input_shape(self) -> tuple:
         return (1, 4, 8, 8)
 
-    def prepare_init_args_and_inputs_for_common(self):
-        init_dict = {
-            # Product of num_attention_heads * attention_head_dim must be divisible by 16 for 3D positional embeddings.
+    @property
+    def generator(self):
+        return torch.Generator("cpu").manual_seed(0)
+
+    def get_init_dict(self) -> dict:
+        return {
             "num_attention_heads": 2,
             "attention_head_dim": 8,
             "in_channels": 4,
@@ -81,50 +74,62 @@ def prepare_init_args_and_inputs_for_common(self):
             "temporal_compression_ratio": 4,
             "max_text_seq_length": 8,
         }
-        inputs_dict = self.dummy_input
-        return init_dict, inputs_dict
-
-    def test_gradient_checkpointing_is_applied(self):
-        expected_set = {"CogVideoXTransformer3DModel"}
-        super().test_gradient_checkpointing_is_applied(expected_set=expected_set)
-
-
-class CogVideoX1_5TransformerTests(ModelTesterMixin, unittest.TestCase):
-    model_class = CogVideoXTransformer3DModel
-    main_input_name = "hidden_states"
-    uses_custom_attn_processor = True
 
-    @property
-    def dummy_input(self):
-        batch_size = 2
+    def get_dummy_inputs(self, batch_size: int = 2) -> dict[str, torch.Tensor]:
         num_channels = 4
-        num_frames = 2
+        num_frames = 1
         height = 8
         width = 8
         embedding_dim = 8
         sequence_length = 8
 
-        hidden_states = torch.randn((batch_size, num_frames, num_channels, height, width)).to(torch_device)
-        encoder_hidden_states = torch.randn((batch_size, sequence_length, embedding_dim)).to(torch_device)
-        timestep = torch.randint(0, 1000, size=(batch_size,)).to(torch_device)
-
         return {
-            "hidden_states": hidden_states,
-            "encoder_hidden_states": encoder_hidden_states,
-            "timestep": timestep,
+            "hidden_states": randn_tensor(
+                (batch_size, num_frames, num_channels, height, width), generator=self.generator, device=torch_device
+            ),
+            "encoder_hidden_states": randn_tensor(
+                (batch_size, sequence_length, embedding_dim), generator=self.generator, device=torch_device
+            ),
+            "timestep": torch.randint(0, 1000, size=(batch_size,), generator=self.generator).to(torch_device),
         }
 
+
+class TestCogVideoXTransformer(CogVideoXTransformerTesterConfig, ModelTesterMixin):
+    pass
+
+
+class TestCogVideoXTransformerTraining(CogVideoXTransformerTesterConfig, TrainingTesterMixin):
+    def test_gradient_checkpointing_is_applied(self):
+        expected_set = {"CogVideoXTransformer3DModel"}
+        super().test_gradient_checkpointing_is_applied(expected_set=expected_set)
+
+
+# ======================== CogVideoX 1.5 ========================
+
+
+class CogVideoX15TransformerTesterConfig(BaseModelTesterConfig):
     @property
-    def input_shape(self):
+    def model_class(self):
+        return CogVideoXTransformer3DModel
+
+    @property
+    def main_input_name(self) -> str:
+        return "hidden_states"
+
+    @property
+    def output_shape(self) -> tuple:
         return (1, 4, 8, 8)
 
     @property
-    def output_shape(self):
+    def input_shape(self) -> tuple:
         return (1, 4, 8, 8)
 
-    def prepare_init_args_and_inputs_for_common(self):
-        init_dict = {
-            # Product of num_attention_heads * attention_head_dim must be divisible by 16 for 3D positional embeddings.
+    @property
+    def generator(self):
+        return torch.Generator("cpu").manual_seed(0)
+
+    def get_init_dict(self) -> dict:
+        return {
             "num_attention_heads": 2,
             "attention_head_dim": 8,
             "in_channels": 4,
@@ -141,9 +146,25 @@ def prepare_init_args_and_inputs_for_common(self):
             "max_text_seq_length": 8,
             "use_rotary_positional_embeddings": True,
         }
-        inputs_dict = self.dummy_input
-        return init_dict, inputs_dict
 
-    def test_gradient_checkpointing_is_applied(self):
-        expected_set = {"CogVideoXTransformer3DModel"}
-        super().test_gradient_checkpointing_is_applied(expected_set=expected_set)
+    def get_dummy_inputs(self, batch_size: int = 2) -> dict[str, torch.Tensor]:
+        num_channels = 4
+        num_frames = 2
+        height = 8
+        width = 8
+        embedding_dim = 8
+        sequence_length = 8
+
+        return {
+            "hidden_states": randn_tensor(
+                (batch_size, num_frames, num_channels, height, width), generator=self.generator, device=torch_device
+            ),
+            "encoder_hidden_states": randn_tensor(
+                (batch_size, sequence_length, embedding_dim), generator=self.generator, device=torch_device
+            ),
+            "timestep": torch.randint(0, 1000, size=(batch_size,), generator=self.generator).to(torch_device),
+        }
+
+
+class TestCogVideoX15Transformer(CogVideoX15TransformerTesterConfig, ModelTesterMixin):
+    pass

tests/models/transformers/test_models_transformer_cogview3plus.py

@@ -13,63 +13,49 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
-
 import torch
 
 from diffusers import CogView3PlusTransformer2DModel
+from diffusers.utils.torch_utils import randn_tensor
 
-from ...testing_utils import (
-    enable_full_determinism,
-    torch_device,
+from ...testing_utils import enable_full_determinism, torch_device
+from ..testing_utils import (
+    BaseModelTesterConfig,
+    ModelTesterMixin,
+    TrainingTesterMixin,
 )
-from ..test_modeling_common import ModelTesterMixin
 
 
 enable_full_determinism()
 
 
-class CogView3PlusTransformerTests(ModelTesterMixin, unittest.TestCase):
-    model_class = CogView3PlusTransformer2DModel
-    main_input_name = "hidden_states"
-    uses_custom_attn_processor = True
-    model_split_percents = [0.7, 0.6, 0.6]
-
+class CogView3PlusTransformerTesterConfig(BaseModelTesterConfig):
     @property
-    def dummy_input(self):
-        batch_size = 2
-        num_channels = 4
-        height = 8
-        width = 8
-        embedding_dim = 8
-        sequence_length = 8
+    def model_class(self):
+        return CogView3PlusTransformer2DModel
 
-        hidden_states = torch.randn((batch_size, num_channels, height, width)).to(torch_device)
-        encoder_hidden_states = torch.randn((batch_size, sequence_length, embedding_dim)).to(torch_device)
-        original_size = torch.tensor([height * 8, width * 8]).unsqueeze(0).repeat(batch_size, 1).to(torch_device)
-        target_size = torch.tensor([height * 8, width * 8]).unsqueeze(0).repeat(batch_size, 1).to(torch_device)
-        crop_coords = torch.tensor([0, 0]).unsqueeze(0).repeat(batch_size, 1).to(torch_device)
-        timestep = torch.randint(0, 1000, size=(batch_size,)).to(torch_device)
+    @property
+    def main_input_name(self) -> str:
+        return "hidden_states"
 
-        return {
-            "hidden_states": hidden_states,
-            "encoder_hidden_states": encoder_hidden_states,
-            "original_size": original_size,
-            "target_size": target_size,
-            "crop_coords": crop_coords,
-            "timestep": timestep,
-        }
+    @property
+    def model_split_percents(self) -> list:
+        return [0.7, 0.6, 0.6]
 
     @property
-    def input_shape(self):
+    def output_shape(self) -> tuple:
         return (1, 4, 8, 8)
 
     @property
-    def output_shape(self):
+    def input_shape(self) -> tuple:
         return (1, 4, 8, 8)
 
-    def prepare_init_args_and_inputs_for_common(self):
-        init_dict = {
+    @property
+    def generator(self):
+        return torch.Generator("cpu").manual_seed(0)
+
+    def get_init_dict(self) -> dict:
+        return {
             "patch_size": 2,
             "in_channels": 4,
             "num_layers": 2,
@@ -82,9 +68,33 @@ def prepare_init_args_and_inputs_for_common(self):
             "pos_embed_max_size": 8,
             "sample_size": 8,
         }
-        inputs_dict = self.dummy_input
-        return init_dict, inputs_dict
 
+    def get_dummy_inputs(self, batch_size: int = 2) -> dict[str, torch.Tensor]:
+        num_channels = 4
+        height = 8
+        width = 8
+        embedding_dim = 8
+        sequence_length = 8
+
+        return {
+            "hidden_states": randn_tensor(
+                (batch_size, num_channels, height, width), generator=self.generator, device=torch_device
+            ),
+            "encoder_hidden_states": randn_tensor(
+                (batch_size, sequence_length, embedding_dim), generator=self.generator, device=torch_device
+            ),
+            "original_size": torch.tensor([height * 8, width * 8]).unsqueeze(0).repeat(batch_size, 1).to(torch_device),
+            "target_size": torch.tensor([height * 8, width * 8]).unsqueeze(0).repeat(batch_size, 1).to(torch_device),
+            "crop_coords": torch.tensor([0, 0]).unsqueeze(0).repeat(batch_size, 1).to(torch_device),
+            "timestep": torch.randint(0, 1000, size=(batch_size,), generator=self.generator).to(torch_device),
+        }
+
+
+class TestCogView3PlusTransformer(CogView3PlusTransformerTesterConfig, ModelTesterMixin):
+    pass
+
+
+class TestCogView3PlusTransformerTraining(CogView3PlusTransformerTesterConfig, TrainingTesterMixin):
     def test_gradient_checkpointing_is_applied(self):
         expected_set = {"CogView3PlusTransformer2DModel"}
         super().test_gradient_checkpointing_is_applied(expected_set=expected_set)