Merge pull request #393 from guoruoqian/squeeze_fix_bug

Fix bug in squeeze

Author: narendasan

core/conversion/converters/impl/squeeze.cpp

@@ -25,6 +25,14 @@ auto squeeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().pat
          dim = selfDim.size() + dim;
        }
 
+       if (selfDim[dim] != 1) {
+         auto out = ctx->AssociateValueAndTensor(n->outputs()[0], self);
+
+         LOG_DEBUG("Output tensor shape: " << out->getDimensions());
+
+         return true;
+       }
+
        auto shuffle_layer = ctx->net->addShuffle(*self);
        TRTORCH_CHECK(shuffle_layer, "Unable to create shuffle layer from node: " << *n);
        shuffle_layer->setReshapeDimensions(util::squeezeDims(self->getDimensions(), dim));

tests/core/conversion/converters/test_squeeze.cpp

@@ -22,5 +22,35 @@ TEST(Converters, ATenSqueezeConvertsCorrectly) {
   params = trtorch::core::conversion::get_named_params(g->inputs(), {});
   auto trt_results = trtorch::tests::util::RunGraphEngine(g, params, {in});
 
+  ASSERT_TRUE(trtorch::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
+}
+
+TEST(Converters, ATenSqueezeDontNeedSqueezeConvertsCorrectly) {
+  const auto graph = R"IR(
+      graph(%0 : Tensor, %1 : Tensor):
+        %2 : int = prim::Constant[value=1]()
+        %2.1 : Tensor = aten::add(%0, %1, %2)
+        %3 : Tensor = aten::squeeze(%2.1, %2)
+        %4 : Tensor = aten::add(%3, %1, %2)
+        return (%4))IR";
+
+  auto g = std::make_shared<torch::jit::Graph>();
+  torch::jit::parseIR(graph, &*g);
+
+  auto in = at::randint(1, 10, {2, 3, 3}, {at::kCUDA});
+  auto in_add = at::randint(1, 10, {2, 3, 3}, {at::kCUDA});
+
+  auto jit_in = at::clone(in);
+  auto jit_in_add = at::clone(in_add);
+
+  auto params = trtorch::core::conversion::get_named_params(g->inputs(), {});
+  auto jit_results = trtorch::tests::util::RunGraph(g, params, {jit_in, jit_in_add});
+
+  auto trt_in = at::clone(jit_in);
+  auto trt_in_add = at::clone(jit_in_add);
+
+  params = trtorch::core::conversion::get_named_params(g->inputs(), {});
+  auto trt_results = trtorch::tests::util::RunGraphEngine(g, params, {trt_in, trt_in_add});
+
   ASSERT_TRUE(trtorch::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
 }