Merge pull request #268 from NVIDIA/testing

Adds testing infrastructure for evaluators and lowering passes

Author: narendasan

core/conversion/conversion.cpp

@@ -18,11 +18,7 @@ bool OpSupported(const torch::jit::Node* n) {
   return evaluators::shouldEvalAtConversionTime(n) || converters::node_is_convertable(n);
 }
 
-c10::optional<torch::jit::IValue> EvaluateNode(
-    ConversionCtx* ctx,
-    const torch::jit::Node* n,
-    int level = 0,
-    int limit = 10) {
+c10::optional<torch::jit::IValue> EvaluateNode(ConversionCtx* ctx, const torch::jit::Node* n, int level, int limit) {
   // Check to see if you can just go through and eval all of these AOT (saves
   // the recursion) Also probably a better way to deal with the two error cases;
   TRTORCH_CHECK(

core/conversion/conversion.h

@@ -42,6 +42,12 @@ bool OpSupported(const torch::jit::Node* n);
 
 bool VerifyConverterSupportForBlock(const torch::jit::Block* b);
 
+c10::optional<torch::jit::IValue> EvaluateNode(
+    ConversionCtx* ctx,
+    const torch::jit::Node* n,
+    int level = 0,
+    int limit = 10);
+
 } // namespace conversion
 } // namespace core
 } // namespace trtorch

tests/BUILD

@@ -1,32 +1,32 @@
 test_suite(
     name = "tests",
     tests = [
-        "//tests/core/converters:test_converters",
-        "//tests/modules:test_modules"
+        "//tests/core:core_tests",
+        "//tests/modules:module_tests"
     ],
 )
 
 test_suite(
     name = "required_and_optional_tests",
     tests = [
         ":tests",
-        "//tests/accuracy:test_accuracy"
+        "//tests/accuracy:accuracy_tests"
     ]
 )
 
 test_suite(
    name = "aarch64_tests",
    tests = [
-       "//tests/core/converters:test_converters",
-       "//tests/modules:test_modules_aarch64"
+        "//tests/core:core_tests",
+        "//tests/modules:aarch64_module_tests"
    ],
 )
 
 test_suite(
    name = "required_and_optional_aarch64_tests",
    tests = [
-       ":aarch64_tests",
-       "//tests/accuracy:test_accuracy_aarch64"
+        ":aarch64_tests",
+        "//tests/accuracy:aarch64_accuracy_tests"
    ]
 )
 

tests/accuracy/BUILD

@@ -4,7 +4,7 @@ filegroup(
 )
 
 test_suite(
-    name = "test_accuracy_aarch64",
+    name = "aarch64_accuracy_tests",
     tests = [
         ":test_dla_int8_accuracy",
         ":test_dla_fp16_accuracy",
@@ -15,7 +15,7 @@ test_suite(
 )
 
 test_suite(
-    name = "test_accuracy",
+    name = "accuracy_tests",
     tests = [
         ":test_int8_accuracy",
         ":test_fp16_accuracy",

tests/core/BUILD

@@ -0,0 +1,7 @@
+test_suite(
+    name = "core_tests",
+    tests = [
+        "//tests/core/conversion:conversion_tests",
+        "//tests/core/lowering:lowering_tests",
+    ],
+)

tests/core/conversion/BUILD

@@ -0,0 +1,7 @@
+test_suite(
+    name = "conversion_tests",
+    tests = [
+        "//tests/core/conversion/converters:converter_tests",
+        "//tests/core/conversion/evaluators:evaluator_tests",
+    ],
+)

tests/core/converters/BUILD renamed to tests/core/conversion/converters/BUILD

@@ -1,4 +1,4 @@
-load("//tests/core/converters:converter_test.bzl", "converter_test")
+load("//tests/core/conversion/converters:converter_test.bzl", "converter_test")
 
 config_setting(
     name = "use_pre_cxx11_abi",
@@ -72,7 +72,7 @@ converter_test(
 )
 
 test_suite(
-  name = "test_converters",
+  name = "converter_tests",
   tests = [
     ":test_activation",
     ":test_batch_norm",