Skip to content

Commit c9b8bf5

Browse files
authored
fix: Small fix to the evaluator set + updating some test infra (#3904)
1 parent f95db26 commit c9b8bf5

File tree

10 files changed

+38
-13
lines changed

10 files changed

+38
-13
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.1.1
1+
8.4.2

core/conversion/evaluators/aten.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ auto aten_registrations TORCHTRT_UNUSED =
948948
stack.push_back(*args.at(v).IValue());
949949
}
950950
stack.push_back(input_num);
951-
auto& ops = torch::jit::getAllOperatorsFor(c10::Symbol::fromQualString("aten::format"));
951+
auto ops = torch::jit::getAllOperatorsFor(c10::Symbol::fromQualString("aten::format"));
952952
auto& aten_format = ops.front();
953953
aten_format->getOperation()(stack);
954954
std::string output;

tests/core/conversion/converters/BUILD

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ config_setting(
1414
],
1515
)
1616

17+
config_setting(
18+
name = "jetpack",
19+
constraint_values = [
20+
"@platforms//cpu:aarch64",
21+
],
22+
flag_values = {
23+
"//toolchains/dep_collection:compute_libs": "jetpack",
24+
},
25+
)
26+
1727
converter_test(
1828
name = "test_activation",
1929
)

tests/core/conversion/converters/converter_test.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ def converter_test(name, visibility = None):
1919
"//tests/util",
2020
"@googletest//:gtest_main",
2121
] + select({
22+
":jetpack": ["@torch_l4t//:libtorch"],
23+
":use_torch_whl": ["@torch_whl//:libtorch"],
2224
":windows": ["@libtorch_win//:libtorch"],
23-
"//conditions:default": ["@libtorch//:libtorch"],
25+
"//conditions:default": ["@libtorch"],
2426
}),
2527
timeout = "moderate",
2628
)

tests/core/conversion/evaluators/BUILD

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ config_setting(
1414
],
1515
)
1616

17+
config_setting(
18+
name = "jetpack",
19+
constraint_values = [
20+
"@platforms//cpu:aarch64",
21+
],
22+
flag_values = {
23+
"//toolchains/dep_collection:compute_libs": "jetpack",
24+
},
25+
)
26+
1727
evaluator_test(
1828
name = "test_prim_evaluators",
1929
)

tests/core/conversion/evaluators/evaluator_test.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ def evaluator_test(name, visibility = None):
1919
"//tests/util",
2020
"@googletest//:gtest_main",
2121
] + select({
22+
":jetpack": ["@torch_l4t//:libtorch"],
23+
":use_torch_whl": ["@torch_whl//:libtorch"],
2224
":windows": ["@libtorch_win//:libtorch"],
23-
"//conditions:default": ["@libtorch//:libtorch"],
25+
"//conditions:default": ["@libtorch"],
2426
}),
2527
timeout = "long",
2628
)

tests/core/lowering/BUILD

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ cc_test(
4040
"//tests/util",
4141
"@googletest//:gtest_main",
4242
] + select({
43+
":jetpack": ["@torch_l4t//:libtorch"],
44+
":use_torch_whl": ["@torch_whl//:libtorch"],
4345
":windows": ["@libtorch_win//:libtorch"],
44-
":jetpack": ["@torch_l4t//:libtorch"],
45-
"//conditions:default": ["@libtorch"],
46+
"//conditions:default": ["@libtorch"],
4647
}),
4748
)
4849

tests/core/lowering/lowering_test.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ def lowering_test(name, visibility = None):
1919
"//tests/util",
2020
"@googletest//:gtest_main",
2121
] + select({
22-
":windows": ["@libtorch_win//:libtorch"],
23-
":use_torch_whl": ["@torch_whl//:libtorch"],
2422
":jetpack": ["@torch_l4t//:libtorch"],
23+
":use_torch_whl": ["@torch_whl//:libtorch"],
24+
":windows": ["@libtorch_win//:libtorch"],
2525
"//conditions:default": ["@libtorch"],
2626
}),
2727
timeout = "short",

tests/core/partitioning/partitioning_test.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ def partitioning_test(name, visibility = None):
1919
"//tests/util",
2020
"@googletest//:gtest_main",
2121
] + select({
22-
":windows": ["@libtorch_win//:libtorch"],
23-
":use_torch_whl": ["@torch_whl//:libtorch"],
2422
":jetpack": ["@torch_l4t//:libtorch"],
23+
":use_torch_whl": ["@torch_whl//:libtorch"],
24+
":windows": ["@libtorch_win//:libtorch"],
2525
"//conditions:default": ["@libtorch"],
26-
}),
26+
})
2727
#timeout = "short",
2828
)

tests/core/runtime/runtime_test.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ def runtime_test(name, visibility = None):
1919
"//tests/util",
2020
"@googletest//:gtest_main",
2121
] + select({
22-
":windows": ["@libtorch_win//:libtorch"],
23-
":use_torch_whl": ["@torch_whl//:libtorch"],
2422
":jetpack": ["@torch_l4t//:libtorch"],
23+
":use_torch_whl": ["@torch_whl//:libtorch"],
24+
":windows": ["@libtorch_win//:libtorch"],
2525
"//conditions:default": ["@libtorch"],
2626
}),
2727
)

0 commit comments

Comments
 (0)