Transformers v5 pre release (#2387)

* test main

* test

* fix

* fx

* move

Author: IlyasMoutawwakil

.github/workflows/build_main_documentation.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Make Optimum documentation
         run: |
           cd optimum
-          uv pip install . accelerate
+          uv pip install . accelerate --prerelease=allow
           make doc BUILD_DIR=optimum-doc-build VERSION=${{ env.VERSION }}
           cd ..
 

.github/workflows/build_pr_documentation.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Make Optimum documentation
         run: |
           cd optimum
-          uv pip install . accelerate
+          uv pip install . accelerate --prerelease=allow
           make doc BUILD_DIR=optimum-doc-build VERSION=pr_$PR_NUMBER
           cd ..
 

.github/workflows/test_cli.yml

@@ -50,7 +50,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip uv
           uv pip install ./optimum-onnx[onnxruntime]
-          uv pip install ./optimum[tests]
+          uv pip install ./optimum[tests] --prerelease=allow
 
       - name: Test with pytest
         run: |
@@ -61,7 +61,7 @@ jobs:
         run: |
           uv pip uninstall optimum-onnx optimum
           uv pip install -e ./optimum-onnx[onnxruntime]
-          uv pip install -e ./optimum[tests]
+          uv pip install -e ./optimum[tests] --prerelease=allow
 
       - name: Test with pytest (editable mode)
         run: |

.github/workflows/test_common.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip uv
-          uv pip install .[tests]
+          uv pip install .[tests] --prerelease=allow
 
       - name: Test with pytest
         run: |

.github/workflows/test_exporters_common.yml

@@ -50,7 +50,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip uv
           uv pip install ./optimum-onnx
-          uv pip install ./optimum[tests]
+          uv pip install ./optimum[tests] --prerelease=allow
 
       - name: Test with pytest
         run: |
@@ -61,7 +61,7 @@ jobs:
         run: |
           uv pip uninstall optimum-onnx optimum
           uv pip install -e ./optimum-onnx
-          uv pip install -e ./optimum[tests]
+          uv pip install -e ./optimum[tests] --prerelease=allow
 
       - name: Test with pytest (editable mode)
         run: |

.github/workflows/test_pipelines.yml

@@ -50,7 +50,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip uv
           uv pip install ./optimum-onnx[onnxruntime]
-          uv pip install ./optimum[tests]
+          uv pip install ./optimum[tests] --prerelease=allow
 
       - name: Test with pytest
         run: |
@@ -61,7 +61,7 @@ jobs:
         run: |
           uv pip uninstall optimum-onnx optimum
           uv pip install -e ./optimum-onnx[onnxruntime]
-          uv pip install -e ./optimum[tests]
+          uv pip install -e ./optimum[tests] --prerelease=allow
 
       - name: Test with pytest (editable mode)
         run: |

.github/workflows/test_utils.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip uv
-          uv pip install .[tests]
+          uv pip install .[tests] --prerelease=allow
 
       - name: Tests needing datasets
         run: |

optimum/configuration_utils.py

@@ -24,7 +24,7 @@
 from transformers import PretrainedConfig
 from transformers import __version__ as transformers_version_str
 from transformers.dynamic_module_utils import custom_object_save
-from transformers.utils import cached_file, download_url, extract_commit_hash, is_remote_url
+from transformers.utils import cached_file, extract_commit_hash
 
 from .utils import logging
 from .version import __version__
@@ -192,10 +192,6 @@ def _get_config_dict(
             # Special case when pretrained_model_name_or_path is a local file
             resolved_config_file = pretrained_model_name_or_path
             is_local = True
-        # TODO: remove condition once transformers release version is way above 4.22.
-        elif is_remote_url(pretrained_model_name_or_path):
-            configuration_file = pretrained_model_name_or_path
-            resolved_config_file = download_url(pretrained_model_name_or_path)
         else:
             configuration_file = kwargs.pop("_configuration_file", cls.CONFIG_NAME)
 

optimum/fx/optimization/transformations.py

@@ -22,30 +22,10 @@
 from typing import List
 
 import torch
-from torch.fx import GraphModule, Node
+from torch.fx import GraphModule, Node, Proxy
 from transformers.file_utils import add_end_docstrings
 
 
-try:
-    from transformers.utils.fx import _gen_constructor_wrapper
-except ImportError:
-    from transformers.utils.fx import gen_constructor_wrapper
-
-    def _gen_constructor_wrapper(*args, **kwargs):
-        wrapper, target = gen_constructor_wrapper(*args, **kwargs)
-
-        def wrapper_with_forced_tracing(*_args, **_kwargs):
-            import torch.fx._symbolic_trace
-
-            original_flag = torch.fx._symbolic_trace._is_fx_tracing_flag
-            torch.fx._symbolic_trace._is_fx_tracing_flag = True
-            out = wrapper(*_args, **_kwargs)
-            torch.fx._symbolic_trace._is_fx_tracing_flag = original_flag
-            return out
-
-        return wrapper_with_forced_tracing, target
-
-
 _ATTRIBUTES_DOCSTRING = r"""
 Attributes:
     preserves_computation (`bool`, defaults to `False`):
@@ -819,3 +799,24 @@ def reverse(self, graph_module):
                 return ComposeTransformation._reverse_composition(graph_module)
 
     return ComposeTransformation()
+
+
+def _gen_constructor_wrapper(target):
+    @functools.wraps(target)
+    def wrapper(*args, **kwargs):
+        proxy = None
+
+        def check_has_proxy(v):
+            if isinstance(v, Proxy):
+                nonlocal proxy
+                proxy = v
+
+        torch.fx.node.map_aggregate(args, check_has_proxy)
+        torch.fx.node.map_aggregate(kwargs, check_has_proxy)
+
+        if proxy is not None:
+            return proxy.tracer.create_proxy("call_function", target, args, kwargs)
+        else:
+            return target(*args, **kwargs)
+
+    return wrapper, target