Skip to content

Commit 28fc9ff

Browse files
author
Anurag Dixit
committed
Update build system
Signed-off-by: Anurag Dixit <[email protected]>
1 parent 3747489 commit 28fc9ff

File tree

17 files changed

+102
-96
lines changed

17 files changed

+102
-96
lines changed

‎.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ build:python --define=abi=pre_cxx11_abi_aarch64
3434
build:pre_cxx11_abi --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"
3535
build:pre_cxx11_abi --linkopt="-D_GLIBCXX_USE_CXX11_ABI=0"
3636
build:pre_cxx11_abi --define=abi=pre_cxx11_abi
37-
build:pre_cxx11_abi_aarch64 --define=abi=pre_cxx11_abi_aarch64
37+
build:pre_cxx11_abi_aarch64 --define abi=pre_cxx11_abi_aarch64 --cpu=aarch64

‎BUILD

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
load("@rules_pkg//:pkg.bzl", "pkg_tar")
22

3-
config_setting(
4-
name="aarch64",
5-
values={
6-
"cpu":"aarch64"
7-
},
8-
)
9-
10-
config_setting(
11-
name = "use_pre_cxx11_abi_aarch64",
12-
values = {
13-
"define":"abi=pre_cxx11_abi",
14-
"cpu":"aarch64"
15-
},
16-
)
17-
183
pkg_tar(
194
name = "include_core",
205
package_dir = "include/trtorch",

‎WORKSPACE

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,14 @@ new_local_repository(
144144
build_file = "third_party/cudnn/local/BUILD"
145145
)
146146

147-
148147
new_local_repository(
149-
name = "libtorch_aarch64",
148+
name = "libtorch_pre_cxx11_abi_aarch64",
150149
path = "/usr/local/lib/python3.6/dist-packages/torch",
151150
build_file = "third_party/libtorch/BUILD"
152151
)
153152

154153
new_local_repository(
155-
name = "libtorch_pre_cxx11_abi_aarch64",
154+
name = "libtorch_aarch64",
156155
path = "/usr/local/lib/python3.6/dist-packages/torch",
157156
build_file = "third_party/libtorch/BUILD"
158157
)

‎core/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@ cc_library(
3636
"//core/lowering",
3737
"//core/util/logging",
3838
] + select({
39-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
40-
":aarch64": ["@libtorch_aarch64//:libtorch"],
41-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
42-
"//conditions:default": ["@libtorch//:libtorch"],
43-
}) + select({
44-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
45-
"//conditions:default": ["@tensorrt//:nvinfer"]
39+
":aarch64": ["@libtorch_aarch64//:libtorch",
40+
"@tensorrt_aarch64//:nvinfer"],
41+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
42+
"@tensorrt//:nvinfer"],
43+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
44+
"@tensorrt_aarch64//:nvinfer"],
45+
"//conditions:default": ["@libtorch//:libtorch",
46+
"@tensorrt//:nvinfer"],
4647
}),
4748
alwayslink=True,
4849
)

‎core/conversion/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@ cc_library(
3838
"//core/conversion/evaluators",
3939
"//core/util:prelude"
4040
] + select({
41-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
42-
":aarch64": ["@libtorch_aarch64//:libtorch"],
43-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
44-
"//conditions:default": ["@libtorch//:libtorch"],
45-
}) + select({
46-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
47-
"//conditions:default": ["@tensorrt//:nvinfer"],
41+
":aarch64": ["@libtorch_aarch64//:libtorch",
42+
"@tensorrt_aarch64//:nvinfer"],
43+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
44+
"@tensorrt//:nvinfer"],
45+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
46+
"@tensorrt_aarch64//:nvinfer"],
47+
"//conditions:default": ["@libtorch//:libtorch",
48+
"@tensorrt//:nvinfer"],
4849
}),
4950
)
5051

‎core/conversion/conversionctx/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ cc_library(
3333
deps = [
3434
"//core/util:prelude",
3535
] + select({
36-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
37-
":aarch64": ["@libtorch_aarch64//:libtorch"],
38-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
39-
"//conditions:default": ["@libtorch//:libtorch"],
40-
}) + select({
41-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
42-
"//conditions:default": ["@tensorrt//:nvinfer"]
36+
":aarch64": ["@libtorch_aarch64//:libtorch",
37+
"@tensorrt_aarch64//:nvinfer"],
38+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
39+
"@tensorrt//:nvinfer"],
40+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
41+
"@tensorrt_aarch64//:nvinfer"],
42+
"//conditions:default": ["@libtorch//:libtorch",
43+
"@tensorrt//:nvinfer"],
4344
}),
4445
)
4546

