Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tic
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wenyuanbo
tic
Commits
d2b22a6f
Commit
d2b22a6f
authored
Sep 12, 2018
by
Siva
Committed by
Tianqi Chen
Sep 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix #1692. Constant folding and result comparision allowance. (#1708)
parent
0565fcc8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
10 deletions
+24
-10
topi/python/topi/nn/upsampling.py
+3
-2
topi/tests/python/test_topi_upsampling.py
+21
-8
No files found.
topi/python/topi/nn/upsampling.py
View file @
d2b22a6f
"""TVM operator upsampling compute."""
from
__future__
import
absolute_import
import
topi
from
..util
import
simplify
def
upsampling
(
data
,
scale
,
layout
=
"NCHW"
,
method
=
'NEAREST_NEIGHBOR'
):
...
...
@@ -31,9 +32,9 @@ def upsampling(data, scale, layout="NCHW", method='NEAREST_NEIGHBOR'):
"""
if
layout
==
"NCHW"
:
out_shape
=
(
data
.
shape
[
2
]
*
scale
,
data
.
shape
[
3
]
*
scale
)
out_shape
=
(
simplify
(
data
.
shape
[
2
]
*
scale
),
simplify
(
data
.
shape
[
3
]
*
scale
)
)
elif
layout
==
"NHWC"
:
out_shape
=
(
data
.
shape
[
1
]
*
scale
,
data
.
shape
[
2
]
*
scale
)
out_shape
=
(
simplify
(
data
.
shape
[
1
]
*
scale
),
simplify
(
data
.
shape
[
2
]
*
scale
)
)
else
:
raise
ValueError
(
"not support this layout {} yet"
.
format
(
layout
))
...
...
topi/tests/python/test_topi_upsampling.py
View file @
d2b22a6f
...
...
@@ -5,7 +5,7 @@ import topi
import
topi.testing
import
math
def
verify_upsampling
(
batch
,
in_channel
,
in_height
,
in_width
,
scale
,
layout
=
'NCHW'
):
def
verify_upsampling
(
batch
,
in_channel
,
in_height
,
in_width
,
scale
,
layout
=
'NCHW'
,
method
=
"NEAREST_NEIGHBOR"
):
if
layout
==
'NCHW'
:
...
...
@@ -22,9 +22,13 @@ def verify_upsampling(batch, in_channel, in_height, in_width, scale, layout='NCH
raise
NotImplementedError
(
'Layout not supported {} '
.
format
(
layout
))
B
=
topi
.
nn
.
upsampling
(
A
,
scale
,
layout
=
layout
)
B
=
topi
.
nn
.
upsampling
(
A
,
scale
,
layout
=
layout
,
method
=
method
)
b_np
=
topi
.
testing
.
upsampling_python
(
a_np
,
scale
,
layout
)
if
method
==
"BILINEAR"
:
out_size
=
(
in_height
*
scale
,
in_width
*
scale
)
b_np
=
topi
.
testing
.
bilinear_resize_python
(
a_np
,
out_size
,
layout
)
else
:
b_np
=
topi
.
testing
.
upsampling_python
(
a_np
,
scale
,
layout
)
def
check_device
(
device
):
ctx
=
tvm
.
context
(
device
,
0
)
...
...
@@ -39,18 +43,27 @@ def verify_upsampling(batch, in_channel, in_height, in_width, scale, layout='NCH
f
=
tvm
.
build
(
s
,
[
A
,
B
],
device
)
f
(
a
,
b
)
np
.
testing
.
assert_allclose
(
b
.
asnumpy
(),
b_np
,
rtol
=
1e-5
)
np
.
testing
.
assert_allclose
(
b
.
asnumpy
(),
b_np
,
rtol
=
1e-5
,
atol
=
1e-5
)
for
device
in
[
'llvm'
,
'cuda'
,
'vulkan'
,
'nvptx'
]:
check_device
(
device
)
def
test_upsampling
():
# NCHW
# N
EAREST_NEIGHBOR - N
CHW
verify_upsampling
(
8
,
16
,
32
,
32
,
2
)
verify_upsampling
(
12
,
32
,
64
,
64
,
3
)
# NHWC
verify_upsampling
(
8
,
16
,
32
,
32
,
2
,
"NHWC"
)
verify_upsampling
(
12
,
32
,
64
,
64
,
3
,
"NHWC"
)
# NEAREST_NEIGHBOR - NHWC
verify_upsampling
(
8
,
16
,
32
,
32
,
2
,
layout
=
"NHWC"
)
verify_upsampling
(
12
,
32
,
64
,
64
,
3
,
layout
=
"NHWC"
)
# BILINEAR - NCHW
verify_upsampling
(
2
,
2
,
32
,
32
,
2
,
method
=
"BILINEAR"
)
verify_upsampling
(
2
,
2
,
32
,
32
,
3
,
method
=
"BILINEAR"
)
# BILINEAR - NHWC
verify_upsampling
(
2
,
2
,
32
,
32
,
2
,
layout
=
"NHWC"
,
method
=
"BILINEAR"
)
verify_upsampling
(
2
,
2
,
32
,
32
,
3
,
layout
=
"NHWC"
,
method
=
"BILINEAR"
)
if
__name__
==
"__main__"
:
test_upsampling
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment