merged with main

huggingface · May 22, 2024 · ae17ea4 · ae17ea4
1 parent 39edb53
commit ae17ea4
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/src/transformers/generation/utils.py b/src/transformers/generation/utils.py
@@ -1625,7 +1625,6 @@ def generate(
                     "This model does not support the `cache_implementation` argument. Please check the following "
                     "issue: https://github.com/huggingface/transformers/issues/28981."
                 )
-<<<<<<< HEAD
             if generation_config.cache_implementation == "static" and not self._supports_static_cache:
                 raise ValueError(
                     "This model does not support `cache_implementation='static'`. Please check the following "
@@ -1634,18 +1633,6 @@ def generate(
             model_kwargs["past_key_values"] = self._get_cache(
                 generation_config.cache_implementation, batch_size, generation_config.max_length
             )
-=======
-            if generation_config.cache_implementation == "static":
-                if not self._supports_static_cache:
-                    raise ValueError(
-                        "This model does not support `cache_implementation='static'`. Please check the following "
-                        "issue: https://github.com/huggingface/transformers/issues/28981"
-                    )
-                model_kwargs["past_key_values"] = self._get_static_cache(
-                    max_batch_size=batch_size, max_cache_len=generation_config.max_length, device=device
-                )
-
->>>>>>> 189ad632c (tmp commit)
         self._validate_generated_length(generation_config, input_ids_length, has_default_max_length)
 
         # 7. determine generation mode