Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update_inference_link #540

Merged
merged 4 commits into from Jan 15, 2019
Merged

update_inference_link #540

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2675c34
update_inference_link
shanyi15 Jan 15, 2019
7f98e2a
delete cuda 7.5 line in table
shanyi15 Jan 15, 2019
4296007
add&update develop table
shanyi15 Jan 15, 2019
c3c62b0
integration_2tables
shanyi15 Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 23 additions & 10 deletions doc/fluid/advanced_usage/deploy/inference/build_and_install_lib_cn.rst
View file
Open in desktop
Expand Up @@ -6,27 +6,40 @@
直接下载安装
-------------

====================== ========================================
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

两个表格合并下，变成3列

版本说明 C++预测库（1.2版本） C++预测库（develop版本）
cpu_avx_mkl fluid_inference.tgz fluid_inference.tgz

版本说明 C++预测库
====================== ========================================
cpu_avx_mkl `fluid_inference.tgz <https://paddle-inference-lib.bj.bcebos.com/1.2.0-cpu-avx-mkl/fluid_inference.tgz>`_
cpu_avx_openblas `fluid_inference.tgz <https://paddle-inference-lib.bj.bcebos.com/1.2.0-cpu-avx-openblas/fluid_inference.tgz>`_
cpu_noavx_openblas `fluid_inference.tgz <https://paddle-inference-lib.bj.bcebos.com/1.2.0-cpu-noavx-openblas/fluid_inference.tgz>`_
cuda8.0_cudnn5_avx_mkl `fluid_inference.tgz <https://paddle-inference-lib.bj.bcebos.com/1.2.0-gpu-cuda8-cudnn5-avx-mkl/fluid_inference.tgz>`_
cuda8.0_cudnn7_avx_mkl `fluid_inference.tgz <https://https://paddle-inference-lib.bj.bcebos.com/1.2.0-gpu-cuda8-cudnn7-avx-mkl/fluid_inference.tgz>`_
cuda9.0_cudnn7_avx_mkl `fluid_inference.tgz <https://paddle-inference-lib.bj.bcebos.com/1.2.0-gpu-cuda9-cudnn7-avx-mkl/fluid_inference.tgz>`_
====================== ========================================


如需下载develop版本的预测库，请参照以下表格，若出现登陆界面，请点击log as guest，即可下载：

====================== ========================================
版本说明 C++预测库
====================== ========================================
cpu_avx_mkl `fluid_inference.tgz <https://guest:@paddleci.ngrok.io/repository/download/Manylinux1_CpuAvxCp27cp27mu/.lastSuccessful/fluid_inference.tgz>`_
cpu_avx_openblas `fluid_inference.tgz <https://guest:@paddleci.ngrok.io/repository/download/Manylinux1_CpuAvxOpenblas/.lastSuccessful/fluid_inference.tgz>`_
cpu_noavx_openblas `fluid_inference.tgz <https://guest:@paddleci.ngrok.io/repository/download/Manylinux1_CpuNoavxOpenblas/.lastSuccessful/fluid_inference.tgz>`_
cuda7.5_cudnn5_avx_mkl `fluid_inference.tgz <https://guest:@paddleci.ngrok.io/repository/download/Manylinux1_Cuda75cudnn5cp27cp27mu/.lastSuccessful/fluid_inference.tgz>`_
cuda8.0_cudnn5_avx_mkl `fluid_inference.tgz <https://guest:@paddleci.ngrok.io/repository/download/Manylinux1_Cuda80cudnn5cp27cp27mu/.lastSuccessful/fluid_inference.tgz>`_
cuda8.0_cudnn7_avx_mkl `fluid_inference.tgz <https://guest:@paddleci.ngrok.io/repository/download/Manylinux1_Cuda8cudnn7cp27cp27mu/.lastSuccessful/fluid_inference.tgz>`_
cuda9.0_cudnn7_avx_mkl `fluid_inference.tgz <https://guest:@paddleci.ngrok.io/repository/download/Manylinux1_Cuda90cudnn7avxMkl/.lastSuccessful/fluid_inference.tgz>`_
cpu_avx_mkl `fluid_inference.tgz <http://ci.paddlepaddle.org/repository/download/Manylinux1_CpuAvxCp27cp27mu/.lastSuccessful/fluid_inference.tgz>`_
cpu_avx_openblas `fluid_inference.tgz <http://ci.paddlepaddle.org/repository/download/Manylinux1_CpuAvxOpenblas/.lastSuccessful/fluid_inference.tgz>`_
cpu_noavx_openblas `fluid_inference.tgz <http://ci.paddlepaddle.org/repository/download/Manylinux1_CpuNoavxOpenblas/.lastSuccessful/fluid_inference.tgz>`_
cuda8.0_cudnn5_avx_mkl `fluid_inference.tgz <http://ci.paddlepaddle.org/repository/download/Manylinux1_Cuda80cudnn5cp27cp27mu/.lastSuccessful/fluid_inference.tgz>`_
cuda8.0_cudnn7_avx_mkl `fluid_inference.tgz <http://ci.paddlepaddle.org/repository/download/Manylinux1_Cuda8cudnn7cp27cp27mu/.lastSuccessful/fluid_inference.tgz>`_
cuda9.0_cudnn7_avx_mkl `fluid_inference.tgz <http://ci.paddlepaddle.org/repository/download/Manylinux1_Cuda90cudnn7avxMkl/.lastSuccessful/fluid_inference.tgz>`_
====================== ========================================

从源码编译
----------
用户也可以从 PaddlePaddle 核心代码编译C++预测库，只需在编译时配制下面这些编译选项：

============================ =========
选项 值
选项 值
============================ =========
CMAKE_BUILD_TYPE Release
FLUID_INFERENCE_INSTALL_DIR 安装路径
FLUID_INFERENCE_INSTALL_DIR 安装路径
WITH_FLUID_ONLY ON（推荐）
WITH_SWIG_PY OFF（推荐）
WITH_PYTHON OFF（推荐）
Expand Down Expand Up @@ -92,7 +105,7 @@ WITH_MKL ON/OFF
│   ├── xxhash
│   └── zlib
└── version.txt

version.txt 中记录了该预测库的版本信息，包括Git Commit ID、使用OpenBlas或MKL数学库、CUDA/CUDNN版本号，如：

.. code-block:: text
Expand Down