pytorch · XuehaiPan · Jun 25, 2024 · Jun 25, 2024 · Jun 25, 2024 · Jun 25, 2024
diff --git a/aten/src/ATen/nnapi/codegen.py b/aten/src/ATen/nnapi/codegen.py
@@ -7,10 +7,11 @@
 we need with dlsym.  We also generate a "check" wrapper that checks
 return values and throws C++ exceptions on errors.
 """
-import pathlib
+
 import re
 import sys
 import textwrap
+from pathlib import Path
 
 
 PREFIX = """\
@@ -231,7 +232,7 @@ def main(argv):
                 )
             )
 
-    out_dir = pathlib.Path(__file__).parent
+    out_dir = Path(__file__).parent
 
     (out_dir / "nnapi_wrapper.h").write_text(
         PREFIX

diff --git a/benchmarks/dynamo/ci_expected_accuracy/update_expected.py b/benchmarks/dynamo/ci_expected_accuracy/update_expected.py
@@ -18,12 +18,12 @@
 import argparse
 import json
 import os
-import pathlib
 import subprocess
 import sys
 import urllib
 from io import BytesIO
 from itertools import product
+from pathlib import Path
 from urllib.request import urlopen
 from zipfile import ZipFile
 
@@ -34,7 +34,7 @@
 # https://console.rockset.com/lambdas/details/commons.artifacts
 ARTIFACTS_QUERY_URL = "https://api.usw2a1.rockset.com/v1/public/shared_lambdas/4ca0033e-0117-41f5-b043-59cde19eff35"
 CSV_LINTER = str(
-    pathlib.Path(__file__).absolute().parent.parent.parent.parent
+    Path(__file__).absolute().parent.parent.parent.parent
     / "tools/linter/adapters/no_merge_conflict_csv_linter.py"
 )
 

diff --git a/benchmarks/dynamo/common.py b/benchmarks/dynamo/common.py
@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 import abc
-
 import argparse
 import collections
 import contextlib
@@ -14,15 +13,14 @@
 import itertools
 import logging
 import os
-import pathlib
 import shutil
 import signal
 import subprocess
 import sys
 import time
 import weakref
 from contextlib import contextmanager
-
+from pathlib import Path
 from typing import (
     Any,
     Callable,
@@ -60,6 +58,7 @@
     same,
 )
 
+
 try:
     from torch._dynamo.utils import (
         clone_inputs,
@@ -81,6 +80,7 @@
 from torch.utils import _pytree as pytree
 from torch.utils._pytree import tree_map, tree_map_only
 
+
 try:
     import torch_xla
     import torch_xla.core.xla_model as xm
@@ -920,7 +920,7 @@ def speedup_experiment_onnx(
         2. Running ORT with OnnxModel.
 
     Writes to ./{output_filename}, which should be
-        `pathlib.Path(self.output_dir) / f"{self.compiler}_{suite}_{self.dtype}_{self.mode}_{self.device}_{self.testing}.csv".
+        `Path(self.output_dir) / f"{self.compiler}_{suite}_{self.dtype}_{self.mode}_{self.device}_{self.testing}.csv".
 
     TODO(bowbao): Record export time and export peak memory usage.
     """
@@ -1347,8 +1347,8 @@ def deepcopy_model_and_inputs_to_device(self, model, example_inputs, target_devi
     @classmethod
     def _generate_onnx_model_directory(
         cls, output_directory: str, compiler_name: str, model_name: str
-    ) -> pathlib.Path:
-        model_path = pathlib.Path(
+    ) -> Path:
+        model_path = Path(
             output_directory,
             ".onnx_models",
             model_name,
@@ -2389,7 +2389,6 @@ def get_fsdp_auto_wrap_policy(self, model_name: str):
         from diffusers.models.transformer_2d import Transformer2DModel
         from torchbenchmark.models.nanogpt.model import Block
         from transformers.models.llama.modeling_llama import LlamaDecoderLayer
-
         from transformers.models.t5.modeling_t5 import T5Block
         from transformers.models.whisper.modeling_whisper import WhisperEncoderLayer
 

diff --git a/scripts/compile_tests/update_failures.py b/scripts/compile_tests/update_failures.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 import argparse
 import os
-import pathlib
 import subprocess
+from pathlib import Path
 
 from common import (
     get_testcases,
@@ -194,7 +194,7 @@ def read_test_results(directory):
         "filename",
         nargs="?",
         default=str(
-            pathlib.Path(__file__).absolute().parent.parent.parent
+            Path(__file__).absolute().parent.parent.parent
             / "torch/testing/_internal/dynamo_test_failures.py"
         ),
         help="Optional path to dynamo_test_failures.py",
@@ -203,7 +203,7 @@ def read_test_results(directory):
     parser.add_argument(
         "test_dir",
         nargs="?",
-        default=str(pathlib.Path(__file__).absolute().parent.parent.parent / "test"),
+        default=str(Path(__file__).absolute().parent.parent.parent / "test"),
         help="Optional path to test folder",
     )
     parser.add_argument(
@@ -219,7 +219,7 @@ def read_test_results(directory):
         action="store_true",
     )
     args = parser.parse_args()
-    assert pathlib.Path(args.filename).exists(), args.filename
-    assert pathlib.Path(args.test_dir).exists(), args.test_dir
+    assert Path(args.filename).exists(), args.filename
+    assert Path(args.test_dir).exists(), args.test_dir
     dynamo38, dynamo311 = download_reports(args.commit, ("dynamo38", "dynamo311"))
        update(args.filename, args.test_dir, dynamo38, dynamo311, args.also_remove_skips)
diff --git a/test/distributed/nn/jit/test_instantiator.py b/test/distributed/nn/jit/test_instantiator.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
 # Owner(s): ["oncall: distributed"]
 
-import pathlib
 import sys
+from pathlib import Path
 from typing import Tuple
 
 import torch
 import torch.distributed as dist
 from torch import nn, Tensor
 
+
 if not dist.is_available():
     print("Distributed not available, skipping tests", file=sys.stderr)
     sys.exit(0)
@@ -45,7 +46,7 @@ def test_get_arg_return_types_from_interface(self):
         self.assertEqual(return_type_str, "Tuple[Tensor, int, str]")
 
     def test_instantiate_scripted_remote_module_template(self):
-        dir_path = pathlib.Path(instantiator.INSTANTIATED_TEMPLATE_DIR_PATH)
+        dir_path = Path(instantiator.INSTANTIATED_TEMPLATE_DIR_PATH)
 
         # Cleanup.
         file_paths = dir_path.glob(f"{instantiator._FILE_PREFIX}*.py")
@@ -69,7 +70,7 @@ def test_instantiate_scripted_remote_module_template(self):
         self.assertEqual(num_files_after, 1)
 
     def test_instantiate_non_scripted_remote_module_template(self):
-        dir_path = pathlib.Path(instantiator.INSTANTIATED_TEMPLATE_DIR_PATH)
+        dir_path = Path(instantiator.INSTANTIATED_TEMPLATE_DIR_PATH)
 
         # Cleanup.
         file_paths = dir_path.glob(f"{instantiator._FILE_PREFIX}*.py")

diff --git a/test/export/test_serialize.py b/test/export/test_serialize.py
@@ -7,10 +7,10 @@
 # Owner(s): ["oncall: export"]
 import copy
 import io
-import pathlib
 import tempfile
 import unittest
 import zipfile
+from pathlib import Path
 
 import torch
 import torch._dynamo as torchdynamo
@@ -38,7 +38,6 @@
     TemporaryFileName,
     TestCase,
 )
-
 from torch.testing._internal.torchbind_impls import init_torchbind_implementations
 
 
@@ -1052,7 +1051,7 @@ def forward(self, x, y):
         ep = export(f, inp)
 
         with TemporaryFileName() as fname:
-            path = pathlib.Path(fname)
+            path = Path(fname)
             save(ep, path)
             loaded_ep = load(path)
 

diff --git a/test/inductor/test_debug_trace.py b/test/inductor/test_debug_trace.py
@@ -1,16 +1,17 @@
 # Owner(s): ["module: inductor"]
 import logging
 import os
-import pathlib
 import re
 import shutil
 import sys
 import unittest
+from pathlib import Path
 
 import torch
 from torch._inductor import config, test_operators
 from torch.testing._internal.inductor_utils import GPU_TYPE, HAS_GPU
 
+
 try:
     try:
         from . import test_torchinductor
@@ -22,7 +23,7 @@
     raise
 
 
-def filesize(filename: pathlib.Path):
+def filesize(filename: Path):
     assert filename.exists(), f"{filename} is missing"
     return os.stat(filename).st_size
 
@@ -43,7 +44,7 @@ def fn(a, b):
         self.assertEqual(len(cm.output), 1)
         m = re.match(r"WARNING.* debug trace: (.*)", cm.output[0])
         self.assertTrue(m)
-        filename = pathlib.Path(m.group(1))
+        filename = Path(m.group(1))
         self.assertTrue(filename.is_dir())
         self.assertGreater(filesize(filename / "fx_graph_readable.py"), 512)
         self.assertGreater(filesize(filename / "fx_graph_runnable.py"), 512)

diff --git a/test/jit/test_save_load.py b/test/jit/test_save_load.py
@@ -2,14 +2,15 @@
 
 import io
 import os
-import pathlib
 import sys
+from pathlib import Path
 from typing import NamedTuple, Optional
 
 import torch
 from torch import Tensor
 from torch.testing._internal.common_utils import skipIfTorchDynamo, TemporaryFileName
 
+
 # Make the helper files in test/ importable
 pytorch_test_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 sys.path.append(pytorch_test_dir)
@@ -397,7 +398,7 @@ def forward(self, a):
 
         # Save then load.
         with TemporaryFileName() as fname:
-            path = pathlib.Path(fname)
+            path = Path(fname)
             m.save(path)
             m2 = torch.jit.load(path)
 
@@ -624,7 +625,7 @@ def get_loaded_inputs(inputs):
             traced_module = torch.jit.trace(module, input1)
             traced_inputs = list(traced_module.graph.inputs())
             with TemporaryFileName() as fname:
-                path = pathlib.Path(fname)
+                path = Path(fname)
                 traced_module.save(path)
                 print(traced_module.graph)
                 loaded_module = torch.jit.load(path, _restore_shapes=True)
@@ -640,7 +641,7 @@ def get_loaded_inputs(inputs):
             traced_module._c._retrieve_traced_inputs()["forward"], [input_tensor]
         )
         with TemporaryFileName() as fname:
-            path = pathlib.Path(fname)
+            path = Path(fname)
             traced_module.save(path)
             loaded_module = torch.jit.load(path, _restore_shapes=True)
             loaded_inputs = list(loaded_module.graph.inputs())
@@ -659,7 +660,7 @@ def get_loaded_inputs(inputs):
         self.assertEqual(len(traced_module._c._retrieve_traced_inputs()), 0)
 
         with TemporaryFileName() as fname:
-            path = pathlib.Path(fname)
+            path = Path(fname)
             traced_module.save(path)
             loaded_module = torch.jit.load(path, _restore_shapes=True)
             loaded_inputs = list(loaded_module.graph.inputs())
@@ -1055,7 +1056,7 @@ def forward(self, a):
 
         # Save then load.
         with TemporaryFileName() as fname:
-            path = pathlib.Path(fname)
+            path = Path(fname)
             torch.jit.save_jit_module_to_flatbuffer(m, path)
             m2 = torch.jit.load(path)
 

diff --git a/test/lazy/test_ts_opinfo.py b/test/lazy/test_ts_opinfo.py
@@ -3,7 +3,7 @@
 import functools
 import itertools
 import os
-import pathlib
+from pathlib import Path
 from typing import Sequence
 from unittest import skip
 
@@ -20,10 +20,10 @@
     ops,
 )
 from torch.testing._internal.common_methods_invocations import op_db
-
 from torch.testing._internal.common_utils import run_tests, TestCase
 from torch.testing._internal.jit_utils import JitTestCase
 
+
 torch._lazy.ts_backend.init()
 
 
@@ -36,7 +36,7 @@ def remove_suffixes(l):
 
 
 def init_lists():
-    path_to_script = pathlib.Path(os.path.abspath(os.path.dirname(__file__)))
+    path_to_script = Path(os.path.abspath(os.path.dirname(__file__)))
     TS_NATIVE_FUNCTIONS_PATH = (
         path_to_script.parent.parent / "aten/src/ATen/native/ts_native_functions.yaml"
     )