Merge pull request PaddlePaddle#63 from jiweibo/lib_download

add download lib doc
zhoutianzi666 · Dec 14, 2020 · fa6ff3b · fa6ff3b
2 parents b6a38a4 + a5c54f8
commit fa6ff3b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 53 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -35,6 +35,7 @@ Welcome to Paddle-Inference's documentation!
   user_guides/compile_ARM
   user_guides/compile_SW
   user_guides/compile_ZHAOXIN
+  user_guides/download_lib
   user_guides/inference_python_api
   user_guides/cxx_api
 

diff --git a/docs/user_guides/compile_ARM.md b/docs/user_guides/compile_ARM.md
@@ -20,35 +20,17 @@
 
         ```
         wget https://github.com/Kitware/CMake/releases/download/v3.16.8/cmake-3.16.8.tar.gz
-        ```
-
-        ```
         tar -xzf cmake-3.16.8.tar.gz && cd cmake-3.16.8
-        ```
-
-        ```
         ./bootstrap && make && sudo make install
         ```
 
 2. Paddle内部使用patchelf来修改动态库的rpath，如果操作系统提供的源包括了patchelf，直接安装即可，否则需要源码安装，请参考[patchelf官方文档](https://github.com/NixOS/patchelf)，后续会考虑在ARM上移出该依赖。
 
         ```
         ./bootstrap.sh
-        ```
-
-        ```
         ./configure
-        ```
-
-        ```
         make
-        ```
-
-        ```
         make check
-        ```
-
-        ```
         sudo make install
         ```
 

diff --git a/docs/user_guides/compile_SW.md b/docs/user_guides/compile_SW.md
@@ -20,9 +20,6 @@
 
     ```
     git clone https://github.com/PaddlePaddle/Paddle.git
-    ```
-
-    ```
     cd Paddle
     ```
 
@@ -84,14 +81,9 @@
 
         ```
         CBLAS_ROOT=/opt/CBLAS
-        ```
-
-        For Python2:
-        ```
+        # For Python2:
         cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_MKL=OFF -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON -DREFERENCE_CBLAS_ROOT=${CBLAS_ROOT} -DWITH_CRYPTO=OFF -DWITH_XBYAK=OFF -DWITH_SW=ON -DCMAKE_CXX_FLAGS="-Wno-error -w"
-        ```
-        For Python3:
-        ```
+        # For Python3:
         cmake .. -DPY_VERSION=3 -DPYTHON_EXECUTABLE=`which python3` -DWITH_MKL=OFF -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON -DREFERENCE_CBLAS_ROOT=${CBLAS_ROOT} -DWITH_CRYPTO=OFF -DWITH_XBYAK=OFF -DWITH_SW=ON -DCMAKE_CXX_FLAGS="-Wno-error -w"
         ```
 

diff --git a/docs/user_guides/compile_ZHAOXIN.md b/docs/user_guides/compile_ZHAOXIN.md
@@ -20,45 +20,24 @@
 
         ```
         wget https://github.com/Kitware/CMake/releases/download/v3.16.8/cmake-3.16.8.tar.gz
-        ```
-
-        ```
         tar -xzf cmake-3.16.8.tar.gz && cd cmake-3.16.8
-        ```
-
-        ```
         ./bootstrap && make && sudo make install
         ```
 
 2. Paddle内部使用patchelf来修改动态库的rpath，如果操作系统提供的源包括了patchelf，直接安装即可，否则需要源码安装，请参考[patchelf官方文档](https://github.com/NixOS/patchelf)。
 
         ```
         ./bootstrap.sh
-        ```
-
-        ```
         ./configure
-        ```
-
-        ```
         make
-        ```
-
-        ```
         make check
-        ```
-
-        ```
         sudo make install
         ```
 
 3. 将Paddle的源代码克隆到当下目录下的Paddle文件夹中，并进入Paddle目录
 
     ```
     git clone https://github.com/PaddlePaddle/Paddle.git
-    ```
-
-    ```
     cd Paddle
     ```
 
@@ -96,12 +75,10 @@
 
     >具体编译选项含义请参见[编译选项表](../Tables.html#Compile)
 
-        For Python2:
         ```
+        # For Python2:
         cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_MKL=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON
-        ```
-        For Python3:
-        ```
+        # For Python3:
         cmake .. -DPY_VERSION=3 -DPYTHON_EXECUTABLE=`which python3` -DWITH_MKL=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON
         ```
 

diff --git a/docs/user_guides/download_lib.md b/docs/user_guides/download_lib.md
@@ -0,0 +1,36 @@
+# 下载安装Linux预测库
+
+| 版本说明      |     预测库(1.8.5版本)  |预测库(2.0.0-rc0版本)   |     预测库(develop版本)     |  
+|:---------|:-------------------|:-------------------|:----------------|
+|manylinux_cpu_avx_mkl_gcc482|[fluid_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/1.8.5-cpu-avx-mkl/fluid_inference.tgz)|[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/2.0.0-rc0-cpu-avx-mkl/paddle_inference.tgz)|[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/latest-cpu-avx-mkl/paddle_inference.tgz)|
+|manylinux_cpu_avx_openblas_gcc482|[fluid_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/1.8.5-cpu-avx-openblas/fluid_inference.tgz)||[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/latest-cpu-avx-openblas/paddle_inference.tgz)|
+|manylinux_cpu_noavx_openblas_gcc482|[fluid_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/1.8.5-cpu-noavx-openblas/fluid_inference.tgz)||[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/latest-cpu-noavx-openblas/paddle_inference.tgz)|
+|manylinux_cuda9.0_cudnn7_avx_mkl_gcc482|[fluid_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/1.8.5-gpu-cuda9-cudnn7-avx-mkl/fluid_inference.tgz)|[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/2.0.0-rc0-gpu-cuda9-cudnn7-avx-mkl/paddle_inference.tgz)|[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/latest-gpu-cuda9-cudnn7-avx-mkl/paddle_inference.tgz)|
+|manylinux_cuda10.0_cudnn7_avx_mkl_gcc482|[fluid_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/1.8.5-gpu-cuda10-cudnn7-avx-mkl/fluid_inference.tgz)|[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/2.0.0-rc0-gpu-cuda10-cudnn7-avx-mkl/paddle_inference.tgz)|[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/latest-gpu-cuda10-cudnn7-avx-mkl/paddle_inference.tgz)|
+|manylinux_cuda10.1_cudnn7.6_avx_mkl_trt6_gcc482|[fluid_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/1.8.5-gpu-cuda10.1-cudnn7.6-avx-mkl-trt6/fluid_inference.tgz)||||
+|manylinux_cuda10.1_cudnn7.6_avx_mkl_trt6_gcc82||[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/2.0.0-rc0-gpu-cuda10.1-cudnn7-avx-mkl/paddle_inference.tgz)|||
+|manylinux_cuda10.2_cudnn8.0_avx_mkl_trt7_gcc82||[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/2.0.0-rc0-gpu-cuda10.2-cudnn8-avx-mkl/paddle_inference.tgz)|||
+|nv_jetson_cuda10_cudnn7.5_trt5(jetpack4.2)|[fluid_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/1.8.5-nv-jetson-cuda10-cudnn7.5-trt5/fluid_inference.tgz)||||
+|nv_jetson_cuda10_cudnn7.6_trt6(jetpack4.3)||[paddle_inference.tgz](https://paddle-inference-lib.bj.bcebos.com/2.0.0-rc0-nv-jetson-cuda10-cudnn7.6-trt6/paddle_inference.tgz)|||
+
+
+# 下载安装Windows预测库
+
+
+| 版本说明      |     预测库(1.8.4版本)  |预测库(2.0.0-beta0版本)   |     编译器     |    构建工具      |  cuDNN  |  CUDA  |
+|:---------|:-------------------|:-------------------|:----------------|:--------|:-------|:-------|
+|    cpu_avx_mkl | [fluid_inference.zip](https://paddle-wheel.bj.bcebos.com/1.8.4/win-infer/mkl/cpu/fluid_inference_install_dir.zip) | [fluid_inference.zip](https://paddle-wheel.bj.bcebos.com/2.0.0-beta0/win-infer/mkl/cpu/fluid_inference_install_dir.zip) | MSVC 2015 update 3|  CMake v3.16.0  |
+|    cpu_avx_openblas | [fluid_inference.zip](https://paddle-wheel.bj.bcebos.com/1.8.4/win-infer/open/cpu/fluid_inference_install_dir.zip) || MSVC 2015 update 3|  CMake v3.16.0  |
+|    cuda9.0_cudnn7_avx_mkl | [fluid_inference.zip](https://paddle-wheel.bj.bcebos.com/1.8.4/win-infer/mkl/post97/fluid_inference_install_dir.zip) ||  MSVC 2015 update 3 |  CMake v3.16.0  |  7.3.1  |   9.0    |
+|    cuda9.0_cudnn7_avx_openblas | [fluid_inference.zip](https://paddle-wheel.bj.bcebos.com/1.8.4/win-infer/open/post97/fluid_inference_install_dir.zip) || MSVC 2015 update 3 |  CMake v3.16.0  |  7.3.1  |   9.0    |
+|    cuda10.0_cudnn7_avx_mkl | [fluid_inference.zip](https://paddle-wheel.bj.bcebos.com/1.8.4/win-infer/mkl/post107/fluid_inference_install_dir.zip) | [fluid_inference.zip](https://paddle-wheel.bj.bcebos.com/1.8.3/win-infer/mkl/cpu/fluid_inference_install_dir.zip) | MSVC 2015 update 3 |  CMake v3.16.0  |  7.4.1  |   10.0    |
+
+
+环境硬件配置：
+
+| 操作系统      |    win10 家庭版本      |
+|:---------|:-------------------|
+| CPU      |      I7-8700K      |
+| 内存 | 16G               |
+| 硬盘 | 1T hdd + 256G ssd |
+| 显卡 | GTX1080 8G        |