Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
74578a96
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
74578a96
编写于
9月 24, 2017
作者:
Q
Qiao Longfei
提交者:
GitHub
9月 24, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4356 from jacquesqiao/fix-namespace
add namespace and reduce warning
上级
14a7399d
9301d3b5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
paddle/operators/crop_op.h
paddle/operators/crop_op.h
+3
-3
paddle/operators/multiplex_op.h
paddle/operators/multiplex_op.h
+3
-3
未找到文件。
paddle/operators/crop_op.h
浏览文件 @
74578a96
...
@@ -38,10 +38,10 @@ class CropKernel : public framework::OpKernel {
...
@@ -38,10 +38,10 @@ class CropKernel : public framework::OpKernel {
auto
out_stride
=
framework
::
stride
(
out
->
dims
());
auto
out_stride
=
framework
::
stride
(
out
->
dims
());
auto
offsets
=
context
.
Attr
<
std
::
vector
<
int
>>
(
"offsets"
);
auto
offsets
=
context
.
Attr
<
std
::
vector
<
int
>>
(
"offsets"
);
PADDLE_ENFORCE_EQ
(
PADDLE_ENFORCE_EQ
(
x
->
dims
().
size
(),
offsets
.
size
(
),
x
->
dims
().
size
(),
static_cast
<
int64_t
>
(
offsets
.
size
()
),
"Offsets size should be equal to dimension size of input tensor."
);
"Offsets size should be equal to dimension size of input tensor."
);
int64_t
offset
=
0
;
int64_t
offset
=
0
;
for
(
in
t
i
=
0
;
i
<
offsets
.
size
();
++
i
)
{
for
(
size_
t
i
=
0
;
i
<
offsets
.
size
();
++
i
)
{
offset
+=
(
x_stride
[
i
]
*
offsets
[
i
]);
offset
+=
(
x_stride
[
i
]
*
offsets
[
i
]);
}
}
StridedMemcpy
<
T
>
(
context
.
device_context
(),
x_data
+
offset
,
x_stride
,
StridedMemcpy
<
T
>
(
context
.
device_context
(),
x_data
+
offset
,
x_stride
,
...
@@ -57,7 +57,7 @@ void CropGradFunction(const framework::ExecutionContext& context) {
...
@@ -57,7 +57,7 @@ void CropGradFunction(const framework::ExecutionContext& context) {
d_x
->
mutable_data
<
T
>
(
context
.
GetPlace
());
d_x
->
mutable_data
<
T
>
(
context
.
GetPlace
());
auto
offsets
=
context
.
Attr
<
std
::
vector
<
int
>>
(
"offsets"
);
auto
offsets
=
context
.
Attr
<
std
::
vector
<
int
>>
(
"offsets"
);
Eigen
::
array
<
std
::
pair
<
int
,
int
>
,
D
>
paddings
;
Eigen
::
array
<
std
::
pair
<
int
,
int
>
,
D
>
paddings
;
for
(
in
t
i
=
0
;
i
<
D
;
++
i
)
{
for
(
size_
t
i
=
0
;
i
<
D
;
++
i
)
{
paddings
[
i
].
first
=
offsets
[
i
];
paddings
[
i
].
first
=
offsets
[
i
];
paddings
[
i
].
second
=
d_x
->
dims
()[
i
]
-
d_out
->
dims
()[
i
]
-
offsets
[
i
];
paddings
[
i
].
second
=
d_x
->
dims
()[
i
]
-
d_out
->
dims
()[
i
]
-
offsets
[
i
];
}
}
...
...
paddle/operators/multiplex_op.h
浏览文件 @
74578a96
...
@@ -37,7 +37,7 @@ class MultiplexCPUKernel : public framework::OpKernel {
...
@@ -37,7 +37,7 @@ class MultiplexCPUKernel : public framework::OpKernel {
Place
place
=
boost
::
get
<
Place
>
(
ctx
.
GetPlace
());
Place
place
=
boost
::
get
<
Place
>
(
ctx
.
GetPlace
());
for
(
auto
i
=
0
;
i
<
rows
;
i
++
)
{
for
(
auto
i
=
0
;
i
<
rows
;
i
++
)
{
int
k
=
(
int
)
index
[
i
]
+
1
;
int
k
=
(
int
)
index
[
i
]
+
1
;
PADDLE_ENFORCE_LT
(
k
,
ins
.
size
(),
PADDLE_ENFORCE_LT
(
static_cast
<
size_t
>
(
k
)
,
ins
.
size
(),
"index exceeds the number of candidate tensors."
);
"index exceeds the number of candidate tensors."
);
memory
::
Copy
(
place
,
out
->
data
<
T
>
()
+
i
*
cols
,
place
,
memory
::
Copy
(
place
,
out
->
data
<
T
>
()
+
i
*
cols
,
place
,
ins
[
k
]
->
data
<
T
>
()
+
i
*
cols
,
cols
*
sizeof
(
T
));
ins
[
k
]
->
data
<
T
>
()
+
i
*
cols
,
cols
*
sizeof
(
T
));
...
@@ -74,5 +74,5 @@ class MultiplexGradCPUKernel : public framework::OpKernel {
...
@@ -74,5 +74,5 @@ class MultiplexGradCPUKernel : public framework::OpKernel {
}
}
}
}
};
};
}
}
// namespace operators
}
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录