Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use is_constant_initializer #83

Merged
merged 2 commits into from
Jul 1, 2022
Merged

Use is_constant_initializer #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a16b3c8
use is_constant_initializer
daquexian Jul 1, 2022
a5456e1
Merge branch 'master' into use_is_constant_initializer
daquexian Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions onnxoptimizer/passes/eliminate_nop_expand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ struct EliminateNopExpand final : public PredicateBasedPass {
return "eliminate_nop_expand";
}

bool isConstantTensor(Graph& graph, const std::string& name) {
const auto& initializer_names = graph.initializer_names();
return std::find(initializer_names.cbegin(), initializer_names.cend(),
name) != initializer_names.cend();
}

bool isABroadcastToB(const std::vector<int64_t>& dims_a,
const std::vector<Dimension>& dims_b) {
int ndim_a = dims_a.size();
Expand Down Expand Up @@ -59,10 +53,11 @@ struct EliminateNopExpand final : public PredicateBasedPass {
bool runTransform(Node* node, Graph& graph,
NodeDestroyType& destroy_current) override {
auto& input_value = node->inputs()[0];
const auto shape_tensor_name = node->inputs()[1]->uniqueName();
const auto* shape_value = node->input(1);
const auto shape_tensor_name = shape_value->uniqueName();
const auto shape_tensor = graph.getInitializer(shape_tensor_name);

if (!isConstantTensor(graph, shape_tensor_name) ||
if (!graph.is_constant_initializer(shape_value) ||
!isABroadcastToB(ParseData<int64_t>(&*shape_tensor),
input_value->sizes()) ||
!tryReplacingAllUsesWith(node->output(), input_value)) {
Expand Down
5 changes: 1 addition & 4 deletions onnxoptimizer/passes/eliminate_nop_reshape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@ struct EliminateNopReshape final : public PredicateBasedPass {
NodeDestroyType &destroy_current) override {
const auto &data_input_dims = node->inputs()[0]->sizes();
const auto *shape_input = node->inputs()[1];
const auto &initializer_names = graph.initializer_names();

const Tensor *shape_tensor = nullptr;
if (shape_input->node()->kind() == kConstant) {
shape_tensor = &shape_input->node()->t(kvalue);
} else if (shape_input->node()->kind() == kParam &&
std::find(initializer_names.cbegin(), initializer_names.cend(),
shape_input->uniqueName()) != initializer_names.cend()) {
} else if (graph.is_constant_initializer(shape_input)) {
shape_tensor = &*graph.getInitializer(shape_input->uniqueName());
} else {
return false;
Expand Down
5 changes: 1 addition & 4 deletions onnxoptimizer/passes/eliminate_shape_gather.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@ struct EliminateShapeGather final : public PredicateBasedPass {
NodeDestroyType &destroy_current) override {
auto *x = node->inputs()[0];
auto *indices = node->inputs()[1];
const auto &initializer_names = graph.initializer_names();
Node *shape = x->node();
const auto &dims = shape->input()->sizes();

const Tensor *indices_tensor = nullptr;
if (indices->node()->kind() == kConstant) {
indices_tensor = &indices->node()->t(kvalue);
} else if (indices->node()->kind() == kParam &&
std::find(initializer_names.cbegin(), initializer_names.cend(),
indices->uniqueName()) != initializer_names.cend()) {
} else if (graph.is_constant_initializer(indices)) {
indices_tensor = &*graph.getInitializer(indices->uniqueName());
} else {
return false;
Expand Down
5 changes: 1 addition & 4 deletions onnxoptimizer/passes/fuse_concat_and_reshape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,14 @@ struct FuseConcatAndReshape final : public PredicateBasedPass {
NodeDestroyType &destroy_current) override {
auto *shape_value = node->inputs()[1];
auto *concat = shape_value->node();
const auto &initializer_names = graph.initializer_names();

std::vector<int64_t> shapes;
for (const auto *v : concat->inputs()) {
const uint32_t kind = v->node()->kind();
const Tensor *tensor = nullptr;
if (kind == kConstant) {
tensor = &v->node()->t(kvalue);
} else if (kind == kParam &&
std::find(initializer_names.cbegin(), initializer_names.cend(),
v->uniqueName()) != initializer_names.cend()) {
} else if (graph.is_constant_initializer(v)) {
tensor = &*graph.getInitializer(v->uniqueName());
} else {
if (v->sizes().size() != 1) {
Expand Down
2 changes: 1 addition & 1 deletion third_party/onnx
Open in desktop
Submodule onnx updated 24 files
+0 −8 .github/stale.yml
+60 −0 .github/workflows/lint.yaml
+27 −0 .github/workflows/stale.yml
+3 −1 CMakeLists.txt
+3 −3 community/repo_guidelines.md
+1 −1 docs/OnnxReleases.md
+3 −0 onnx/common/ir.h
+17 −0 onnx/cpp2py_export.cc
+64 −0 onnx/defs/parser.cc
+10 −43 onnx/defs/parser.h
+293 −116 onnx/defs/printer.cc
+9 −0 onnx/defs/printer.h
+1 −1 onnx/gen_proto.py
+19 −0 onnx/onnx_cpp2py_export/parser.pyi
+10 −0 onnx/onnx_cpp2py_export/printer.pyi
+17 −0 onnx/parser.py
+15 −0 onnx/printer.py
+28 −0 onnx/test/cpp/parser_test.cc
+38 −0 onnx/test/data_propagation_test.py
+8 −2 onnx/test/parser_test.py
+35 −0 onnx/test/printer_test.py
+6 −25 onnx/test/shape_inference_test.py
+16 −4 setup.cfg
+12 −4 tools/style.sh