Respect explicitly set framework parameter in pipeline (#24322)

* Respect framework parameter

* Move check to pipeline()

* Add check inside infer_framework_load_model again

src/transformers/pipelines/__init__.py

@@ -781,9 +781,9 @@ def pipeline(
 
     model_name = model if isinstance(model, str) else None
 
-    # Infer the framework from the model
-    # Forced if framework already defined, inferred if it's None
-    # Will load the correct model if possible
+    # Load the correct model if possible
+    # Infer the framework from the model if not already defined
+    if isinstance(model, str) or framework is None:
         model_classes = {"tf": targeted_task["tf"], "pt": targeted_task["pt"]}
         framework, model = infer_framework_load_model(
             model,

src/transformers/pipelines/base.py

@@ -277,6 +277,7 @@ def infer_framework_load_model(
         if isinstance(model, str):
             raise ValueError(f"Could not load model {model} with any of the following classes: {class_tuple}.")
 
+    if framework is None:
         framework = infer_framework(model.__class__)
     return framework, model