Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
b586cc2a
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
b586cc2a
编写于
8月 19, 2018
作者:
Y
Yibing Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typos in unsqueeze & unsequeeze wrapper
上级
1443d762
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
9 deletion
+11
-9
python/paddle/fluid/layers/nn.py
python/paddle/fluid/layers/nn.py
+8
-5
python/paddle/fluid/tests/unittests/test_layers.py
python/paddle/fluid/tests/unittests/test_layers.py
+3
-4
未找到文件。
python/paddle/fluid/layers/nn.py
浏览文件 @
b586cc2a
...
@@ -4485,6 +4485,7 @@ def reshape(x, shape, actual_shape=None, act=None, inplace=True, name=None):
...
@@ -4485,6 +4485,7 @@ def reshape(x, shape, actual_shape=None, act=None, inplace=True, name=None):
return
helper
.
append_activation
(
out
)
return
helper
.
append_activation
(
out
)
def
squeeze
(
x
,
axes
,
inplace
=
False
,
name
=
None
):
def
squeeze
(
x
,
axes
,
inplace
=
False
,
name
=
None
):
"""
"""
Remove single-dimensional entries from the shape of a tensor. Takes a
Remove single-dimensional entries from the shape of a tensor. Takes a
...
@@ -4511,7 +4512,7 @@ def squeeze(x, axes, inplace=False, name=None):
...
@@ -4511,7 +4512,7 @@ def squeeze(x, axes, inplace=False, name=None):
Args:
Args:
x (Variable): The input variable to be squeezed.
x (Variable): The input variable to be squeezed.
axes (list): List of integers, indicating the dimensions to be squeezed.
axes (list): List of integers, indicating the dimensions to be squeezed.
name (str
): Name for this layers
.
name (str
|None): Name for this layer
.
Returns:
Returns:
Variable: Output squeezed variable.
Variable: Output squeezed variable.
...
@@ -4530,8 +4531,9 @@ def squeeze(x, axes, inplace=False, name=None):
...
@@ -4530,8 +4531,9 @@ def squeeze(x, axes, inplace=False, name=None):
attrs
=
{
"axes"
:
axes
},
attrs
=
{
"axes"
:
axes
},
outputs
=
{
"Out"
:
out
})
outputs
=
{
"Out"
:
out
})
return
out
return
out
def
unsqueeze
(
x
,
axes
,
inplace
=
False
,
name
=
None
):
def
unsqueeze
(
x
,
axes
,
inplace
=
False
,
name
=
None
):
"""
"""
Insert single-dimensional entries to the shape of a tensor. Takes one
Insert single-dimensional entries to the shape of a tensor. Takes one
...
@@ -4545,7 +4547,7 @@ def unsqueeze(x, axes, inplace=False, name=None):
...
@@ -4545,7 +4547,7 @@ def unsqueeze(x, axes, inplace=False, name=None):
Args:
Args:
x (Variable): The input variable to be unsqueezed.
x (Variable): The input variable to be unsqueezed.
axes (list): List of integers, indicating the dimensions to be inserted.
axes (list): List of integers, indicating the dimensions to be inserted.
name (str
): Name for this layers
.
name (str
|None): Name for this layer
.
Returns:
Returns:
Variable: Output unsqueezed variable.
Variable: Output unsqueezed variable.
...
@@ -4564,7 +4566,8 @@ def unsqueeze(x, axes, inplace=False, name=None):
...
@@ -4564,7 +4566,8 @@ def unsqueeze(x, axes, inplace=False, name=None):
attrs
=
{
"axes"
:
axes
},
attrs
=
{
"axes"
:
axes
},
outputs
=
{
"Out"
:
out
})
outputs
=
{
"Out"
:
out
})
return
out
return
out
def
lod_reset
(
x
,
y
=
None
,
target_lod
=
None
):
def
lod_reset
(
x
,
y
=
None
,
target_lod
=
None
):
"""
"""
...
...
python/paddle/fluid/tests/unittests/test_layers.py
浏览文件 @
b586cc2a
...
@@ -243,16 +243,16 @@ class TestBook(unittest.TestCase):
...
@@ -243,16 +243,16 @@ class TestBook(unittest.TestCase):
def
test_sequence_unsqueeze
(
self
):
def
test_sequence_unsqueeze
(
self
):
program
=
Program
()
program
=
Program
()
with
program_guard
(
program
):
with
program_guard
(
program
):
x
=
layers
.
data
(
name
=
'x'
,
shape
=
[
8
,
2
],
dtype
=
'float32'
)
x
=
layers
.
data
(
name
=
'x'
,
shape
=
[
8
,
2
],
dtype
=
'float32'
)
out
=
layers
.
unsqueeze
(
x
=
x
,
axes
=
[
1
])
out
=
layers
.
unsqueeze
(
x
=
x
,
axes
=
[
1
])
self
.
assertIsNotNone
(
out
)
self
.
assertIsNotNone
(
out
)
print
(
str
(
program
))
print
(
str
(
program
))
def
test_squeeze
(
self
):
def
test_squeeze
(
self
):
program
=
Program
()
program
=
Program
()
with
program_guard
(
program
):
with
program_guard
(
program
):
x
=
layers
.
data
(
name
=
'x'
,
shape
=
[
1
,
1
,
4
],
dtype
=
'float32'
)
x
=
layers
.
data
(
name
=
'x'
,
shape
=
[
1
,
1
,
4
],
dtype
=
'float32'
)
out
=
layers
.
squeeze
(
x
=
x
,
axes
=
[
0
])
out
=
layers
.
squeeze
(
x
=
x
,
axes
=
[
2
])
self
.
assertIsNotNone
(
out
)
self
.
assertIsNotNone
(
out
)
print
(
str
(
program
))
print
(
str
(
program
))
...
@@ -277,7 +277,6 @@ class TestBook(unittest.TestCase):
...
@@ -277,7 +277,6 @@ class TestBook(unittest.TestCase):
out
=
layers
.
sequence_reshape
(
input
=
x
,
new_dim
=
16
)
out
=
layers
.
sequence_reshape
(
input
=
x
,
new_dim
=
16
)
self
.
assertIsNotNone
(
out
)
self
.
assertIsNotNone
(
out
)
print
(
str
(
program
))
print
(
str
(
program
))
def
test_im2sequence
(
self
):
def
test_im2sequence
(
self
):
program
=
Program
()
program
=
Program
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录