Updated build rules for test modules

Signed-off-by: andi4191 <[email protected]>

Author: andi4191

README.md

@@ -173,7 +173,7 @@ bazel build //:libtrtorch --compilation_mode=dbg
 
 ### Native compilation on NVIDIA Jetson AGX
 ``` shell
-bazel build //:libtrtorch --distdir third_party/distdir/aarch64-linux-gnu --config=pre_cxx11_abi_aarch64
+bazel build //:libtrtorch --cpu=aarch64 --distdir third_party/distdir/aarch64-linux-gnu
 ```
 
 A tarball with the include files and library can then be found in bazel-bin

tests/core/converters/converter_test.bzl

@@ -9,7 +9,6 @@ def converter_test(name, visibility=None):
             "//core",
             "@googletest//:gtest_main",
         ] + select({
-            ":aarch64":  ["@libtorch_aarch64//:libtorch"],
             ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
             "//conditions:default":  ["@libtorch//:libtorch"],
         }),

tests/modules/BUILD

@@ -74,7 +74,6 @@ cc_library(
         "//tests/util",
         "@googletest//:gtest_main",
     ] + select({
-        ":aarch64" : ["@libtorch_aarch64//:libtorch"],
         ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
     }),

tests/util/BUILD

@@ -7,21 +7,6 @@ config_setting(
     }
 )
 
-config_setting(
-    name = "use_pre_cxx11_abi_aarch64",
-    values = {
-        "define": "abi=pre_cxx11_abi",
-	"cpu" : "aarch64"
-    }
-)
-
-config_setting(
-    name = "aarch64",
-    values = {
-	"cpu" : "aarch64"
-	}
-)
-
 cc_library(
     name = "util",
     hdrs = [
@@ -37,18 +22,12 @@ cc_library(
         "//core/conversion",
         "//core/util:prelude",
         "//cpp/api:trtorch",
-    ] +select({
-        ":aarch64": ["@libtorch_aarch64//:libtorch",
-		     "@libtorch_aarch64//:caffe2",
-		     "@tensorrt_aarch64//:nvinfer"],
+    ] + select({
         ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch",
-				"@libtorch_pre_cxx11_abi//:caffe2",
-				"@tensorrt//:nvinfer"],
-        ":use_pre_cxx11_abi_aarch64": ["@libtorch_pre_cxx11_abi_aarch64//:libtorch",
-		                       "@libtorch_pre_cxx11_abi_aarch64//:caffe2",
-				       "@tensorrt_aarch64//:nvinfer"],
+				"@libtorch_pre_cxx11_abi//:caffe2"],
         "//conditions:default":  ["@libtorch//:libtorch",
-				  "@libtorch//:caffe2",
-				  "@tensorrt//:nvinfer"],
+				  "@libtorch//:caffe2"],
+    }) + select({
+        "//conditions:default": ["@tensorrt//:nvinfer"],
     }),
 )