Improve control net block index for sd3

.gitignore

@@ -102,6 +102,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+myenv/
 
 # Spyder project settings
 .spyderproject

src/diffusers/models/transformers/transformer_sd3.py

@@ -345,7 +345,10 @@ def custom_forward(*inputs):
             # controlnet residual
             if block_controlnet_hidden_states is not None and block.context_pre_only is False:
                 interval_control = len(self.transformer_blocks) // len(block_controlnet_hidden_states)
-                hidden_states = hidden_states + block_controlnet_hidden_states[index_block // interval_control]
+                hidden_states_layer_index = index_block // interval_control
+                if hidden_states_layer_index >= len(block_controlnet_hidden_states):
+                    hidden_states_layer_index = len(block_controlnet_hidden_states) - 1
+                hidden_states = hidden_states + block_controlnet_hidden_states[hidden_states_layer_index]
 
         hidden_states = self.norm_out(hidden_states, temb)
         hidden_states = self.proj_out(hidden_states)

tests/pipelines/controlnet_sd3/test_controlnet_sd3.py

@@ -77,7 +77,7 @@ def get_dummy_components(self):
             sample_size=32,
             patch_size=1,
             in_channels=8,
-            num_layers=1,
+            num_layers=3,
             attention_head_dim=8,
             num_attention_heads=4,
             joint_attention_dim=32,