Add support for aten::squeeze, aten::unsqueeze #301
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: inocsin <vcheungyi@163.com>
github-actions
bot
added
component: conversion
narendasan
force-pushed
the
squeeze_unsqueeze
branch
from
f0a05d1 to
81e0cfa
Compare
unsqueeze ops Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
There are some changes that do not conform to C++ style guidelines:
diff --git a/workspace/core/util/trt_util.cpp b/tmp/changes.txt
index 6a510e7..de34c9a 100644
--- a/workspace/core/util/trt_util.cpp
+++ b/tmp/changes.txt
@@ -204,11 +204,9 @@ nvinfer1::Dims squeezeDims(const nvinfer1::Dims& d, int pos) {
if (i <= d.nbDims) {
dims.d[j] = d.d[i];
}
-
}
i++;
j++;
-
}
dims.nbDims = d.nbDims - 1;
diff --git a/workspace/core/conversion/converters/impl/squeeze.cpp b/tmp/changes.txt
index 2471cb8..f91e471 100644
--- a/workspace/core/conversion/converters/impl/squeeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto squeeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().pat
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/core/conversion/converters/impl/unsqueeze.cpp b/tmp/changes.txt
index 1c2e6cf..d5239db 100644
--- a/workspace/core/conversion/converters/impl/unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto unsqueeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().p
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/tests/core/conversion/converters/test_squeeze.cpp b/tmp/changes.txt
index 6441e47..b271672 100644
--- a/workspace/tests/core/conversion/converters/test_squeeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenSqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
diff --git a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp b/tmp/changes.txt
index 2027000..f92eb4f 100644
--- a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenUnsqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
ERROR: Some files do not conform to style guidelines
There was a problem hiding this comment.
There are some changes that do not conform to C++ style guidelines:
diff --git a/workspace/core/util/trt_util.cpp b/tmp/changes.txt
index 6a510e7..de34c9a 100644
--- a/workspace/core/util/trt_util.cpp
+++ b/tmp/changes.txt
@@ -204,11 +204,9 @@ nvinfer1::Dims squeezeDims(const nvinfer1::Dims& d, int pos) {
if (i <= d.nbDims) {
dims.d[j] = d.d[i];
}
-
}
i++;
j++;
-
}
dims.nbDims = d.nbDims - 1;
diff --git a/workspace/core/conversion/converters/impl/squeeze.cpp b/tmp/changes.txt
index 2471cb8..f91e471 100644
--- a/workspace/core/conversion/converters/impl/squeeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto squeeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().pat
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/core/conversion/converters/impl/unsqueeze.cpp b/tmp/changes.txt
index 1c2e6cf..d5239db 100644
--- a/workspace/core/conversion/converters/impl/unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto unsqueeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().p
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/tests/core/conversion/converters/test_squeeze.cpp b/tmp/changes.txt
index 6441e47..b271672 100644
--- a/workspace/tests/core/conversion/converters/test_squeeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenSqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
diff --git a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp b/tmp/changes.txt
index 2027000..f92eb4f 100644
--- a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenUnsqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
ERROR: Some files do not conform to style guidelines
narendasan
force-pushed
the
squeeze_unsqueeze
branch
from
81e0cfa to
9e0a1d7
Compare
There was a problem hiding this comment.
There are some changes that do not conform to C++ style guidelines:
diff --git a/workspace/core/util/trt_util.cpp b/tmp/changes.txt
index 6a510e7..de34c9a 100644
--- a/workspace/core/util/trt_util.cpp
+++ b/tmp/changes.txt
@@ -204,11 +204,9 @@ nvinfer1::Dims squeezeDims(const nvinfer1::Dims& d, int pos) {
if (i <= d.nbDims) {
dims.d[j] = d.d[i];
}
-
}
i++;
j++;
-
}
dims.nbDims = d.nbDims - 1;
diff --git a/workspace/core/conversion/converters/impl/squeeze.cpp b/tmp/changes.txt
index 2471cb8..f91e471 100644
--- a/workspace/core/conversion/converters/impl/squeeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto squeeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().pat
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/core/conversion/converters/impl/unsqueeze.cpp b/tmp/changes.txt
index 1c2e6cf..d5239db 100644
--- a/workspace/core/conversion/converters/impl/unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto unsqueeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().p
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/tests/core/conversion/converters/test_squeeze.cpp b/tmp/changes.txt
index 6441e47..b271672 100644
--- a/workspace/tests/core/conversion/converters/test_squeeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenSqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
diff --git a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp b/tmp/changes.txt
index 2027000..f92eb4f 100644
--- a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenUnsqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
ERROR: Some files do not conform to style guidelines
There was a problem hiding this comment.
There are some changes that do not conform to C++ style guidelines:
diff --git a/workspace/core/util/trt_util.cpp b/tmp/changes.txt
index 6a510e7..de34c9a 100644
--- a/workspace/core/util/trt_util.cpp
+++ b/tmp/changes.txt
@@ -204,11 +204,9 @@ nvinfer1::Dims squeezeDims(const nvinfer1::Dims& d, int pos) {
if (i <= d.nbDims) {
dims.d[j] = d.d[i];
}
-
}
i++;
j++;
-
}
dims.nbDims = d.nbDims - 1;
diff --git a/workspace/core/conversion/converters/impl/squeeze.cpp b/tmp/changes.txt
index 2471cb8..f91e471 100644
--- a/workspace/core/conversion/converters/impl/squeeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto squeeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().pat
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/core/conversion/converters/impl/unsqueeze.cpp b/tmp/changes.txt
index 1c2e6cf..d5239db 100644
--- a/workspace/core/conversion/converters/impl/unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -22,7 +22,7 @@ auto unsqueeze_registrations TRTORCH_UNUSED = RegisterNodeConversionPatterns().p
auto selfDim = util::toVec(self->getDimensions());
if (dim < 0) {
- dim = selfDim.size() + dim;
+ dim = selfDim.size() + dim;
}
auto shuffle_layer = ctx->net->addShuffle(*self);
diff --git a/workspace/tests/core/conversion/converters/test_squeeze.cpp b/tmp/changes.txt
index 6441e47..b271672 100644
--- a/workspace/tests/core/conversion/converters/test_squeeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenSqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
diff --git a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp b/tmp/changes.txt
index 2027000..f92eb4f 100644
--- a/workspace/tests/core/conversion/converters/test_unsqueeze.cpp
+++ b/tmp/changes.txt
@@ -4,8 +4,6 @@
#include "tests/util/util.h"
#include "torch/csrc/jit/ir/irparser.h"
-
-
TEST(Converters, ATenUnsqueezeConvertsCorrectly) {
const auto graph = R"IR(
graph(%0 : Tensor):
ERROR: Some files do not conform to style guidelines
peri044
approved these changes
Jan 29, 2021
Signed-off-by: Naren Dasan <naren@narendasan.com> Signed-off-by: Naren Dasan <narens@nvidia.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds
aten::squeezeandaten::unsqueezeto the compilerType of change
Please delete options that are not relevant and/or add your own.
Checklist: