Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
99fef2b6
S
Serving
项目概览
PaddlePaddle
/
Serving
大约 1 年 前同步成功
通知
186
Star
833
Fork
253
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
105
列表
看板
标记
里程碑
合并请求
10
Wiki
2
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Serving
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
105
Issue
105
列表
看板
标记
里程碑
合并请求
10
合并请求
10
Pages
分析
分析
仓库分析
DevOps
Wiki
2
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
99fef2b6
编写于
3月 19, 2020
作者:
W
wangjiawei04
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rm rocksdb compile, but source code remains temporarily
上级
e1ed17b1
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
6 addition
and
20 deletion
+6
-20
CMakeLists.txt
CMakeLists.txt
+1
-1
core/CMakeLists.txt
core/CMakeLists.txt
+1
-1
core/general-server/CMakeLists.txt
core/general-server/CMakeLists.txt
+0
-3
core/predictor/CMakeLists.txt
core/predictor/CMakeLists.txt
+2
-3
core/predictor/framework/resource.cpp
core/predictor/framework/resource.cpp
+0
-6
core/predictor/framework/resource.h
core/predictor/framework/resource.h
+0
-4
paddle_inference/inferencer-fluid-cpu/CMakeLists.txt
paddle_inference/inferencer-fluid-cpu/CMakeLists.txt
+1
-1
paddle_inference/inferencer-fluid-gpu/CMakeLists.txt
paddle_inference/inferencer-fluid-gpu/CMakeLists.txt
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
99fef2b6
...
...
@@ -65,7 +65,7 @@ endif()
if
(
NOT CLIENT_ONLY
)
include
(
external/jsoncpp
)
include
(
external/rocksdb
)
#
include(external/rocksdb)
endif
()
#include(external/gtest)
...
...
core/CMakeLists.txt
浏览文件 @
99fef2b6
...
...
@@ -14,7 +14,7 @@
if
(
NOT CLIENT_ONLY
)
add_subdirectory
(
cube
)
add_subdirectory
(
kvdb
)
#
add_subdirectory(kvdb)
endif
()
add_subdirectory
(
configure
)
add_subdirectory
(
pdcodegen
)
...
...
core/general-server/CMakeLists.txt
浏览文件 @
99fef2b6
include_directories
(
SYSTEM
${
CMAKE_CURRENT_LIST_DIR
}
/../kvdb/include
)
include
(
op/CMakeLists.txt
)
include
(
proto/CMakeLists.txt
)
add_executable
(
serving
${
serving_srcs
}
)
...
...
@@ -24,8 +23,6 @@ target_link_libraries(serving pdserving)
target_link_libraries
(
serving cube-api
)
target_link_libraries
(
serving utils
)
target_link_libraries
(
serving kvdb rocksdb
)
if
(
WITH_GPU
)
target_link_libraries
(
serving
${
CUDA_LIBRARIES
}
)
endif
()
...
...
core/predictor/CMakeLists.txt
浏览文件 @
99fef2b6
...
...
@@ -6,17 +6,16 @@ include(framework/CMakeLists.txt)
#include(plugin/CMakeLists.txt)
include
(
src/CMakeLists.txt
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_LIST_DIR
}
/../kvdb/include
)
add_library
(
pdserving
${
pdserving_srcs
}
)
set_source_files_properties
(
${
pdserving_srcs
}
PROPERTIES
COMPILE_FLAGS
"-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor"
)
add_dependencies
(
pdserving protobuf
kvdb
boost brpc leveldb pdcodegen configure
)
add_dependencies
(
pdserving protobuf boost brpc leveldb pdcodegen configure
)
target_link_libraries
(
pdserving
brpc protobuf boost leveldb configure
kvdb
-lpthread -lcrypto -lm -lrt -lssl -ldl -lz
)
brpc protobuf boost leveldb configure -lpthread -lcrypto -lm -lrt -lssl -ldl -lz
)
# install
install
(
TARGETS pdserving
...
...
core/predictor/framework/resource.cpp
浏览文件 @
99fef2b6
...
...
@@ -39,8 +39,6 @@ DynamicResource::~DynamicResource() {}
int
DynamicResource
::
initialize
()
{
return
0
;
}
std
::
shared_ptr
<
RocksDBWrapper
>
Resource
::
getDB
()
{
return
db
;
}
std
::
shared_ptr
<
PaddleGeneralModelConfig
>
Resource
::
get_general_model_config
()
{
return
_config
;
}
...
...
@@ -143,10 +141,6 @@ int Resource::initialize(const std::string& path, const std::string& file) {
LOG
(
ERROR
)
<<
"unable to create tls_bthread_key of thrd_data"
;
return
-
1
;
}
// init rocksDB instance
if
(
db
.
get
()
==
nullptr
)
{
db
=
RocksDBWrapper
::
RocksDBWrapperFactory
(
"kvdb"
);
}
THREAD_SETSPECIFIC
(
_tls_bspec_key
,
NULL
);
return
0
;
...
...
core/predictor/framework/resource.h
浏览文件 @
99fef2b6
...
...
@@ -18,7 +18,6 @@
#include <string>
#include <vector>
#include "core/cube/cube-api/include/cube_api.h"
#include "core/kvdb/include/kvdb/paddle_rocksdb.h"
#include "core/predictor/common/inner_common.h"
#include "core/predictor/framework/infer.h"
#include "core/predictor/framework/memory.h"
...
...
@@ -101,8 +100,6 @@ class Resource {
void
print_general_model_config
(
const
std
::
shared_ptr
<
PaddleGeneralModelConfig
>&
config
);
std
::
shared_ptr
<
RocksDBWrapper
>
getDB
();
DynamicResource
*
get_dynamic_resource
()
{
return
reinterpret_cast
<
DynamicResource
*>
(
THREAD_GETSPECIFIC
(
_tls_bspec_key
));
...
...
@@ -110,7 +107,6 @@ class Resource {
private:
int
thread_finalize
()
{
return
0
;
}
std
::
shared_ptr
<
RocksDBWrapper
>
db
;
std
::
shared_ptr
<
PaddleGeneralModelConfig
>
_config
;
THREAD_KEY_T
_tls_bspec_key
;
...
...
paddle_inference/inferencer-fluid-cpu/CMakeLists.txt
浏览文件 @
99fef2b6
...
...
@@ -2,7 +2,7 @@ FILE(GLOB fluid_cpu_engine_srcs ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
add_library
(
fluid_cpu_engine
${
fluid_cpu_engine_srcs
}
)
target_include_directories
(
fluid_cpu_engine PUBLIC
${
CMAKE_BINARY_DIR
}
/Paddle/fluid_install_dir/
)
add_dependencies
(
fluid_cpu_engine pdserving extern_paddle configure
kvdb
)
add_dependencies
(
fluid_cpu_engine pdserving extern_paddle configure
)
target_link_libraries
(
fluid_cpu_engine pdserving paddle_fluid -lpthread -lcrypto -lm -lrt -lssl -ldl -lz
)
install
(
TARGETS fluid_cpu_engine
...
...
paddle_inference/inferencer-fluid-gpu/CMakeLists.txt
浏览文件 @
99fef2b6
...
...
@@ -2,7 +2,7 @@ FILE(GLOB fluid_gpu_engine_srcs ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
add_library
(
fluid_gpu_engine
${
fluid_gpu_engine_srcs
}
)
target_include_directories
(
fluid_gpu_engine PUBLIC
${
CMAKE_BINARY_DIR
}
/Paddle/fluid_install_dir/
)
add_dependencies
(
fluid_gpu_engine pdserving extern_paddle configure
kvdb
)
add_dependencies
(
fluid_gpu_engine pdserving extern_paddle configure
)
target_link_libraries
(
fluid_gpu_engine pdserving paddle_fluid iomp5 mklml_intel -lpthread -lcrypto -lm -lrt -lssl -ldl -lz
)
install
(
TARGETS fluid_gpu_engine
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录