Merge branch 'fix_eval' into 'release/1.0'

fix(eval): Rollback 1.11a0 change + namespace issues

See merge request adlsa/TRTorch!15

Author: narendasan

core/conversion/evaluators/eval_macros.h

@@ -63,7 +63,7 @@
              auto b = args.at(n->input(1)).unwrapToString();                                           \
              return operation;                                                                         \
            } else {                                                                                    \
-             TRTORCH_THROW_ERROR(                                                                      \
+             TORCHTRT_THROW_ERROR(                                                                     \
                  "Unimplemented data type for "                                                        \
                  << node_kind << " evaluator b arg:" << args.at(n->input(1)).IValue()->type()->str()); \
              return {};                                                                                \

core/conversion/evaluators/eval_util.cpp

@@ -238,7 +238,7 @@ at::Tensor createTensorFromList(
   /// Gets shape of tensor to be created
   auto sizes = compute_sizes(data);
   checkListInputType(elem_type, sizes.size() == 1 && sizes[0] == 0);
-  at::ScalarType initial_scalar_type = c10::scalarTypeFromJitType(*elem_type);
+  at::ScalarType initial_scalar_type = c10::scalarTypeFromJitType(elem_type);
   if (initial_scalar_type == at::ScalarType::Double) {
     initial_scalar_type = at::typeMetaToScalarType(c10::get_default_dtype());
   }

tests/core/conversion/evaluators/test_aten_evaluators.cpp

@@ -524,8 +524,8 @@ TEST(Evaluators, EqStrResultIsTrueEvaluatesCorrectly) {
   auto g = std::make_shared<torch::jit::Graph>();
   torch::jit::parseIR(graph, g.get());
 
-  auto jit_results = trtorch::tests::util::EvaluateGraphJIT(g, {});
-  auto trt_results = trtorch::tests::util::EvaluateGraph(g->block(), {});
+  auto jit_results = torch_tensorrt::tests::util::EvaluateGraphJIT(g, {});
+  auto trt_results = torch_tensorrt::tests::util::EvaluateGraph(g->block(), {});
 
   ASSERT_TRUE(jit_results[0] == trt_results[0]);
 }
@@ -541,8 +541,8 @@ TEST(Evaluators, EqStrResultIsFalseEvaluatesCorrectly) {
   auto g = std::make_shared<torch::jit::Graph>();
   torch::jit::parseIR(graph, g.get());
 
-  auto jit_results = trtorch::tests::util::EvaluateGraphJIT(g, {});
-  auto trt_results = trtorch::tests::util::EvaluateGraph(g->block(), {});
+  auto jit_results = torch_tensorrt::tests::util::EvaluateGraphJIT(g, {});
+  auto trt_results = torch_tensorrt::tests::util::EvaluateGraph(g->block(), {});
 
   ASSERT_TRUE(jit_results[0] == trt_results[0]);
 }
@@ -558,8 +558,8 @@ TEST(Evaluators, AndBoolResultIsTrueEvaluatesCorrectly) {
   auto g = std::make_shared<torch::jit::Graph>();
   torch::jit::parseIR(graph, g.get());
 
-  auto jit_results = trtorch::tests::util::EvaluateGraphJIT(g, {});
-  auto trt_results = trtorch::tests::util::EvaluateGraph(g->block(), {});
+  auto jit_results = torch_tensorrt::tests::util::EvaluateGraphJIT(g, {});
+  auto trt_results = torch_tensorrt::tests::util::EvaluateGraph(g->block(), {});
 
   ASSERT_TRUE(jit_results[0] == trt_results[0]);
 }
@@ -575,8 +575,8 @@ TEST(Evaluators, AndBoolResultIsFalseEvaluatesCorrectly) {
   auto g = std::make_shared<torch::jit::Graph>();
   torch::jit::parseIR(graph, g.get());
 
-  auto jit_results = trtorch::tests::util::EvaluateGraphJIT(g, {});
-  auto trt_results = trtorch::tests::util::EvaluateGraph(g->block(), {});
+  auto jit_results = torch_tensorrt::tests::util::EvaluateGraphJIT(g, {});
+  auto trt_results = torch_tensorrt::tests::util::EvaluateGraph(g->block(), {});
 
   ASSERT_TRUE(jit_results[0] == trt_results[0]);
 }