‎core/conversion/converters/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,14 @@ cc_library(
5454
"//core/conversion/conversionctx",
5555
"//core/conversion/converters/impl/plugins"
5656
] + select({
57-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
58-
":aarch64": ["@libtorch_aarch64//:libtorch"],
59-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
60-
"//conditions:default": ["@libtorch//:libtorch"],
61-
}) + select({
62-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
63-
"//conditions:default": ["@tensorrt//:nvinfer"]
57+
":aarch64": ["@libtorch_aarch64//:libtorch",
58+
"@tensorrt_aarch64//:nvinfer"],
59+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
60+
"@tensorrt//:nvinfer"],
61+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
62+
"@tensorrt_aarch64//:nvinfer"],
63+
"//conditions:default": ["@libtorch//:libtorch",
64+
"@tensorrt//:nvinfer"],
6465
}),
6566
alwayslink = True,
6667
)

‎core/conversion/converters/impl/plugins/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ cc_library(
3434
"//core/util:prelude",
3535
"//core/conversion/conversionctx",
3636
] + select({
37-
":aarch64": ["@libtorch_aarch64//:libtorch"],
38-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
39-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
40-
"//conditions:default": ["@libtorch//:libtorch"],
41-
}) + select({
42-
":aarch64" : ["@tensorrt_aarch64//:nvinfer"],
43-
"//conditions:default" : ["@tensorrt//:nvinfer"],
37+
":aarch64": ["@libtorch_aarch64//:libtorch",
38+
"@tensorrt_aarch64//:nvinfer"],
39+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
40+
"@tensorrt//:nvinfer"],
41+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
42+
"@tensorrt_aarch64//:nvinfer"],
43+
"//conditions:default": ["@libtorch//:libtorch",
44+
"@tensorrt//:nvinfer"],
4445
}),
4546
alwayslink = True,
4647
)

‎core/conversion/tensorcontainer/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@ cc_library(
3232
deps = [
3333
"//core/util:prelude",
3434
] + select({
35-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
36-
":aarch64": ["@libtorch_aarch64//:libtorch"],
37-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
38-
"//conditions:default": ["@libtorch//:libtorch"],
39-
}) + select({
40-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
41-
"//conditions:default": ["@tensorrt//:nvinfer"]
35+
":aarch64": ["@libtorch_aarch64//:libtorch",
36+
"@tensorrt_aarch64//:nvinfer"],
37+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
38+
"@tensorrt_aarch64//:nvinfer"],
39+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
40+
"@tensorrt//:nvinfer"],
41+
"//conditions:default": ["@libtorch//:libtorch",
42+
"@tensorrt//:nvinfer"],
4243
}),
4344
alwayslink = True,
4445
)

‎core/conversion/var/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ cc_library(
3434
deps = [
3535
"//core/util:prelude",
3636
] + select({
37-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
38-
":aarch64": ["@libtorch_aarch64//:libtorch"],
39-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
40-
"//conditions:default": ["@libtorch//:libtorch"],
41-
}) + select({
42-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
43-
"//conditions:default": ["@tensorrt//:nvinfer"]
37+
":aarch64": ["@libtorch_aarch64//:libtorch",
38+
"@tensorrt_aarch64//:nvinfer"],
39+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
40+
"@tensorrt//:nvinfer"],
41+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
42+
"@tensorrt_aarch64//:nvinfer"],
43+
"//conditions:default": ["@libtorch//:libtorch",
44+
"@tensorrt//:nvinfer"],
4445
}),
4546
alwayslink = True,
4647
)

‎core/execution/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ cc_library(
3434
deps = [
3535
"//core/util:prelude"
3636
] + select({
37-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
38-
":aarch64": ["@libtorch_aarch64//:libtorch"],
39-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
40-
"//conditions:default": ["@libtorch//:libtorch"],
41-
}) + select({
42-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
43-
"//conditions:default": ["@tensorrt//:nvinfer"]
37+
":aarch64": ["@libtorch_aarch64//:libtorch",
38+
"@tensorrt_aarch64//:nvinfer"],
39+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
40+
"@tensorrt//:nvinfer"],
41+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
42+
"@tensorrt_aarch64//:nvinfer"],
43+
"//conditions:default": ["@libtorch//:libtorch",
44+
"@tensorrt//:nvinfer"],
4445
}),
4546
alwayslink = True,
4647
)

