Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
72b734e4
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
72b734e4
编写于
4月 29, 2019
作者:
S
superjomn
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make lite without cuda works
上级
70540d1b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
32 addition
and
14 deletion
+32
-14
paddle/fluid/lite/api/CMakeLists.txt
paddle/fluid/lite/api/CMakeLists.txt
+1
-1
paddle/fluid/lite/core/mir/io_complement_pass.cc
paddle/fluid/lite/core/mir/io_complement_pass.cc
+5
-2
paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc
paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc
+4
-0
paddle/fluid/lite/core/type_system.h
paddle/fluid/lite/core/type_system.h
+21
-10
paddle/fluid/lite/operators/CMakeLists.txt
paddle/fluid/lite/operators/CMakeLists.txt
+1
-1
未找到文件。
paddle/fluid/lite/api/CMakeLists.txt
浏览文件 @
72b734e4
if
(
LITE_WITH_CUDA
)
if
(
LITE_WITH_CUDA
)
cc_library
(
cxx_api_lite_cuda SRCS cxx_api.cc DEPS scope_lite
op_executor_lite
host_kernels ops_lite optimizer_lite target_wrapper_host target_wrapper_cuda kernels_cuda
)
cc_library
(
cxx_api_lite_cuda SRCS cxx_api.cc DEPS scope_lite host_kernels ops_lite optimizer_lite target_wrapper_host target_wrapper_cuda kernels_cuda
)
nv_test
(
test_cxx_api_lite_cuda SRCS cxx_api_test.cc DEPS cxx_api_lite_cuda model_parser_lite
)
nv_test
(
test_cxx_api_lite_cuda SRCS cxx_api_test.cc DEPS cxx_api_lite_cuda model_parser_lite
)
else
()
else
()
cc_library
(
cxx_api_lite SRCS cxx_api.cc DEPS scope_lite op_executor_lite host_kernels ops_lite optimizer_lite target_wrapper_host
)
cc_library
(
cxx_api_lite SRCS cxx_api.cc DEPS scope_lite op_executor_lite host_kernels ops_lite optimizer_lite target_wrapper_host
)
...
...
paddle/fluid/lite/core/mir/io_complement_pass.cc
浏览文件 @
72b734e4
...
@@ -13,6 +13,9 @@
...
@@ -13,6 +13,9 @@
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/lite/core/mir/io_complement_pass.h"
#include "paddle/fluid/lite/core/mir/io_complement_pass.h"
#include <list>
#include <string>
#include <vector>
#include "paddle/fluid/lite/core/mir/graph_visualize_pass.h"
#include "paddle/fluid/lite/core/mir/graph_visualize_pass.h"
#include "paddle/fluid/lite/core/mir/pass_registry.h"
#include "paddle/fluid/lite/core/mir/pass_registry.h"
...
@@ -55,8 +58,8 @@ void IoComplementPass::ComplementInputs(SSAGraph* graph, Node* inst_node,
...
@@ -55,8 +58,8 @@ void IoComplementPass::ComplementInputs(SSAGraph* graph, Node* inst_node,
CHECK
(
inst
.
op_info
()
->
GetInputArgname
(
in_arg_name
,
&
tmp
));
CHECK
(
inst
.
op_info
()
->
GetInputArgname
(
in_arg_name
,
&
tmp
));
auto
decl_arg_type
=
inst
.
picked_kernel
().
GetInputDeclType
(
tmp
);
auto
decl_arg_type
=
inst
.
picked_kernel
().
GetInputDeclType
(
tmp
);
CHECK
(
in
->
AsArgument
().
type
);
CHECK
(
in
->
AsArgument
().
type
);
if
(
!
T
ype
CompatibleTo
(
*
in
->
AsArgument
().
type
,
*
decl_arg_type
))
{
if
(
!
T
arget
CompatibleTo
(
*
in
->
AsArgument
().
type
,
*
decl_arg_type
))
{
LOG
(
INFO
)
<<
"found
IO
unmatched tensor: "
<<
in
->
AsArgument
().
name
LOG
(
INFO
)
<<
"found
Target
unmatched tensor: "
<<
in
->
AsArgument
().
name
<<
" for kernel "
<<
inst
.
op
->
DebugString
()
<<
" "
<<
" for kernel "
<<
inst
.
op
->
DebugString
()
<<
" "
<<
*
in
->
AsArgument
().
type
<<
" -> "
<<
*
decl_arg_type
;
<<
*
in
->
AsArgument
().
type
<<
" -> "
<<
*
decl_arg_type
;
// Add an IoCopy instruction to make the input compatible with other dist.
// Add an IoCopy instruction to make the input compatible with other dist.
...
...
paddle/fluid/lite/core/mir/runtime_context_assign_pass.cc
浏览文件 @
72b734e4
...
@@ -38,9 +38,11 @@ class RuntimeContextAssignPass : public InstructionPass {
...
@@ -38,9 +38,11 @@ class RuntimeContextAssignPass : public InstructionPass {
case
TARGET
(
kX86
):
case
TARGET
(
kX86
):
inst
.
picked_kernel
().
SetContext
(
NewHostContext
());
inst
.
picked_kernel
().
SetContext
(
NewHostContext
());
break
;
break
;
#ifdef LITE_WITH_CUDA
case
TARGET
(
kCUDA
):
case
TARGET
(
kCUDA
):
inst
.
picked_kernel
().
SetContext
(
NewCudaContext
());
inst
.
picked_kernel
().
SetContext
(
NewCudaContext
());
break
;
break
;
#endif
default:
default:
LOG
(
FATAL
)
<<
"unsupported target "
LOG
(
FATAL
)
<<
"unsupported target "
<<
TargetToStr
(
inst
.
picked_kernel
().
target
());
<<
TargetToStr
(
inst
.
picked_kernel
().
target
());
...
@@ -55,6 +57,7 @@ class RuntimeContextAssignPass : public InstructionPass {
...
@@ -55,6 +57,7 @@ class RuntimeContextAssignPass : public InstructionPass {
return
ctx
;
return
ctx
;
}
}
#ifdef LITE_WITH_CUDA
std
::
unique_ptr
<
KernelContext
>
NewCudaContext
()
{
std
::
unique_ptr
<
KernelContext
>
NewCudaContext
()
{
std
::
unique_ptr
<
KernelContext
>
ctx
(
new
KernelContext
);
std
::
unique_ptr
<
KernelContext
>
ctx
(
new
KernelContext
);
auto
&
cuda
=
ctx
->
AsCudaContext
();
auto
&
cuda
=
ctx
->
AsCudaContext
();
...
@@ -63,6 +66,7 @@ class RuntimeContextAssignPass : public InstructionPass {
...
@@ -63,6 +66,7 @@ class RuntimeContextAssignPass : public InstructionPass {
cuda
.
blas_fp32
=
cublas_fp32_
;
cuda
.
blas_fp32
=
cublas_fp32_
;
return
ctx
;
return
ctx
;
}
}
#endif
void
InitCudaBlas
()
{
void
InitCudaBlas
()
{
cublas_fp32_
=
std
::
make_shared
<
lite
::
cuda
::
Blas
<
float
>>
();
cublas_fp32_
=
std
::
make_shared
<
lite
::
cuda
::
Blas
<
float
>>
();
...
...
paddle/fluid/lite/core/type_system.h
浏览文件 @
72b734e4
...
@@ -183,9 +183,18 @@ class Type : public DataTypeBase {
...
@@ -183,9 +183,18 @@ class Type : public DataTypeBase {
// -------------------------------- compatible check ---------------------------
// -------------------------------- compatible check ---------------------------
static
bool
TargetCompatibleTo
(
const
Type
&
a
,
const
Type
&
b
)
{
static
bool
TargetCompatibleTo
(
const
Type
&
a
,
const
Type
&
b
)
{
return
a
.
IsVoid
()
||
//
auto
is_host
=
[](
TargetType
x
)
{
(
a
.
IsTensor
()
&&
b
.
IsTensor
()
&&
(
a
.
target
()
==
b
.
target
()
||
//
return
x
==
TARGET
(
kHost
)
||
x
==
TARGET
(
kX86
);
b
.
target
()
==
TARGET
(
kAny
)));
};
if
(
a
.
IsVoid
()
||
b
.
IsVoid
())
return
true
;
if
(
a
.
IsTensor
()
||
b
.
IsTensor
())
{
if
(
a
.
IsTensor
()
&&
b
.
IsTensor
())
{
return
is_host
(
a
.
target
())
?
is_host
(
b
.
target
())
:
a
.
target
()
==
b
.
target
();
}
return
false
;
}
return
true
;
}
}
static
bool
DataLayoutCompatibleTo
(
const
Type
&
a
,
const
Type
&
b
)
{
static
bool
DataLayoutCompatibleTo
(
const
Type
&
a
,
const
Type
&
b
)
{
...
@@ -224,32 +233,32 @@ class UnsupportedTy : public Type {
...
@@ -224,32 +233,32 @@ class UnsupportedTy : public Type {
};
};
class
TensorAnyTy
:
public
Type
{
class
TensorAnyTy
:
public
Type
{
public:
public:
TensorAnyTy
(
TargetType
target
)
explicit
TensorAnyTy
(
TargetType
target
)
:
Type
(
ID
::
Tensor_Any
,
"TensorAny"
,
true
,
target
,
PRECISION
(
kAny
),
:
Type
(
ID
::
Tensor_Any
,
"TensorAny"
,
true
,
target
,
PRECISION
(
kAny
),
DATALAYOUT
(
kAny
))
{}
DATALAYOUT
(
kAny
))
{}
};
};
// A list of tensor, and no assumption on the data layout or data type.
// A list of tensor, and no assumption on the data layout or data type.
class
TensorListAnyTy
:
public
Type
{
class
TensorListAnyTy
:
public
Type
{
public:
public:
TensorListAnyTy
(
TargetType
target
)
explicit
TensorListAnyTy
(
TargetType
target
)
:
Type
(
ID
::
TensorList_Any
,
"TensorList_Any"
,
false
,
target
,
:
Type
(
ID
::
TensorList_Any
,
"TensorList_Any"
,
false
,
target
,
PRECISION
(
kAny
),
DATALAYOUT
(
kAny
))
{}
PRECISION
(
kAny
),
DATALAYOUT
(
kAny
))
{}
};
};
class
TensorFp32NCHWTy
:
public
Type
{
class
TensorFp32NCHWTy
:
public
Type
{
public:
public:
TensorFp32NCHWTy
(
TargetType
target
)
explicit
TensorFp32NCHWTy
(
TargetType
target
)
:
Type
(
ID
::
Tensor_Fp32_NCHW
,
"TensorFp32NCHW"
,
true
/*is_tensor*/
,
target
,
:
Type
(
ID
::
Tensor_Fp32_NCHW
,
"TensorFp32NCHW"
,
true
/*is_tensor*/
,
target
,
PrecisionType
::
kFloat
,
DataLayoutType
::
kNCHW
)
{}
PrecisionType
::
kFloat
,
DataLayoutType
::
kNCHW
)
{}
};
};
class
TensorInt8NCHWTy
:
public
Type
{
class
TensorInt8NCHWTy
:
public
Type
{
public:
public:
TensorInt8NCHWTy
(
TargetType
target
)
explicit
TensorInt8NCHWTy
(
TargetType
target
)
:
Type
(
ID
::
Tensor_Int8_NCHW
,
"TensorInt8NCHW"
,
true
/*is_tensor*/
,
target
,
:
Type
(
ID
::
Tensor_Int8_NCHW
,
"TensorInt8NCHW"
,
true
/*is_tensor*/
,
target
,
PrecisionType
::
kInt8
,
DataLayoutType
::
kNCHW
)
{}
PrecisionType
::
kInt8
,
DataLayoutType
::
kNCHW
)
{}
};
};
class
TensorInt64NCHWTy
:
public
Type
{
class
TensorInt64NCHWTy
:
public
Type
{
public:
public:
TensorInt64NCHWTy
(
TargetType
target
)
explicit
TensorInt64NCHWTy
(
TargetType
target
)
:
Type
(
ID
::
Tensor_Int64_NCHW
,
"TensorInt64NCHW"
,
true
/*is_tensor*/
,
:
Type
(
ID
::
Tensor_Int64_NCHW
,
"TensorInt64NCHW"
,
true
/*is_tensor*/
,
target
,
PrecisionType
::
kInt8
,
DataLayoutType
::
kNCHW
)
{}
target
,
PrecisionType
::
kInt8
,
DataLayoutType
::
kNCHW
)
{}
};
};
...
@@ -270,12 +279,14 @@ struct ParamType {
...
@@ -270,12 +279,14 @@ struct ParamType {
Place
tensor_place
{};
Place
tensor_place
{};
const
Type
*
type
;
const
Type
*
type
;
explicit
ParamType
()
=
default
;
ParamType
()
=
default
;
explicit
ParamType
(
size_t
element_type_hash
)
explicit
ParamType
(
size_t
element_type_hash
)
:
element_type_hash
(
element_type_hash
)
{}
:
element_type_hash
(
element_type_hash
)
{}
ParamType
(
size_t
element_type_hash
,
const
Place
&
place
)
ParamType
(
size_t
element_type_hash
,
const
Place
&
place
)
:
element_type_hash
(
element_type_hash
),
tensor_place
(
place
)
{}
:
element_type_hash
(
element_type_hash
),
tensor_place
(
place
)
{}
ParamType
(
const
Type
*
type
)
:
type
(
type
)
{
tensor_place
=
type
->
place
();
}
explicit
ParamType
(
const
Type
*
type
)
:
type
(
type
)
{
tensor_place
=
type
->
place
();
}
std
::
string
DebugString
()
const
{
return
tensor_place
.
DebugString
();
}
std
::
string
DebugString
()
const
{
return
tensor_place
.
DebugString
();
}
};
};
...
...
paddle/fluid/lite/operators/CMakeLists.txt
浏览文件 @
72b734e4
cc_library
(
fc_op_lite SRCS fc_op.cc DEPS op_lite op_params_lite tensor_lite
proto_desc
)
cc_library
(
fc_op_lite SRCS fc_op.cc DEPS op_lite op_params_lite tensor_lite
)
cc_library
(
relu_op_lite SRCS relu_op.cc DEPS op_lite
)
cc_library
(
relu_op_lite SRCS relu_op.cc DEPS op_lite
)
cc_library
(
mul_op_lite SRCS mul_op.cc DEPS op_lite
)
cc_library
(
mul_op_lite SRCS mul_op.cc DEPS op_lite
)
cc_library
(
scale_op_lite SRCS scale_op.cc DEPS op_lite
)
cc_library
(
scale_op_lite SRCS scale_op.cc DEPS op_lite
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录