Improve Python tooling

.pre-commit-config.yaml

@@ -1,10 +1,11 @@
 exclude: ^.github/actions/assigner/dist
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.4.0
     hooks:
       - id: check-yaml
       - id: trailing-whitespace
+        exclude: ^docs
       - id: check-added-large-files
         args:
           - --maxkb=1000
@@ -13,18 +14,14 @@ repos:
       - id: mixed-line-ending
         args:
           - --fix=lf
-  - repo: https://github.com/psf/black
-    rev: 22.6.0
-    hooks:
-      - id: black
-        exclude: ^examples/custom_converters/elu_converter/setup.py
+        exclude: ^docs
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v14.0.6
+    rev: v16.0.6
     hooks:
       - id: clang-format
         types_or: [c++, c, cuda]
   - repo: https://github.com/keith/pre-commit-buildifier
-    rev: 5.1.0
+    rev: 6.1.0.2
     hooks:
     -   id: buildifier
         args:
@@ -34,6 +31,26 @@ repos:
     rev: v0.13
     hooks:
       - id: validate-pyproject
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        name: isort (python)
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v1.4.1'
+    hooks:
+    -   id: mypy
+        exclude: "^py/torch_tensorrt/fx|^examples|^tests|^tools|^docs|noxfile.py|setup.py|versions.py"
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.0.278
+    hooks:
+      - id: ruff
+  - repo: https://github.com/psf/black
+    rev: 23.7.0
+    hooks:
+      - id: black
+        exclude: ^examples/custom_converters/elu_converter/setup.py|^docs
   - repo: local
     hooks:
     -   id: dont-commit-upstream
@@ -42,4 +59,3 @@ repos:
         exclude: "^.pre-commit-config.yaml"
         language: pygrep
         types: [text]
-

BUILD

@@ -47,8 +47,8 @@ pkg_tar(
         ":windows": ["//cpp/lib:torch_tensorrt.dll"],
         "//conditions:default": [
             "//cpp/lib:libtorchtrt.so",
-            "//cpp/lib:libtorchtrt_runtime.so",
             "//cpp/lib:libtorchtrt_plugins.so",
+            "//cpp/lib:libtorchtrt_runtime.so",
         ],
     }),
     mode = "0755",
