Skip to content

Only support upsample with ONNX OPSET version <=7 #2792

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

Closed
gemfield wants to merge 1 commit into from
Closed

Only support upsample with ONNX OPSET version <=7 #2792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 3rdparty/HalideIR
Open in desktop
Submodule HalideIR updated 1 files
+1 −1 src/tvm/node/container.h
2 changes: 1 addition & 1 deletion 3rdparty/dmlc-core
Open in desktop
Submodule dmlc-core updated 30 files
+0 −7 .travis.yml
+5 −32 CMakeLists.txt
+0 −5 cmake/dmlc-config.cmake.in
+0 −16 doc/build.md
+0 −1 doc/index.md
+0 −1 include/dmlc/concurrency.h
+1 −8 include/dmlc/endian.h
+31 −2 include/dmlc/filesystem.h
+0 −113 include/dmlc/io.h
+0 −1 include/dmlc/json.h
+3 −9 include/dmlc/logging.h
+0 −2 include/dmlc/memory.h
+1 −1 include/dmlc/optional.h
+1 −1 include/dmlc/parameter.h
+8 −58 include/dmlc/strtonum.h
+0 −2 include/dmlc/thread_group.h
+8 −0 scripts/travis/travis_osx_install.sh
+1 −0 src/io.cc
+1 −1 src/io/azure_filesys.h
+2 −32 src/io/filesys.cc
+128 −0 src/io/filesys.h
+1 −2 src/io/hdfs_filesys.h
+1 −1 src/io/input_split_base.h
+1 −1 src/io/local_filesys.h
+2 −4 src/io/s3_filesys.cc
+1 −1 src/io/s3_filesys.h
+1 −0 src/io/uri_spec.h
+1 −1 test/filesys_test.cc
+0 −35 test/unittest/unittest_param.cc
+4 −18 tracker/dmlc_tracker/local.py
7 changes: 6 additions & 1 deletion python/tvm/relay/frontend/onnx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,13 @@ class Upsample(OnnxOpConverter):
"""

@classmethod
def _impl_v7(cls, inputs, attr, params):
def _impl_v9(cls, inputs, attr, params):
scales = attr.get('scales')
if not scales:
Copy link
Contributor

@srkreddy1238 srkreddy1238 Mar 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inputs[1] may be mostly available in params.

Can you attempt taking it from params and proceeding to make it compatible for opset-8 ?

Copy link
Contributor Author

@gemfield gemfield Mar 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But how to get the scale value from input[1], and how to create the new input? Is following code snippet resonable? Thanks.

    def _impl_v7(cls, inputs, attr, params):
        scales = attr.get('scales')
        if not scales:
            #Here we are going to higher OPSET version.
            assert len(inputs) == 2, "Upsample op take 2 inputs, {} given".format(len(inputs))
            scales = params[inputs[1].name_hint].asnumpy()
            inputs = inputs[:1]

Copy link
Contributor

@srkreddy1238 srkreddy1238 Mar 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gemfield yes, above code look good. Add it and let the CI pass for it.
Also please try adding a test case too for it.

#Here we are going to higher OPSET version.
assert len(inputs) == 2, "Upsample op take 2 inputs, {} given".format(len(inputs))
scales = params[inputs[1].name_hint].asnumpy()
inputs = inputs[:1]
assert len(scales) == 4 and scales[0] == 1.0 and scales[1] == 1.0 and scales[2] == scales[3]
mode = attr.get('mode')
if mode == b'nearest':
Expand Down