Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
d97475d5
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2297
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d97475d5
编写于
2月 21, 2020
作者:
F
flame
提交者:
GitHub
2月 21, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix CPU C inference API compile bug (#22702)
上级
adfa5b83
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
30 addition
and
27 deletion
+30
-27
go/paddle/common.go
go/paddle/common.go
+0
-8
go/paddle/config.go
go/paddle/config.go
+8
-0
go/paddle/predictor.go
go/paddle/predictor.go
+2
-2
go/paddle/tensor.go
go/paddle/tensor.go
+4
-4
paddle/fluid/inference/CMakeLists.txt
paddle/fluid/inference/CMakeLists.txt
+14
-11
paddle/fluid/inference/capi/CMakeLists.txt
paddle/fluid/inference/capi/CMakeLists.txt
+2
-2
未找到文件。
go/paddle/common.go
浏览文件 @
d97475d5
...
...
@@ -21,14 +21,6 @@ package paddle
import
"C"
import
"fmt"
type
Precision
C
.
Precision
const
(
kFloat32
Precision
=
C
.
kFloat32
kInt8
Precision
=
C
.
kInt8
kHalf
Precision
=
C
.
kHalf
)
func
ConvertCBooleanToGo
(
b
C
.
bool
)
bool
{
var
c_false
C
.
bool
if
b
!=
c_false
{
...
...
go/paddle/config.go
浏览文件 @
d97475d5
...
...
@@ -24,6 +24,14 @@ import "C"
import
"runtime"
import
"unsafe"
type
Precision
C
.
Precision
const
(
Precision_FLOAT32
Precision
=
C
.
kFloat32
Precision_INT8
Precision
=
C
.
kInt8
Precision_HALF
Precision
=
C
.
kHalf
)
type
AnalysisConfig
struct
{
c
*
C
.
PD_AnalysisConfig
}
...
...
go/paddle/predictor.go
浏览文件 @
d97475d5
...
...
@@ -102,12 +102,12 @@ func (predictor *Predictor) SetZeroCopyInput(tensor *ZeroCopyTensor) {
func
(
predictor
*
Predictor
)
GetZeroCopyOutput
(
tensor
*
ZeroCopyTensor
)
{
C
.
PD_GetZeroCopyOutput
(
predictor
.
c
,
tensor
.
c
)
tensor
.
name
=
C
.
GoString
(
tensor
.
c
.
name
)
var
shape
[]
int32
var
shape
[]
int32
shape_hdr
:=
(
*
reflect
.
SliceHeader
)(
unsafe
.
Pointer
(
&
shape
))
shape_hdr
.
Data
=
uintptr
(
unsafe
.
Pointer
(
tensor
.
c
.
shape
.
data
))
shape_hdr
.
Len
=
int
(
tensor
.
c
.
shape
.
length
/
C
.
sizeof_int
)
shape_hdr
.
Cap
=
int
(
tensor
.
c
.
shape
.
length
/
C
.
sizeof_int
)
tensor
.
Reshape
(
shape
)
tensor
.
Reshape
(
shape
)
}
func
(
predictor
*
Predictor
)
ZeroCopyRun
()
{
...
...
go/paddle/tensor.go
浏览文件 @
d97475d5
...
...
@@ -137,16 +137,16 @@ func (tensor *ZeroCopyTensor) SetValue(value interface{}) {
tensor
.
c
.
data
.
length
=
length
switch
dtype
{
case
PaddleDType
(
UINT8
)
:
case
PaddleDType
(
UINT8
)
:
data
:=
val
.
Interface
()
.
([]
uint8
)
C
.
memcpy
(
tensor
.
c
.
data
.
data
,
unsafe
.
Pointer
(
&
data
[
0
]),
length
)
case
PaddleDType
(
INT32
)
:
case
PaddleDType
(
INT32
)
:
data
:=
val
.
Interface
()
.
([]
int32
)
C
.
memcpy
(
tensor
.
c
.
data
.
data
,
unsafe
.
Pointer
(
&
data
[
0
]),
length
)
case
PaddleDType
(
INT64
)
:
case
PaddleDType
(
INT64
)
:
data
:=
val
.
Interface
()
.
([]
int64
)
C
.
memcpy
(
tensor
.
c
.
data
.
data
,
unsafe
.
Pointer
(
&
data
[
0
]),
length
)
case
PaddleDType
(
FLOAT32
)
:
case
PaddleDType
(
FLOAT32
)
:
data
:=
val
.
Interface
()
.
([]
float32
)
C
.
memcpy
(
tensor
.
c
.
data
.
data
,
unsafe
.
Pointer
(
&
data
[
0
]),
length
)
}
...
...
paddle/fluid/inference/CMakeLists.txt
浏览文件 @
d97475d5
...
...
@@ -39,6 +39,20 @@ get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES)
get_property
(
cuda_modules GLOBAL PROPERTY CUDA_MODULES
)
add_subdirectory
(
api
)
# Create static inference library if needed
# All static libs in inference/api
set
(
STATIC_INFERENCE_API paddle_inference_api analysis_predictor zero_copy_tensor reset_tensor_array
analysis_config paddle_pass_builder activation_functions
${
mkldnn_quantizer_cfg
}
)
create_static_lib
(
paddle_fluid
${
fluid_modules
}
${
STATIC_INFERENCE_API
}
)
if
(
NOT APPLE
)
# TODO(liuyiqu: Temporarily disable the link flag because it is not support on Mac.
set
(
LINK_FLAGS
"-Wl,--retain-symbols-file
${
CMAKE_CURRENT_SOURCE_DIR
}
/paddle_fluid.sym"
)
set_target_properties
(
paddle_fluid PROPERTIES LINK_FLAGS
"
${
LINK_FLAGS
}
"
)
endif
()
# C inference API
add_subdirectory
(
capi
)
if
(
WITH_TESTING
)
...
...
@@ -53,17 +67,6 @@ if(NOT ON_INFER)
return
()
endif
()
# Create static inference library if needed
# All static libs in inference/api
set
(
STATIC_INFERENCE_API paddle_inference_api analysis_predictor zero_copy_tensor reset_tensor_array
analysis_config paddle_pass_builder activation_functions
${
mkldnn_quantizer_cfg
}
)
create_static_lib
(
paddle_fluid
${
fluid_modules
}
${
STATIC_INFERENCE_API
}
)
if
(
NOT APPLE
)
# TODO(liuyiqu: Temporarily disable the link flag because it is not support on Mac.
set
(
LINK_FLAGS
"-Wl,--retain-symbols-file
${
CMAKE_CURRENT_SOURCE_DIR
}
/paddle_fluid.sym"
)
set_target_properties
(
paddle_fluid PROPERTIES LINK_FLAGS
"
${
LINK_FLAGS
}
"
)
endif
()
set
(
SHARED_INFERENCE_SRCS
io.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../framework/data_feed.cc
...
...
paddle/fluid/inference/capi/CMakeLists.txt
浏览文件 @
d97475d5
...
...
@@ -15,14 +15,14 @@
set
(
C_API_SRCS pd_config.cc pd_predictor.cc pd_tensor.cc c_api.cc
)
cc_library
(
paddle_fluid_c SRCS
${
C_API_SRCS
}
DEPS
${
fluid_modules
}
analysis_predictor
)
cc_library
(
paddle_fluid_c SRCS
${
C_API_SRCS
}
DEPS
paddle_fluid
)
if
(
NOT ON_INFER
)
return
()
endif
()
# Create inference capi shared library
cc_library
(
paddle_fluid_c_shared SHARED SRCS
${
C_API_SRCS
}
DEPS
${
fluid_modules
}
analysis_predictor
)
cc_library
(
paddle_fluid_c_shared SHARED SRCS
${
C_API_SRCS
}
DEPS
paddle_fluid
)
set_target_properties
(
paddle_fluid_c_shared PROPERTIES OUTPUT_NAME paddle_fluid_c
)
if
(
WIN32
)
target_link_libraries
(
paddle_fluid_c_shared shlwapi.lib
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录