Skip to content

Commit b3089bf

Browse files
narendasannarendasan
authored
Merge pull request #2126 from pytorch/mypy
Improve Python tooling
2 parents 8c62fca + 2c327c4 commit b3089bf

File tree

149 files changed

+1659
-1309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+1659
-1309
lines changed

‎.pre-commit-config.yaml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
exclude: ^.github/actions/assigner/dist
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v2.3.0
4+
rev: v4.4.0
55
hooks:
66
- id: check-yaml
77
- id: trailing-whitespace
8+
exclude: ^docs
89
- id: check-added-large-files
910
args:
1011
- --maxkb=1000
@@ -13,18 +14,14 @@ repos:
1314
- id: mixed-line-ending
1415
args:
1516
- --fix=lf
16-
- repo: https://github.com/psf/black
17-
rev: 22.6.0
18-
hooks:
19-
- id: black
20-
exclude: ^examples/custom_converters/elu_converter/setup.py
17+
exclude: ^docs
2118
- repo: https://github.com/pre-commit/mirrors-clang-format
22-
rev: v14.0.6
19+
rev: v16.0.6
2320
hooks:
2421
- id: clang-format
2522
types_or: [c++, c, cuda]
2623
- repo: https://github.com/keith/pre-commit-buildifier
27-
rev: 5.1.0
24+
rev: 6.1.0.2
2825
hooks:
2926
- id: buildifier
3027
args:
@@ -34,6 +31,26 @@ repos:
3431
rev: v0.13
3532
hooks:
3633
- id: validate-pyproject
34+
- repo: https://github.com/pycqa/isort
35+
rev: 5.12.0
36+
hooks:
37+
- id: isort
38+
name: isort (python)
39+
- repo: https://github.com/pre-commit/mirrors-mypy
40+
rev: 'v1.4.1'
41+
hooks:
42+
- id: mypy
43+
exclude: "^py/torch_tensorrt/fx|^examples|^tests|^tools|^docs|noxfile.py|setup.py|versions.py"
44+
- repo: https://github.com/astral-sh/ruff-pre-commit
45+
# Ruff version.
46+
rev: v0.0.278
47+
hooks:
48+
- id: ruff
49+
- repo: https://github.com/psf/black
50+
rev: 23.7.0
51+
hooks:
52+
- id: black
53+
exclude: ^examples/custom_converters/elu_converter/setup.py|^docs
3754
- repo: local
3855
hooks:
3956
- id: dont-commit-upstream
@@ -42,4 +59,3 @@ repos:
4259
exclude: "^.pre-commit-config.yaml"
4360
language: pygrep
4461
types: [text]
45-

‎BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ pkg_tar(
4747
":windows": ["//cpp/lib:torch_tensorrt.dll"],
4848
"//conditions:default": [
4949
"//cpp/lib:libtorchtrt.so",
50-
"//cpp/lib:libtorchtrt_runtime.so",
5150
"//cpp/lib:libtorchtrt_plugins.so",
51+
"//cpp/lib:libtorchtrt_runtime.so",
5252
],
5353
}),
5454
mode = "0755",
@@ -74,9 +74,9 @@ pkg_tar(
7474
extension = "tar.gz",
7575
package_dir = "torch_tensorrt",
7676
deps = [
77-
":lib",
7877
":include",
7978
":include_core",
79+
":lib",
8080
] + select({
8181
":windows": [],
8282
"//conditions:default": [":bin"],

‎core/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ cc_library(
2727
],
2828
deps = [
2929
"//core/conversion",
30-
"//core/runtime",
3130
"//core/lowering",
3231
"//core/partitioning",
32+
"//core/runtime",
3333
"//core/util/logging",
3434
"@tensorrt//:nvinfer",
3535
] + select({
3636
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
37-
"//conditions:default": ["@libtorch//:libtorch"],
37+
"//conditions:default": ["@libtorch"],
3838
}),
3939
alwayslink = True,
4040
)

‎core/conversion/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ cc_library(
2020
"conversion.h",
2121
],
2222
deps = [
23-
"@tensorrt//:nvinfer",
24-
"//core/conversion/var",
2523
"//core/conversion/conversionctx",
2624
"//core/conversion/converters",
2725
"//core/conversion/evaluators",
26+
"//core/conversion/var",
2827
"//core/ir",
2928
"//core/util:prelude",
29+
"@tensorrt//:nvinfer",
3030
] + select({
3131
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
32-
"//conditions:default": ["@libtorch//:libtorch"],
32+
"//conditions:default": ["@libtorch"],
3333
}),
3434
)
3535

‎core/conversion/conversionctx/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ cc_library(
1919
"ConversionCtx.h",
2020
],
2121
deps = [
22-
"@tensorrt//:nvinfer",
23-
"//core/util:prelude",
2422
"//core/ir",
23+
"//core/util:prelude",
24+
"@tensorrt//:nvinfer",
2525
] + select({
2626
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
27-
"//conditions:default": ["@libtorch//:libtorch"],
27+
"//conditions:default": ["@libtorch"],
2828
}),
2929
)
3030

