Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
7f868bd1
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看板
未验证
提交
7f868bd1
编写于
2月 18, 2019
作者:
T
Tao Luo
提交者:
GitHub
2月 18, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15737 from tensor-tang/fix/name
cherry pick: fix jitcode name
上级
cfa546cd
396ba930
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
18 addition
and
18 deletion
+18
-18
paddle/fluid/operators/jit/gen/act.h
paddle/fluid/operators/jit/gen/act.h
+2
-3
paddle/fluid/operators/jit/gen/blas.h
paddle/fluid/operators/jit/gen/blas.h
+2
-2
paddle/fluid/operators/jit/gen/gru.h
paddle/fluid/operators/jit/gen/gru.h
+2
-2
paddle/fluid/operators/jit/gen/hopv.h
paddle/fluid/operators/jit/gen/hopv.h
+2
-2
paddle/fluid/operators/jit/gen/jitcode.h
paddle/fluid/operators/jit/gen/jitcode.h
+2
-2
paddle/fluid/operators/jit/gen/lstm.h
paddle/fluid/operators/jit/gen/lstm.h
+2
-2
paddle/fluid/operators/jit/gen/matmul.h
paddle/fluid/operators/jit/gen/matmul.h
+2
-2
paddle/fluid/operators/jit/gen/seqpool.h
paddle/fluid/operators/jit/gen/seqpool.h
+2
-2
paddle/fluid/operators/jit/gen_base.h
paddle/fluid/operators/jit/gen_base.h
+2
-1
未找到文件。
paddle/fluid/operators/jit/gen/act.h
浏览文件 @
7f868bd1
...
@@ -63,7 +63,6 @@ class VActFunc : public JitCode {
...
@@ -63,7 +63,6 @@ class VActFunc : public JitCode {
public:
public:
explicit
VActFunc
(
size_t
code_size
,
void
*
code_ptr
)
explicit
VActFunc
(
size_t
code_size
,
void
*
code_ptr
)
:
JitCode
(
code_size
,
code_ptr
)
{}
:
JitCode
(
code_size
,
code_ptr
)
{}
virtual
const
char
*
name
()
const
=
0
;
virtual
void
genCode
()
=
0
;
virtual
void
genCode
()
=
0
;
protected:
protected:
...
@@ -269,7 +268,7 @@ class VActJitCode : public VActFunc {
...
@@ -269,7 +268,7 @@ class VActJitCode : public VActFunc {
this
->
genCode
();
this
->
genCode
();
}
}
const
char
*
name
()
const
override
{
std
::
string
name
()
const
override
{
std
::
string
base
=
"VActJitCode"
;
std
::
string
base
=
"VActJitCode"
;
switch
(
type_
)
{
switch
(
type_
)
{
case
operand_type
::
RELU
:
case
operand_type
::
RELU
:
...
@@ -293,7 +292,7 @@ class VActJitCode : public VActFunc {
...
@@ -293,7 +292,7 @@ class VActJitCode : public VActFunc {
default:
default:
break
;
break
;
}
}
return
base
.
c_str
()
;
return
base
;
}
}
void
genCode
()
override
;
void
genCode
()
override
;
...
...
paddle/fluid/operators/jit/gen/blas.h
浏览文件 @
7f868bd1
...
@@ -41,7 +41,7 @@ class VXXJitCode : public JitCode {
...
@@ -41,7 +41,7 @@ class VXXJitCode : public JitCode {
this
->
genCode
();
this
->
genCode
();
}
}
virtual
const
char
*
name
()
const
{
std
::
string
name
()
const
override
{
std
::
string
base
=
"VXXJitCode"
;
std
::
string
base
=
"VXXJitCode"
;
if
(
scalar_index_
==
1
)
{
if
(
scalar_index_
==
1
)
{
base
+=
"_Scalar"
;
base
+=
"_Scalar"
;
...
@@ -62,7 +62,7 @@ class VXXJitCode : public JitCode {
...
@@ -62,7 +62,7 @@ class VXXJitCode : public JitCode {
}
}
base
+=
(
with_relu_
?
"_Relu"
:
""
);
base
+=
(
with_relu_
?
"_Relu"
:
""
);
base
+=
"_D"
+
std
::
to_string
(
num_
);
base
+=
"_D"
+
std
::
to_string
(
num_
);
return
base
.
c_str
()
;
return
base
;
}
}
void
genCode
()
override
;
void
genCode
()
override
;
...
...
paddle/fluid/operators/jit/gen/gru.h
浏览文件 @
7f868bd1
...
@@ -49,7 +49,7 @@ class GRUJitCode : public VActFunc {
...
@@ -49,7 +49,7 @@ class GRUJitCode : public VActFunc {
this
->
genCode
();
this
->
genCode
();
}
}
const
char
*
name
()
const
override
{
std
::
string
name
()
const
override
{
std
::
string
base
=
"GRUJitCode"
;
std
::
string
base
=
"GRUJitCode"
;
if
(
id_
==
0
)
{
if
(
id_
==
0
)
{
base
+=
"_H1"
;
base
+=
"_H1"
;
...
@@ -81,7 +81,7 @@ class GRUJitCode : public VActFunc {
...
@@ -81,7 +81,7 @@ class GRUJitCode : public VActFunc {
};
};
AddTypeStr
(
act_gate_
);
AddTypeStr
(
act_gate_
);
AddTypeStr
(
act_cand_
);
AddTypeStr
(
act_cand_
);
return
base
.
c_str
()
;
return
base
;
}
}
void
genCode
()
override
;
void
genCode
()
override
;
...
...
paddle/fluid/operators/jit/gen/hopv.h
浏览文件 @
7f868bd1
...
@@ -35,14 +35,14 @@ class HOPVJitCode : public JitCode {
...
@@ -35,14 +35,14 @@ class HOPVJitCode : public JitCode {
this
->
genCode
();
this
->
genCode
();
}
}
virtual
const
char
*
name
()
const
{
std
::
string
name
()
const
override
{
std
::
string
base
=
"VXXJitCode"
;
std
::
string
base
=
"VXXJitCode"
;
if
(
type_
==
operand_type
::
MAX
)
{
if
(
type_
==
operand_type
::
MAX
)
{
base
+=
"_MAX"
;
base
+=
"_MAX"
;
}
else
{
}
else
{
base
+=
"_SUM"
;
base
+=
"_SUM"
;
}
}
return
base
.
c_str
()
;
return
base
;
}
}
void
genCode
()
override
;
void
genCode
()
override
;
...
...
paddle/fluid/operators/jit/gen/jitcode.h
浏览文件 @
7f868bd1
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
#pragma once
#pragma once
#include <string>
#include <type_traits>
#include <type_traits>
#include "paddle/fluid/operators/jit/gen_base.h"
#include "paddle/fluid/operators/jit/gen_base.h"
#include "paddle/fluid/platform/cpu_info.h"
#include "paddle/fluid/platform/cpu_info.h"
...
@@ -59,7 +60,7 @@ typedef enum {
...
@@ -59,7 +60,7 @@ typedef enum {
}
operand_type
;
}
operand_type
;
#define DECLARE_JIT_CODE(codename) \
#define DECLARE_JIT_CODE(codename) \
const char*
name() const override { return #codename; }
std::string
name() const override { return #codename; }
class
JitCode
:
public
GenBase
,
public
Xbyak
::
CodeGenerator
{
class
JitCode
:
public
GenBase
,
public
Xbyak
::
CodeGenerator
{
public:
public:
...
@@ -68,7 +69,6 @@ class JitCode : public GenBase, public Xbyak::CodeGenerator {
...
@@ -68,7 +69,6 @@ class JitCode : public GenBase, public Xbyak::CodeGenerator {
(
code_size
%
4096
!=
0
?
(
code_size
/
4096
+
1
)
*
4096
:
code_size
),
(
code_size
%
4096
!=
0
?
(
code_size
/
4096
+
1
)
*
4096
:
code_size
),
code_ptr
)
{}
code_ptr
)
{}
virtual
const
char
*
name
()
const
=
0
;
virtual
void
genCode
()
=
0
;
virtual
void
genCode
()
=
0
;
size_t
getSize
()
const
override
{
return
CodeGenerator
::
getSize
();
}
size_t
getSize
()
const
override
{
return
CodeGenerator
::
getSize
();
}
...
...
paddle/fluid/operators/jit/gen/lstm.h
浏览文件 @
7f868bd1
...
@@ -53,7 +53,7 @@ class LSTMJitCode : public VActFunc {
...
@@ -53,7 +53,7 @@ class LSTMJitCode : public VActFunc {
this
->
genCode
();
this
->
genCode
();
}
}
const
char
*
name
()
const
override
{
std
::
string
name
()
const
override
{
std
::
string
base
=
"LSTMJitCode"
;
std
::
string
base
=
"LSTMJitCode"
;
if
(
use_peephole_
)
{
if
(
use_peephole_
)
{
base
+=
"_Peephole"
;
base
+=
"_Peephole"
;
...
@@ -85,7 +85,7 @@ class LSTMJitCode : public VActFunc {
...
@@ -85,7 +85,7 @@ class LSTMJitCode : public VActFunc {
AddTypeStr
(
act_gate_
);
AddTypeStr
(
act_gate_
);
AddTypeStr
(
act_cand_
);
AddTypeStr
(
act_cand_
);
AddTypeStr
(
act_cell_
);
AddTypeStr
(
act_cell_
);
return
base
.
c_str
()
;
return
base
;
}
}
void
genCode
()
override
;
void
genCode
()
override
;
...
...
paddle/fluid/operators/jit/gen/matmul.h
浏览文件 @
7f868bd1
...
@@ -36,11 +36,11 @@ class MatMulJitCode : public JitCode {
...
@@ -36,11 +36,11 @@ class MatMulJitCode : public JitCode {
this
->
genCode
();
this
->
genCode
();
}
}
virtual
const
char
*
name
()
const
{
std
::
string
name
()
const
override
{
std
::
string
base
=
"MatMulJitCode"
;
std
::
string
base
=
"MatMulJitCode"
;
base
=
base
+
"_M"
+
std
::
to_string
(
m_
)
+
"_N"
+
std
::
to_string
(
n_
)
+
"_K"
+
base
=
base
+
"_M"
+
std
::
to_string
(
m_
)
+
"_N"
+
std
::
to_string
(
n_
)
+
"_K"
+
std
::
to_string
(
k_
);
std
::
to_string
(
k_
);
return
base
.
c_str
()
;
return
base
;
}
}
void
genCode
()
override
;
void
genCode
()
override
;
...
...
paddle/fluid/operators/jit/gen/seqpool.h
浏览文件 @
7f868bd1
...
@@ -38,7 +38,7 @@ class SeqPoolJitCode : public JitCode {
...
@@ -38,7 +38,7 @@ class SeqPoolJitCode : public JitCode {
this
->
genCode
();
this
->
genCode
();
}
}
virtual
const
char
*
name
()
const
{
std
::
string
name
()
const
override
{
std
::
string
base
=
"SeqPoolJitCode"
;
std
::
string
base
=
"SeqPoolJitCode"
;
if
(
type_
==
SeqPoolType
::
kSum
)
{
if
(
type_
==
SeqPoolType
::
kSum
)
{
base
+=
"_Sum"
;
base
+=
"_Sum"
;
...
@@ -48,7 +48,7 @@ class SeqPoolJitCode : public JitCode {
...
@@ -48,7 +48,7 @@ class SeqPoolJitCode : public JitCode {
base
+=
"_Sqrt"
;
base
+=
"_Sqrt"
;
}
}
base
+=
(
"_W"
+
std
::
to_string
(
w_
));
base
+=
(
"_W"
+
std
::
to_string
(
w_
));
return
base
.
c_str
()
;
return
base
;
}
}
void
genCode
()
override
;
void
genCode
()
override
;
...
...
paddle/fluid/operators/jit/gen_base.h
浏览文件 @
7f868bd1
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
#include <gflags/gflags.h>
#include <gflags/gflags.h>
#include <memory> // for unique_ptr
#include <memory> // for unique_ptr
#include <string>
#include <vector>
#include <vector>
#include "paddle/fluid/operators/jit/kernel_base.h"
#include "paddle/fluid/operators/jit/kernel_base.h"
...
@@ -28,7 +29,7 @@ namespace jit {
...
@@ -28,7 +29,7 @@ namespace jit {
class
GenBase
:
public
Kernel
{
class
GenBase
:
public
Kernel
{
public:
public:
virtual
~
GenBase
()
=
default
;
virtual
~
GenBase
()
=
default
;
virtual
const
char
*
name
()
const
=
0
;
virtual
std
::
string
name
()
const
=
0
;
virtual
size_t
getSize
()
const
=
0
;
virtual
size_t
getSize
()
const
=
0
;
virtual
const
unsigned
char
*
getCodeInternal
()
=
0
;
virtual
const
unsigned
char
*
getCodeInternal
()
=
0
;
template
<
typename
Func
>
template
<
typename
Func
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录