Skip to content

S
Serving

PaddlePaddle / Serving
大约 1 年 前同步成功

通知 186
Star 833
Fork 253
S
Serving
提交 8d53a77e 编写于 作者: T TeslaZhao
浏览文件
操作

Merge branch 'develop' of https://github.com/TeslaZhao/Serving into develop

上级 494b7c90 005d9064
隐藏空白更改
内联 并排
Showing with 57 addition and 42 deletion
core/configure/proto/multi_lang_general_model_service.proto
浏览文件 @ 8d53a77e
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
syntax = "proto2"; syntax = "proto2";
package baidu.paddle_serving.multi_lang;
option java_multiple_files = true; option java_multiple_files = true;
option java_package = "io.paddle.serving.grpc"; option java_package = "io.paddle.serving.grpc";
option java_outer_classname = "ServingProto"; option java_outer_classname = "ServingProto";
......
doc/COMPILE.md
浏览文件 @ 8d53a77e
...@@ -4,26 +4,25 @@ ...@@ -4,26 +4,25 @@
## Compilation environment requirements ## Compilation environment requirements
| module | version | | module | version |
| :--------------------------: | :----------------------------------------------------------: | | :--------------------------: | :-------------------------------: |
| OS | CentOS 7 | | OS | CentOS 7 |
| gcc | 4.8.5 and later | | gcc | 4.8.5 and later |
| gcc-c++ | 4.8.5 and later | | gcc-c++ | 4.8.5 and later |
| git | 3.82 and later | | git | 3.82 and later |
| cmake | 3.2.0 and later | | cmake | 3.2.0 and later |
| Python | 2.7.2 and later / 3.6 and later | | Python | 2.7.2 and later / 3.6 and later |
| Go | 1.9.2 and later | | Go | 1.9.2 and later |
| git | 2.17.1 and later | | git | 2.17.1 and later |
| glibc-static | 2.17 | | glibc-static | 2.17 |
| openssl-devel | 1.0.2k | | openssl-devel | 1.0.2k |
| bzip2-devel | 1.0.6 and later | | bzip2-devel | 1.0.6 and later |
| python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later | | python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later |
| sqlite-devel | 3.7.17 and later | | sqlite-devel | 3.7.17 and later |
| patchelf | 0.9 and later | | patchelf | 0.9 and later |
| libXext | 1.3.3 | | libXext | 1.3.3 |
| libSM | 1.2.2 | | libSM | 1.2.2 |
| libXrender | 0.9.10 | | libXrender | 0.9.10 |
| python-whl | numpy>=1.12, <=1.16.4<br/>wheel>=0.34.0, <0.35.0<br/>setuptools>=44.1.0<br/>opencv-python==4.2.0.32<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br>flask>=1.1.2<br>ujson>=2.0.3 |
It is recommended to use Docker for compilation. We have prepared the Paddle Serving compilation environment for you, see [this document](DOCKER_IMAGES.md). It is recommended to use Docker for compilation. We have prepared the Paddle Serving compilation environment for you, see [this document](DOCKER_IMAGES.md).
...@@ -114,7 +113,7 @@ make ...@@ -114,7 +113,7 @@ make
## Install wheel package ## Install wheel package
Regardless of the client, server or App part, after compiling, install the whl package under `python/dist/`. Regardless of the client, server or App part, after compiling, install the whl package in `python/dist/` in the temporary directory(`server-build-cpu`, `server-build-gpu`, `client-build`,`app-build`) of the compilation process.
...@@ -124,6 +123,12 @@ When running the python server, it will check the `SERVING_BIN` environment vari ...@@ -124,6 +123,12 @@ When running the python server, it will check the `SERVING_BIN` environment vari
## Verify
Please use the example under `python/examples` to verify.
## CMake Option Description ## CMake Option Description
| Compile Options | Description | Default | | Compile Options | Description | Default |
......
doc/COMPILE_CN.md
浏览文件 @ 8d53a77e
...@@ -4,26 +4,25 @@ ...@@ -4,26 +4,25 @@
## 编译环境设置 ## 编译环境设置
| 组件 | 版本要求 | | 组件 | 版本要求 |
| :--------------------------: | :----------------------------------------------------------: | | :--------------------------: | :-------------------------------: |
| OS | CentOS 7 | | OS | CentOS 7 |
| gcc | 4.8.5 and later | | gcc | 4.8.5 and later |
| gcc-c++ | 4.8.5 and later | | gcc-c++ | 4.8.5 and later |
| git | 3.82 and later | | git | 3.82 and later |
| cmake | 3.2.0 and later | | cmake | 3.2.0 and later |
| Python | 2.7.2 and later / 3.6 and later | | Python | 2.7.2 and later / 3.6 and later |
| Go | 1.9.2 and later | | Go | 1.9.2 and later |
| git | 2.17.1 and later | | git | 2.17.1 and later |
| glibc-static | 2.17 | | glibc-static | 2.17 |
| openssl-devel | 1.0.2k | | openssl-devel | 1.0.2k |
| bzip2-devel | 1.0.6 and later | | bzip2-devel | 1.0.6 and later |
| python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later | | python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later |
| sqlite-devel | 3.7.17 and later | | sqlite-devel | 3.7.17 and later |
| patchelf | 0.9 | | patchelf | 0.9 |
| libXext | 1.3.3 | | libXext | 1.3.3 |
| libSM | 1.2.2 | | libSM | 1.2.2 |
| libXrender | 0.9.10 | | libXrender | 0.9.10 |
| python-whl | numpy>=1.12, <=1.16.4<br/>wheel>=0.34.0, <0.35.0<br/>setuptools>=44.1.0<br/>opencv-python==4.2.0.32<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br/>flask>=1.1.2<br/>ujson>=2.0.3 |
推荐使用Docker编译，我们已经为您准备好了Paddle Serving编译环境，详见[该文档](DOCKER_IMAGES_CN.md)。 推荐使用Docker编译，我们已经为您准备好了Paddle Serving编译环境，详见[该文档](DOCKER_IMAGES_CN.md)。
...@@ -114,7 +113,7 @@ make ...@@ -114,7 +113,7 @@ make
## 安装wheel包 ## 安装wheel包
无论是Client端，Server端还是App部分，编译完成后，安装`python/dist/`下的whl包即可。 无论是Client端，Server端还是App部分，编译完成后，安装编译过程临时目录（`server-build-cpu`、`server-build-gpu`、`client-build`、`app-build`）下的`python/dist/` 中的whl包即可。
...@@ -124,6 +123,12 @@ make ...@@ -124,6 +123,12 @@ make
## 如何验证
请使用 `python/examples` 下的例子进行验证。
## CMake选项说明 ## CMake选项说明
| 编译选项 | 说明 | 默认 | | 编译选项 | 说明 | 默认 |
......
java/src/main/proto/multi_lang_general_model_service.proto
浏览文件 @ 8d53a77e
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
syntax = "proto2"; syntax = "proto2";
package baidu.paddle_serving.multi_lang;
option java_multiple_files = true; option java_multiple_files = true;
option java_package = "io.paddle.serving.grpc"; option java_package = "io.paddle.serving.grpc";
option java_outer_classname = "ServingProto"; option java_outer_classname = "ServingProto";
......
python/requirements.txt
浏览文件 @ 8d53a77e
numpy>=1.12, <=1.16.4 ; python_version<"3.5" numpy>=1.12, <=1.16.4 ; python_version<"3.5"
shapely==1.7.0
wheel>=0.34.0, <0.35.0 wheel>=0.34.0, <0.35.0
setuptools>=44.1.0 setuptools>=44.1.0
opencv-python==4.2.0.32 opencv-python==4.2.0.32
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或