Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
37aa4b98
P
Paddle
项目概览
wzpei9
/
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,发现更多精彩内容 >>
提交
37aa4b98
编写于
8月 11, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine unittest
上级
c2631ebf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
43 deletion
+4
-43
paddle/operators/math/math_function.cc
paddle/operators/math/math_function.cc
+2
-22
paddle/operators/math/math_function.cu
paddle/operators/math/math_function.cu
+2
-21
未找到文件。
paddle/operators/math/math_function.cc
浏览文件 @
37aa4b98
...
...
@@ -60,16 +60,6 @@ void matmul<platform::CPUPlace, float>(const framework::Tensor& in1, bool in1_T,
in1_dim
.
size
()
==
2
&&
in2_dim
.
size
()
==
2
&&
out_dim
.
size
()
==
2
,
"The input and output of matmul be matrix"
);
if
(
!
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
if
(
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
0
]);
}
else
if
(
!
in1_T
&&
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
1
]);
}
PADDLE_ENFORCE
(
platform
::
is_cpu_place
(
in1
.
place
())
&&
platform
::
is_cpu_place
(
in2
.
place
())
&&
platform
::
is_cpu_place
(
out
->
place
()),
...
...
@@ -77,7 +67,7 @@ void matmul<platform::CPUPlace, float>(const framework::Tensor& in1, bool in1_T,
int
M
=
out_dim
[
0
];
int
N
=
out_dim
[
1
];
int
K
=
in1_dim
[
1
];
int
K
=
(
in1_T
==
false
)
?
in1_dim
[
1
]
:
in1_dim
[
0
];
CBLAS_TRANSPOSE
in1_Trans
=
(
in1_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
CBLAS_TRANSPOSE
in2_Trans
=
(
in2_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
...
...
@@ -100,16 +90,6 @@ void matmul<platform::CPUPlace, double>(const framework::Tensor& in1,
PADDLE_ENFORCE
(
in1_dim
.
size
()
==
2
&&
in2_dim
.
size
()
==
2
&&
out_dim
.
size
()
==
2
,
"The input and output of matmul be matrix"
);
if
(
!
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
if
(
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
0
]);
}
else
if
(
!
in1_T
&&
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
1
]);
}
PADDLE_ENFORCE
(
platform
::
is_cpu_place
(
in1
.
place
())
&&
platform
::
is_cpu_place
(
in2
.
place
())
&&
platform
::
is_cpu_place
(
out
->
place
()),
...
...
@@ -117,7 +97,7 @@ void matmul<platform::CPUPlace, double>(const framework::Tensor& in1,
int
M
=
out_dim
[
0
];
int
N
=
out_dim
[
1
];
int
K
=
in1_dim
[
1
];
int
K
=
(
in1_T
==
false
)
?
in1_dim
[
1
]
:
in1_dim
[
0
];
CBLAS_TRANSPOSE
in1_Trans
=
(
in1_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
CBLAS_TRANSPOSE
in2_Trans
=
(
in2_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
...
...
paddle/operators/math/math_function.cu
浏览文件 @
37aa4b98
...
...
@@ -71,15 +71,6 @@ void matmul<platform::GPUPlace, float>(const framework::Tensor& in1, bool in1_T,
PADDLE_ENFORCE
(
in1_dim
.
size
()
==
2
&&
in2_dim
.
size
()
==
2
&&
out_dim
.
size
()
==
2
,
"The input and output of matmul be matrix"
);
if
(
!
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
if
(
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
0
]);
}
else
if
(
!
in1_T
&&
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
1
]);
}
PADDLE_ENFORCE
(
platform
::
is_gpu_place
(
in1
.
place
())
&&
platform
::
is_gpu_place
(
in2
.
place
())
&&
...
...
@@ -88,7 +79,7 @@ void matmul<platform::GPUPlace, float>(const framework::Tensor& in1, bool in1_T,
int
M
=
out_dim
[
0
];
int
N
=
out_dim
[
1
];
int
K
=
in1_dim
[
1
];
int
K
=
(
in1_T
==
false
)
?
in1_dim
[
1
]
:
in1_dim
[
0
];
CBLAS_TRANSPOSE
in1_Trans
=
(
in1_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
CBLAS_TRANSPOSE
in2_Trans
=
(
in2_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
...
...
@@ -111,16 +102,6 @@ void matmul<platform::GPUPlace, double>(const framework::Tensor& in1,
PADDLE_ENFORCE
(
in1_dim
.
size
()
==
2
&&
in2_dim
.
size
()
==
2
&&
out_dim
.
size
()
==
2
,
"The input and output of matmul be matrix"
);
if
(
!
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
if
(
in1_T
&&
!
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
0
]);
}
else
if
(
!
in1_T
&&
in2_T
)
{
PADDLE_ENFORCE
(
in1_dim
[
1
]
==
in2_dim
[
0
]);
}
else
{
PADDLE_ENFORCE
(
in1_dim
[
0
]
==
in2_dim
[
1
]);
}
PADDLE_ENFORCE
(
platform
::
is_gpu_place
(
in1
.
place
())
&&
platform
::
is_gpu_place
(
in2
.
place
())
&&
platform
::
is_gpu_place
(
out
->
place
()),
...
...
@@ -128,7 +109,7 @@ void matmul<platform::GPUPlace, double>(const framework::Tensor& in1,
int
M
=
out_dim
[
0
];
int
N
=
out_dim
[
1
];
int
K
=
in1_dim
[
1
];
int
K
=
(
in1_T
==
false
)
?
in1_dim
[
1
]
:
in1_dim
[
0
];
CBLAS_TRANSPOSE
in1_Trans
=
(
in1_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
CBLAS_TRANSPOSE
in2_Trans
=
(
in2_T
==
false
)
?
CblasNoTrans
:
CblasTrans
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录