Simplify if nesting

Author: julien-c

src/transformers/pipelines/__init__.py

@@ -510,8 +510,8 @@ def pipeline(
             The token to use as HTTP bearer authorization for remote files. If `True`, will use the token generated
             when running `huggingface-cli login` (stored in `~/.huggingface`).
         device (`int` or `str` or `torch.device`):
-            Sent directly as `model_kwargs` (just a simpler shortcut). Defines the device (*e.g.*, `"cpu"`, `"cuda:1"`,
-            `"mps"`, or a GPU ordinal rank like `1`) on which this pipeline will be allocated.
+            Defines the device (*e.g.*, `"cpu"`, `"cuda:1"`, `"mps"`, or a GPU ordinal rank like `1`) on which this
+            pipeline will be allocated.
         device_map (`str` or `Dict[str, Union[int, str, torch.device]`, *optional*):
             Sent directly as `model_kwargs` (just a simpler shortcut). When `accelerate` library is present, set
             `device_map="auto"` to compute the most optimized `device_map` automatically. [More

src/transformers/pipelines/base.py

@@ -760,14 +760,17 @@ def __init__(
         self.feature_extractor = feature_extractor
         self.modelcard = modelcard
         self.framework = framework
-        if is_torch_available() and isinstance(device, torch.device):
-            self.device = device
+        if is_torch_available() and self.framework == "pt":
+            if isinstance(device, torch.device):
+                self.device = device
+            elif type(device) == str:
+                self.device = torch.device(device)
+            elif device < 0:
+                self.device = torch.device("cpu")
+            else:
+                self.device = torch.device("cuda:{device}")
         else:
-            self.device = (
-                device
-                if framework == "tf"
-                else torch.device(device if type(device) == str else "cpu" if device < 0 else f"cuda:{device}")
-            )
+            self.device = device
         self.binary_output = binary_output
 
         # Special handling