From 18729d2bd212c543d3b006c36ad6c88bf441615a Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Tue, 18 Nov 2025 17:58:42 +0000 Subject: [PATCH] fix: Small fix to the evaluator set + updating some test infra --- .bazelversion | 2 +- core/conversion/evaluators/aten.cpp | 2 +- tests/core/conversion/converters/BUILD | 10 ++++++++++ tests/core/conversion/converters/converter_test.bzl | 4 +++- tests/core/conversion/evaluators/BUILD | 10 ++++++++++ tests/core/conversion/evaluators/evaluator_test.bzl | 4 +++- tests/core/lowering/BUILD | 5 +++-- tests/core/lowering/lowering_test.bzl | 4 ++-- tests/core/partitioning/partitioning_test.bzl | 6 +++--- tests/core/runtime/runtime_test.bzl | 4 ++-- 10 files changed, 38 insertions(+), 13 deletions(-) diff --git a/.bazelversion b/.bazelversion index 0e79152459..e7fdef7e2e 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -8.1.1 +8.4.2 diff --git a/core/conversion/evaluators/aten.cpp b/core/conversion/evaluators/aten.cpp index 8b5b6e0af3..a878961f8e 100644 --- a/core/conversion/evaluators/aten.cpp +++ b/core/conversion/evaluators/aten.cpp @@ -948,7 +948,7 @@ auto aten_registrations TORCHTRT_UNUSED = stack.push_back(*args.at(v).IValue()); } stack.push_back(input_num); - auto& ops = torch::jit::getAllOperatorsFor(c10::Symbol::fromQualString("aten::format")); + auto ops = torch::jit::getAllOperatorsFor(c10::Symbol::fromQualString("aten::format")); auto& aten_format = ops.front(); aten_format->getOperation()(stack); std::string output; diff --git a/tests/core/conversion/converters/BUILD b/tests/core/conversion/converters/BUILD index dfab90a978..f0f47276f0 100644 --- a/tests/core/conversion/converters/BUILD +++ b/tests/core/conversion/converters/BUILD @@ -14,6 +14,16 @@ config_setting( ], ) +config_setting( + name = "jetpack", + constraint_values = [ + "@platforms//cpu:aarch64", + ], + flag_values = { + "//toolchains/dep_collection:compute_libs": "jetpack", + }, +) + converter_test( name = "test_activation", ) diff --git a/tests/core/conversion/converters/converter_test.bzl b/tests/core/conversion/converters/converter_test.bzl index 61ad79034a..157f762f2a 100644 --- a/tests/core/conversion/converters/converter_test.bzl +++ b/tests/core/conversion/converters/converter_test.bzl @@ -19,8 +19,10 @@ def converter_test(name, visibility = None): "//tests/util", "@googletest//:gtest_main", ] + select({ + ":jetpack": ["@torch_l4t//:libtorch"], + ":use_torch_whl": ["@torch_whl//:libtorch"], ":windows": ["@libtorch_win//:libtorch"], - "//conditions:default": ["@libtorch//:libtorch"], + "//conditions:default": ["@libtorch"], }), timeout = "moderate", ) diff --git a/tests/core/conversion/evaluators/BUILD b/tests/core/conversion/evaluators/BUILD index 9b2a708297..22ddbdf298 100644 --- a/tests/core/conversion/evaluators/BUILD +++ b/tests/core/conversion/evaluators/BUILD @@ -14,6 +14,16 @@ config_setting( ], ) +config_setting( + name = "jetpack", + constraint_values = [ + "@platforms//cpu:aarch64", + ], + flag_values = { + "//toolchains/dep_collection:compute_libs": "jetpack", + }, +) + evaluator_test( name = "test_prim_evaluators", ) diff --git a/tests/core/conversion/evaluators/evaluator_test.bzl b/tests/core/conversion/evaluators/evaluator_test.bzl index b49866f9df..4df0c9e9c4 100644 --- a/tests/core/conversion/evaluators/evaluator_test.bzl +++ b/tests/core/conversion/evaluators/evaluator_test.bzl @@ -19,8 +19,10 @@ def evaluator_test(name, visibility = None): "//tests/util", "@googletest//:gtest_main", ] + select({ + ":jetpack": ["@torch_l4t//:libtorch"], + ":use_torch_whl": ["@torch_whl//:libtorch"], ":windows": ["@libtorch_win//:libtorch"], - "//conditions:default": ["@libtorch//:libtorch"], + "//conditions:default": ["@libtorch"], }), timeout = "long", ) diff --git a/tests/core/lowering/BUILD b/tests/core/lowering/BUILD index 3a69614623..71e11d9e87 100644 --- a/tests/core/lowering/BUILD +++ b/tests/core/lowering/BUILD @@ -40,9 +40,10 @@ cc_test( "//tests/util", "@googletest//:gtest_main", ] + select({ + ":jetpack": ["@torch_l4t//:libtorch"], + ":use_torch_whl": ["@torch_whl//:libtorch"], ":windows": ["@libtorch_win//:libtorch"], - ":jetpack": ["@torch_l4t//:libtorch"], - "//conditions:default": ["@libtorch"], + "//conditions:default": ["@libtorch"], }), ) diff --git a/tests/core/lowering/lowering_test.bzl b/tests/core/lowering/lowering_test.bzl index 04167cbb48..5cf97f155e 100644 --- a/tests/core/lowering/lowering_test.bzl +++ b/tests/core/lowering/lowering_test.bzl @@ -19,9 +19,9 @@ def lowering_test(name, visibility = None): "//tests/util", "@googletest//:gtest_main", ] + select({ - ":windows": ["@libtorch_win//:libtorch"], - ":use_torch_whl": ["@torch_whl//:libtorch"], ":jetpack": ["@torch_l4t//:libtorch"], + ":use_torch_whl": ["@torch_whl//:libtorch"], + ":windows": ["@libtorch_win//:libtorch"], "//conditions:default": ["@libtorch"], }), timeout = "short", diff --git a/tests/core/partitioning/partitioning_test.bzl b/tests/core/partitioning/partitioning_test.bzl index 5128203064..b82d4e7b6b 100644 --- a/tests/core/partitioning/partitioning_test.bzl +++ b/tests/core/partitioning/partitioning_test.bzl @@ -19,10 +19,10 @@ def partitioning_test(name, visibility = None): "//tests/util", "@googletest//:gtest_main", ] + select({ - ":windows": ["@libtorch_win//:libtorch"], - ":use_torch_whl": ["@torch_whl//:libtorch"], ":jetpack": ["@torch_l4t//:libtorch"], + ":use_torch_whl": ["@torch_whl//:libtorch"], + ":windows": ["@libtorch_win//:libtorch"], "//conditions:default": ["@libtorch"], - }), + }) #timeout = "short", ) diff --git a/tests/core/runtime/runtime_test.bzl b/tests/core/runtime/runtime_test.bzl index acd2bf47c8..6c3377ac8f 100644 --- a/tests/core/runtime/runtime_test.bzl +++ b/tests/core/runtime/runtime_test.bzl @@ -19,9 +19,9 @@ def runtime_test(name, visibility = None): "//tests/util", "@googletest//:gtest_main", ] + select({ - ":windows": ["@libtorch_win//:libtorch"], - ":use_torch_whl": ["@torch_whl//:libtorch"], ":jetpack": ["@torch_l4t//:libtorch"], + ":use_torch_whl": ["@torch_whl//:libtorch"], + ":windows": ["@libtorch_win//:libtorch"], "//conditions:default": ["@libtorch"], }), )