[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[Frontend][PaddlePaddle] Add autopad for conv/pool - #9295

Merged
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002
Oct 22, 2021
Merged

[Frontend][PaddlePaddle] Add autopad for conv/pool#9295
masahi merged 16 commits into
apache:mainfrom
jiangjiajun:pr002

Conversation

@jiangjiajun

@jiangjiajunjiangjiajun commented Oct 15, 2021

Copy link
Copy Markdown
Contributor

This will solve the problem with dynamic input shape while padding==SAME in conv2d/pool2d

also include pad3d and squeeze, this two operators will be used for padding tensor.
And the _autopad function refers to ONNX frontend @mbrookhart

Thanks for contributing to TVM! Please refer to guideline https://tvm.apache.org/docs/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers by @ them in the pull request thread.

@jiangjiajun

Copy link
Copy Markdown
ContributorAuthor

@areusch@comaniac@AndrewZhaoLuo@mbrookhart Hi, Could you help to review this pull request, all the tests have passed

@AndrewZhaoLuo

Copy link
Copy Markdown
Contributor

I'll take a look today.

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, overall LGTM though I need to maybe read the spec a bit more closely.


def _get_pad_size(in_size, dilated_kernel_size, stride_size):
"""Calculate the paddings size for Conv/Pool in SAME padding mode."""
def _autopad(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you just use

defautopad(
data,
strides,
kernel_shape,
dilations,
ndim,
pad_type="constant",
deconv=False,
mode="SAME_UPPER",
pad_value=0.0,
):
"""
Perform autopadding with dynamic input shapes
"""
# get attributes as constants
strides=_op.const(np.array(strides), dtype="int64")
dilated_kernel_shape=_op.const(
np.array(
[(kernel-1) *dilation+1forkernel, dilationinzip(kernel_shape, dilations)]
),
dtype="int64",
)
# get input shape
shape=_op.strided_slice(shape_of(data, dtype="int64"), [2], [ndim])
# set up integer constants
zero=_op.const(0, dtype="int64")
one=_op.const(1, dtype="int64")
two=_op.const(2, dtype="int64")
# Calculate total padding
mod=_op.mod(shape, strides)
left=_op.maximum(dilated_kernel_shape-strides, zero)
right=_op.maximum(dilated_kernel_shape-mod, zero)
total_pad=_op.where(_op.equal(mod, zero), left, right)
ifdeconv:
total_pad=_op.const(np.array(kernel_shape), dtype="int64") -one-total_pad
# split total padding into before and after
pad_before=_op.floor_divide(total_pad, two)
pad_after=total_pad-pad_before
# combine
if"LOWER"inmode:
pad=_op.concatenate(
[_op.reshape(pad_after, [-1, 1]), _op.reshape(pad_before, [-1, 1])], axis=1
)
else:
pad=_op.concatenate(
[_op.reshape(pad_before, [-1, 1]), _op.reshape(pad_after, [-1, 1])], axis=1
)
# pad N and C with zeros
pad=_op.concatenate([_op.const(np.zeros([2, 2], dtype="int64"), dtype="int64"), pad], axis=0)
ifisinstance(pad_value, (float, int)):
pad_value=_op.const(pad_value)
return_op.nn.pad(data, fold_constant(pad), pad_value, pad_type)
?

  1. Refactor _autopad in the onnx.py file to tvm/python/tvm/relay/frontend/common.py

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good advice, I think this function also works for tensorflow and tflite to solve dynamic shape problem.

shape_of and autopad are both removed to common.py

pad_h = _get_pad_size(in_h, (k_h - 1) * dilations[0] + 1, strides[0])
pad_w = _get_pad_size(in_w, (k_w - 1) * dilations[1] + 1, strides[1])
paddings = [pad_h[0], pad_w[0], pad_h[1], pad_w[1]]
dilations = [1, 1]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we mean to override the dilations?

@jiangjiajunjiangjiajunOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This is a history issue for Paddle framework, while padding==SAME, it will force dliations = 1
Here is the implementation code https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/operators/conv_op.h#L113

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

To avoid confusion, I put a comment on this line of code to explain this problem.

heliqiand others added 3 commits October 22, 2021 17:24

@AndrewZhaoLuoAndrewZhaoLuo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@masahi
masahi merged commit 4fb6fa5 into apache:mainOct 22, 2021
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
* Add autopad for conv/pool
* add autopad for conv/pool
* fix pylint warning
* add some annotations
* add som annotations
* add som annotations
* Refactor autopad in the onnx.py and paddlepaddle.py to relay/frontend/common.py
* add comment for conv2d
Co-authored-by: heliqi <1101791222@qq.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jiangjiajun@AndrewZhaoLuo@masahi@heliqi