Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
76fb95fe
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看板
未验证
提交
76fb95fe
编写于
9月 22, 2020
作者:
W
wangchaochaohu
提交者:
GitHub
9月 23, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid data transform for linspace OP (#27444)
上级
a0452475
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
5 deletion
+15
-5
paddle/fluid/operators/linspace_op.cc
paddle/fluid/operators/linspace_op.cc
+9
-2
python/paddle/fluid/layers/tensor.py
python/paddle/fluid/layers/tensor.py
+6
-3
未找到文件。
paddle/fluid/operators/linspace_op.cc
浏览文件 @
76fb95fe
...
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
...
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#include "paddle/fluid/operators/linspace_op.h"
#include "paddle/fluid/operators/linspace_op.h"
#include <string>
namespace
paddle
{
namespace
paddle
{
namespace
operators
{
namespace
operators
{
...
@@ -21,7 +22,7 @@ class LinspaceOp : public framework::OperatorWithKernel {
...
@@ -21,7 +22,7 @@ class LinspaceOp : public framework::OperatorWithKernel {
public:
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Start"
),
"Input"
,
"Start"
,
"linspace"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Start"
),
"Input"
,
"Start"
,
"linspace"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Stop"
),
"Input"
,
"Stop"
,
"linspace"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Stop"
),
"Input"
,
"Stop"
,
"linspace"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Num"
),
"Input"
,
"Num"
,
"linspace"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Num"
),
"Input"
,
"Num"
,
"linspace"
);
...
@@ -50,11 +51,17 @@ class LinspaceOp : public framework::OperatorWithKernel {
...
@@ -50,11 +51,17 @@ class LinspaceOp : public framework::OperatorWithKernel {
protected:
protected:
framework
::
OpKernelType
GetExpectedKernelType
(
framework
::
OpKernelType
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
return
framework
::
OpKernelType
(
return
framework
::
OpKernelType
(
framework
::
proto
::
VarType
::
Type
(
ctx
.
Attr
<
int
>
(
"dtype"
)),
framework
::
proto
::
VarType
::
Type
(
ctx
.
Attr
<
int
>
(
"dtype"
)),
ctx
.
GetPlace
());
ctx
.
GetPlace
());
}
}
framework
::
OpKernelType
GetKernelTypeForVar
(
const
std
::
string
&
var_name
,
const
framework
::
Tensor
&
tensor
,
const
framework
::
OpKernelType
&
expected_kernel_type
)
const
override
{
return
expected_kernel_type
;
}
};
};
class
LinspaceOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
class
LinspaceOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
...
...
python/paddle/fluid/layers/tensor.py
浏览文件 @
76fb95fe
...
@@ -1453,11 +1453,14 @@ def linspace(start, stop, num, dtype=None, name=None):
...
@@ -1453,11 +1453,14 @@ def linspace(start, stop, num, dtype=None, name=None):
if
not
isinstance
(
dtype
,
core
.
VarDesc
.
VarType
):
if
not
isinstance
(
dtype
,
core
.
VarDesc
.
VarType
):
dtype
=
convert_np_dtype_to_dtype_
(
dtype
)
dtype
=
convert_np_dtype_to_dtype_
(
dtype
)
if
not
isinstance
(
start
,
Variable
):
if
not
isinstance
(
start
,
Variable
):
tensor_start
=
fill_constant
([
1
],
dtype
,
start
)
with
device_guard
(
"cpu"
):
tensor_start
=
fill_constant
([
1
],
dtype
,
start
)
if
not
isinstance
(
stop
,
Variable
):
if
not
isinstance
(
stop
,
Variable
):
tensor_stop
=
fill_constant
([
1
],
dtype
,
stop
)
with
device_guard
(
"cpu"
):
tensor_stop
=
fill_constant
([
1
],
dtype
,
stop
)
if
not
isinstance
(
num
,
Variable
):
if
not
isinstance
(
num
,
Variable
):
tensor_num
=
fill_constant
([
1
],
'int32'
,
num
)
with
device_guard
(
"cpu"
):
tensor_num
=
fill_constant
([
1
],
'int32'
,
num
)
if
in_dygraph_mode
():
if
in_dygraph_mode
():
return
core
.
ops
.
linspace
(
tensor_start
,
tensor_stop
,
tensor_num
,
'dtype'
,
return
core
.
ops
.
linspace
(
tensor_start
,
tensor_stop
,
tensor_num
,
'dtype'
,
dtype
)
dtype
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录