@@ -74,9 +74,9 @@ pkg_tar(
     extension = "tar.gz",
     package_dir = "torch_tensorrt",
     deps = [
-        ":lib",
         ":include",
         ":include_core",
+        ":lib",
     ] + select({
         ":windows": [],
         "//conditions:default": [":bin"],

core/BUILD

@@ -27,14 +27,14 @@ cc_library(
     ],
     deps = [
         "//core/conversion",
-        "//core/runtime",
         "//core/lowering",
         "//core/partitioning",
+        "//core/runtime",
         "//core/util/logging",
         "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/conversion/BUILD

@@ -20,16 +20,16 @@ cc_library(
         "conversion.h",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
-        "//core/conversion/var",
         "//core/conversion/conversionctx",
         "//core/conversion/converters",
         "//core/conversion/evaluators",
+        "//core/conversion/var",
         "//core/ir",
         "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
 )
 

core/conversion/conversionctx/BUILD

@@ -19,12 +19,12 @@ cc_library(
         "ConversionCtx.h",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
-        "//core/util:prelude",
         "//core/ir",
+        "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
 )
 

core/conversion/converters/BUILD

@@ -19,12 +19,12 @@ cc_library(
         "Weights.h",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
-        "//core/util:prelude",
         "//core/conversion/conversionctx",
+        "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )
@@ -39,12 +39,12 @@ cc_library(
     ],
     deps = [
         ":weights",
-        "@tensorrt//:nvinfer",
-        "//core/util:prelude",
         "//core/conversion/conversionctx",
+        "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )
@@ -91,16 +91,16 @@ cc_library(
         "converters.h",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
-        "//core/util:prelude",
-        "//core/conversion/var",
-        "//core/conversion/tensorcontainer",
+        ":converter_util",
         "//core/conversion/conversionctx",
+        "//core/conversion/tensorcontainer",
+        "//core/conversion/var",
         "//core/plugins:torch_tensorrt_plugins",
-        ":converter_util",
+        "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/conversion/evaluators/BUILD

@@ -24,12 +24,12 @@ cc_library(
         "evaluators.h",
     ],
     deps = [
-        "//core/util:prelude",
-        "//core/conversion/var",
         "//core/conversion/tensorcontainer",
+        "//core/conversion/var",
+        "//core/util:prelude",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/conversion/tensorcontainer/BUILD

@@ -19,11 +19,11 @@ cc_library(
         "TensorContainer.h",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
         "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/conversion/var/BUILD

@@ -20,13 +20,13 @@ cc_library(
         "Var_inl.h",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
-        "//core/util:prelude",
         "//core/conversion/converters:converter_util",
-        "//core/conversion/tensorcontainer:tensorcontainer",
+        "//core/conversion/tensorcontainer",
+        "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/ir/BUILD

@@ -22,11 +22,11 @@ cc_library(
         "ir.h",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
         "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
 )
 

core/lowering/BUILD

@@ -22,12 +22,12 @@ cc_library(
         "lowering.h",
     ],
     deps = [
+        "//core/ir",
         "//core/lowering/passes",
         "//core/util:prelude",
-        "//core/ir",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/lowering/passes/BUILD

@@ -49,7 +49,7 @@ cc_library(
         "//core/util:prelude",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
 )
 

core/partitioning/BUILD

@@ -21,16 +21,16 @@ cc_library(
         "partitioning.h",
     ],
     deps = [
-        "//core/util:prelude",
-        "//core/ir",
         "//core/conversion",
+        "//core/ir",
         "//core/lowering",
         "//core/partitioning/partitioningctx",
         "//core/partitioning/partitioninginfo",
         "//core/partitioning/segmentedblock",
+        "//core/util:prelude",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/partitioning/partitioningctx/BUILD

@@ -19,14 +19,14 @@ cc_library(
         "PartitioningCtx.h",
     ],
     deps = [
-        "//core/util:prelude",
-        "//core/ir",
         "//core/conversion",
-        "//core/partitioning/segmentedblock",
+        "//core/ir",
         "//core/partitioning/partitioninginfo",
+        "//core/partitioning/segmentedblock",
+        "//core/util:prelude",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/partitioning/partitioninginfo/BUILD

@@ -19,13 +19,13 @@ cc_library(
         "PartitioningInfo.h",
     ],
     deps = [
-        "//core/util:prelude",
-        "//core/ir",
         "//core/conversion",
+        "//core/ir",
         "//core/lowering",
+        "//core/util:prelude",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/partitioning/segmentedblock/BUILD

@@ -19,13 +19,13 @@ cc_library(
         "SegmentedBlock.h",
     ],
     deps = [
-        "//core/util:prelude",
-        "//core/ir",
         "//core/conversion",
+        "//core/ir",
         "//core/lowering",
+        "//core/util:prelude",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/plugins/BUILD

@@ -29,12 +29,12 @@ cc_library(
         "-lpthread",
     ],
     deps = [
+        "//core/util:prelude",
         "@tensorrt//:nvinfer",
         "@tensorrt//:nvinferplugin",
-        "//core/util:prelude",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )

core/runtime/BUILD

@@ -31,12 +31,12 @@ cc_library(
         "-lstdc++fs",
     ],
     deps = [
-        "@tensorrt//:nvinfer",
-        "//core/util:prelude",
         "//core/plugins:torch_tensorrt_plugins",
+        "//core/util:prelude",
+        "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default": ["@libtorch//:libtorch"],
+        "//conditions:default": ["@libtorch"],
     }),
     alwayslink = True,
 )