‎core/lowering/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cc_library(
3636
"//core/lowering/passes",
3737
"//core/util:prelude"
3838
] + select({
39-
":aarch64": ["@libtorch_aarch64//:libtorch"],
39+
":aarch64": ["@libtorch_aarch64//:libtorch"],
4040
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
4141
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
4242
"//conditions:default": ["@libtorch//:libtorch"],

‎core/lowering/passes/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ cc_library(
4242
deps = [
4343
"//core/util:prelude",
4444
] + select({
45-
":aarch64": ["@libtorch_aarch64//:libtorch"],
45+
":aarch64": ["@libtorch_aarch64//:libtorch"],
4646
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
4747
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
4848
"//conditions:default": ["@libtorch//:libtorch"],

‎core/util/BUILD

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,15 @@ cc_library(
9999
"//core/util/logging",
100100
":macros"
101101
] + select({
102-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
103-
":aarch64": ["@libtorch_aarch64//:libtorch"],
104-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
105-
"//conditions:default": ["@libtorch//:libtorch"],
106-
}) + select({
107-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
108-
"//conditions:default": ["@tensorrt//:nvinfer"]
109-
})
102+
":aarch64": ["@libtorch_aarch64//:libtorch",
103+
"@tensorrt_aarch64//:nvinfer"],
104+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
105+
"@tensorrt//:nvinfer"],
106+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
107+
"@tensorrt_aarch64//:nvinfer"],
108+
"//conditions:default": ["@libtorch//:libtorch",
109+
"@tensorrt//:nvinfer"],
110+
}),
110111
)
111112

112113

‎core/util/logging/BUILD

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@ cc_library(
3232
],
3333
deps = [
3434
] + select({
35-
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch"],
36-
":aarch64": ["@libtorch_aarch64//:libtorch"],
37-
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
38-
"//conditions:default": ["@libtorch//:libtorch"],
39-
}) + select({
40-
":aarch64": ["@tensorrt_aarch64//:nvinfer"],
41-
"//conditions:default": ["@tensorrt//:nvinfer"]
35+
":aarch64": ["@libtorch_aarch64//:libtorch",
36+
"@tensorrt_aarch64//:nvinfer"],
37+
":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch",
38+
"@tensorrt//:nvinfer"],
39+
":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
40+
"@tensorrt_aarch64//:nvinfer"],
41+
"//conditions:default": ["@libtorch//:libtorch",
42+
"@tensorrt//:nvinfer"],
4243
}),
4344
)
4445

‎cpp/trtorchc/BUILD

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,18 @@ config_setting(
88
)
99

1010
config_setting(
11-
name = "x86_64",
11+
name = "use_pre_cxx11_abi",
1212
values = {
13-
"cpu" : "x86_64"
14-
}
13+
"define": "abi=pre_cxx11_abi",
14+
}
15+
)
16+
17+
config_setting(
18+
name = "use_pre_cxx11_abi_aarch64",
19+
values = {
20+
"define": "abi=pre_cxx11_abi",
21+
"cpu" : "aarch64",
22+
}
1523
)
1624

1725
cc_binary(
@@ -25,6 +33,10 @@ cc_binary(
2533
] + select({
2634
":aarch64" : ["@libtorch_aarch64//:libtorch",
2735
"@libtorch_aarch64//:caffe2"],
36+
":use_pre_cxx11_abi" : ["@libtorch_pre_cxx11_abi//:libtorch",
37+
"@libtorch_pre_cxx11_abi//:caffe2"],
38+
":use_pre_cxx11_abi_aarch64" : ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
39+
"@libtorch_pre_cxx11_abi_aarch64//:caffe2"],
2840
"//conditions:default": ["@libtorch//:libtorch",
2941
"@libtorch//:caffe2"],
3042
}),

‎third_party/libtorch/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cc_library(
1616

1717
cc_library(
1818
name = 'torch',
19-
hdrs = glob(
19+
hdrs = ['include'] + glob(
2020
[
2121
'include/torch/**/*.h',
2222
], exclude = [

0 commit comments

Comments
 (0)