‎core/conversion/converters/BUILD

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ cc_library(
1919
"Weights.h",
2020
],
2121
deps = [
22-
"@tensorrt//:nvinfer",
23-
"//core/util:prelude",
2422
"//core/conversion/conversionctx",
23+
"//core/util:prelude",
24+
"@tensorrt//:nvinfer",
2525
] + select({
2626
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
27-
"//conditions:default": ["@libtorch//:libtorch"],
27+
"//conditions:default": ["@libtorch"],
2828
}),
2929
alwayslink = True,
3030
)
@@ -39,12 +39,12 @@ cc_library(
3939
],
4040
deps = [
4141
":weights",
42-
"@tensorrt//:nvinfer",
43-
"//core/util:prelude",
4442
"//core/conversion/conversionctx",
43+
"//core/util:prelude",
44+
"@tensorrt//:nvinfer",
4545
] + select({
4646
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
47-
"//conditions:default": ["@libtorch//:libtorch"],
47+
"//conditions:default": ["@libtorch"],
4848
}),
4949
alwayslink = True,
5050
)
@@ -91,16 +91,16 @@ cc_library(
9191
"converters.h",
9292
],
9393
deps = [
94-
"@tensorrt//:nvinfer",
95-
"//core/util:prelude",
96-
"//core/conversion/var",
97-
"//core/conversion/tensorcontainer",
94+
":converter_util",
9895
"//core/conversion/conversionctx",
96+
"//core/conversion/tensorcontainer",
97+
"//core/conversion/var",
9998
"//core/plugins:torch_tensorrt_plugins",
100-
":converter_util",
99+
"//core/util:prelude",
100+
"@tensorrt//:nvinfer",
101101
] + select({
102102
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
103-
"//conditions:default": ["@libtorch//:libtorch"],
103+
"//conditions:default": ["@libtorch"],
104104
}),
105105
alwayslink = True,
106106
)

‎core/conversion/evaluators/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ cc_library(
2424
"evaluators.h",
2525
],
2626
deps = [
27-
"//core/util:prelude",
28-
"//core/conversion/var",
2927
"//core/conversion/tensorcontainer",
28+
"//core/conversion/var",
29+
"//core/util:prelude",
3030
] + select({
3131
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
32-
"//conditions:default": ["@libtorch//:libtorch"],
32+
"//conditions:default": ["@libtorch"],
3333
}),
3434
alwayslink = True,
3535
)

‎core/conversion/tensorcontainer/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ cc_library(
1919
"TensorContainer.h",
2020
],
2121
deps = [
22-
"@tensorrt//:nvinfer",
2322
"//core/util:prelude",
23+
"@tensorrt//:nvinfer",
2424
] + select({
2525
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
26-
"//conditions:default": ["@libtorch//:libtorch"],
26+
"//conditions:default": ["@libtorch"],
2727
}),
2828
alwayslink = True,
2929
)

‎core/conversion/var/BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ cc_library(
2020
"Var_inl.h",
2121
],
2222
deps = [
23-
"@tensorrt//:nvinfer",
24-
"//core/util:prelude",
2523
"//core/conversion/converters:converter_util",
26-
"//core/conversion/tensorcontainer:tensorcontainer",
24+
"//core/conversion/tensorcontainer",
25+
"//core/util:prelude",
26+
"@tensorrt//:nvinfer",
2727
] + select({
2828
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
29-
"//conditions:default": ["@libtorch//:libtorch"],
29+
"//conditions:default": ["@libtorch"],
3030
}),
3131
alwayslink = True,
3232
)

‎core/ir/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ cc_library(
2222
"ir.h",
2323
],
2424
deps = [
25-
"@tensorrt//:nvinfer",
2625
"//core/util:prelude",
26+
"@tensorrt//:nvinfer",
2727
] + select({
2828
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
29-
"//conditions:default": ["@libtorch//:libtorch"],
29+
"//conditions:default": ["@libtorch"],
3030
}),
3131
)
3232

0 commit comments

Comments
 (0)