fix models, pipelines

Author: manueldeprada

src/transformers/cache_utils.py

@@ -1732,15 +1732,15 @@ class EncoderDecoderCache(Cache):
     # Override @property from Cache
     is_compileable = None
 
-    def __init__(self, self_attention_cache: Cache, cross_attention_cache: Cache):
+    def __init__(self, self_attention_cache: Cache = None, cross_attention_cache: Cache = None):
         super().__init__(layer_classes=DynamicLayer)
-        self.self_attention_cache = self_attention_cache
-        self.cross_attention_cache = cross_attention_cache
+        self.self_attention_cache = self_attention_cache if self_attention_cache is not None else DynamicCache()
+        self.cross_attention_cache = cross_attention_cache if cross_attention_cache is not None else DynamicCache()
         self.is_compileable = getattr(self.self_attention_cache, "is_compileable", False)
 
         self.is_updated = {}
-        for layer_idx in range(len(cross_attention_cache)):
-            self.is_updated[layer_idx] = bool(cross_attention_cache.get_seq_length(layer_idx) > 0)
+        for layer_idx in range(len(self.cross_attention_cache)):
+            self.is_updated[layer_idx] = bool(self.cross_attention_cache.get_seq_length(layer_idx) > 0)
 
     def __iter__(self):
         """

src/transformers/models/autoformer/modeling_autoformer.py

@@ -1151,8 +1151,10 @@ def forward(
             )
             use_cache = False
 
+        if use_cache and past_key_values is None:
+            past_key_values = EncoderDecoderCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "
                 "You should pass an instance of `EncoderDecoderCache` instead, e.g. "

src/transformers/models/bark/modeling_bark.py

@@ -23,7 +23,7 @@
 from torch import nn
 from torch.nn import functional as F
 
-from ...cache_utils import Cache, DynamicCache
+from ...cache_utils import DynamicCache
 from ...generation import GenerationMixin
 from ...generation.logits_process import (
     AlternatingCodebooksLogitsProcessor,
@@ -498,8 +498,10 @@ def forward(
                 )
                 use_cache = False
 
+        if use_cache and past_key_values is None:
+            past_key_values = DynamicCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "
                 "You should pass an instance of `DynamicCache` instead, e.g. "

src/transformers/models/bart/modeling_bart.py

@@ -1039,8 +1039,10 @@ def forward(
             inputs_embeds = self.embed_tokens(input)
 
         # initialize `past_key_values`
+        if use_cache and past_key_values is None:
+            past_key_values = EncoderDecoderCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             return_legacy_cache = True
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "

src/transformers/models/bert_generation/modeling_bert_generation.py

@@ -376,8 +376,10 @@ def forward(
                 )
                 use_cache = False
 
+        if use_cache and past_key_values is None:
+            past_key_values = EncoderDecoderCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "
                 "You should pass an instance of `EncoderDecoderCache` instead, e.g. "

src/transformers/models/big_bird/modeling_big_bird.py

@@ -1566,8 +1566,10 @@ def forward(
                 )
                 use_cache = False
 
+        if use_cache and past_key_values is None:
+            past_key_values = DynamicCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "
                 "You should pass an instance of `DynamicCache` instead, e.g. "

src/transformers/models/bigbird_pegasus/modeling_bigbird_pegasus.py

@@ -2197,8 +2197,10 @@ def forward(
             inputs_embeds = self.embed_tokens(input_ids)
 
         # initialize `past_key_values`
+        if use_cache and past_key_values is None:
+            past_key_values = EncoderDecoderCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             return_legacy_cache = True
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "

src/transformers/models/biogpt/modeling_biogpt.py

@@ -553,8 +553,10 @@ def forward(
                 use_cache = False
 
         # initialize past_key_values
+        if use_cache and past_key_values is None:
+            past_key_values = EncoderDecoderCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             return_legacy_cache = True
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "

src/transformers/models/biogpt/modular_biogpt.py

@@ -378,8 +378,10 @@ def forward(
                 use_cache = False
 
         # initialize past_key_values
+        if use_cache and past_key_values is None:
+            past_key_values = EncoderDecoderCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             return_legacy_cache = True
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "

src/transformers/models/blenderbot/modeling_blenderbot.py

@@ -995,8 +995,10 @@ def forward(
                 use_cache = False
 
         # initialize `past_key_values`
+        if use_cache and past_key_values is None:
+            past_key_values = EncoderDecoderCache()
         return_legacy_cache = False
-        if use_cache and not isinstance(past_key_values, Cache):
+        if use_cache and isinstance(past_key_values, tuple):
             return_legacy_cache = True
             logger.warning_once(
                 "Passing a tuple of `past_key_values` is deprecated and will be removed in Transformers v4.58.0. "