From 0135bba9eb1180b0c4b04af57bb6b118498f0812 Mon Sep 17 00:00:00 2001 From: lfchener Date: Tue, 8 Oct 2019 13:20:14 +0000 Subject: [PATCH 1/3] Update README.md and README_cn.md --- README.md | 20 +++++++++++++++++++- README_cn.md | 21 ++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0dcf8b602..a9f159f5d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,25 @@ ## Installation -For this project was developed in PaddlePaddle V2 API, which is not maintained officially any more, we only support [running it in Docker container](#running-in-docker-container), instead of building environment from source code. And we are going to release the update to the latest Paddle Fluid API very soon, please keep an eye on this project. +For this project was developed in PaddlePaddle V2 API, which is not maintained officially any more. To avoid the trouble of environment setup, [running in Docker container](#running-in-docker-container) is highly recommended. Otherwise follow the guidelines below to install the dependencies manually. And we are going to release the update to the latest Paddle Fluid API very soon, please keep an eye on this project. +### Prerequisites +- Python 2.7 only supported +- PaddlePaddle the 0.13 version (please refer to the [Installation Guide](https://www.paddlepaddle.org.cn/documentation/docs/en/0.13.0/build_and_install/pip_install_en.html)) + +### Setup +- Make sure these libraries or tools installed: `pkg-config`, `flac`, `ogg`, `vorbis`, `boost` and `swig`, e.g. installing them via `apt-get`: + +```bash +sudo apt-get install -y pkg-config libflac-dev libogg-dev libvorbis-dev libboost-dev swig +``` + +- Run the setup script for the remaining dependencies + +```bash +git clone https://github.com/PaddlePaddle/DeepSpeech.git +cd DeepSpeech +sh setup.sh +``` ## Getting Started diff --git a/README_cn.md b/README_cn.md index 06bee58bf..76b164367 100644 --- a/README_cn.md +++ b/README_cn.md @@ -21,7 +21,26 @@ ## 安装 -因该项目基于 PaddlePaddle V2 API 开发，其已不再被官方维护，目前我们仅支持 [在 Docker 容器中运行该项目](#在Docker容器上运行)，而不支持从源码构建环境。我们很快会将这个项目升级到最新的 Paddle Fluid API，请保持关注。 +因该项目基于 PaddlePaddle V2 API 开发，其已不再被官方维护，为了避免环境配置问题，强烈建议在[Docker容器上运行](#在Docker容器上运行)，否则请按照下面的指南安装依赖项。我们很快会将这个项目升级到最新的 Paddle Fluid API，请保持关注。 + +### 前提 +- 只支持Python 2.7 +- PaddlePaddle 0.13 版本(请参考[安装指南](https://www.paddlepaddle.org.cn/documentation/docs/zh/0.13.0/build_and_install/index_cn.html)) + +### 安装 +- 请确保以下库或工具已安装完毕：`pkg-config`, `flac`, `ogg`, `vorbis`, `boost` 和 `swig`, 如可以通过`apt-get`安装： + +```bash +sudo apt-get install -y pkg-config libflac-dev libogg-dev libvorbis-dev libboost-dev swig +``` + +- 运行脚本安装其余的依赖项 + +```bash +git clone https://github.com/PaddlePaddle/DeepSpeech.git +cd DeepSpeech +sh setup.sh +``` ## 开始 From 1ef57bcac2992bfe15a207014f36f3d9d2e19db1 Mon Sep 17 00:00:00 2001 From: lfchener Date: Wed, 9 Oct 2019 02:07:58 +0000 Subject: [PATCH 2/3] Update README.md and README_cn.md --- README.md | 6 +++++- README_cn.md | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a9f159f5d..f5f90b8e9 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,11 @@ For this project was developed in PaddlePaddle V2 API, which is not maintained officially any more. To avoid the trouble of environment setup, [running in Docker container](#running-in-docker-container) is highly recommended. Otherwise follow the guidelines below to install the dependencies manually. And we are going to release the update to the latest Paddle Fluid API very soon, please keep an eye on this project. ### Prerequisites - Python 2.7 only supported -- PaddlePaddle the 0.13 version (please refer to the [Installation Guide](https://www.paddlepaddle.org.cn/documentation/docs/en/0.13.0/build_and_install/pip_install_en.html)) +- PaddlePaddle the 0.13 version + +```bash +pip install paddlepaddle==0.13 +``` ### Setup - Make sure these libraries or tools installed: `pkg-config`, `flac`, `ogg`, `vorbis`, `boost` and `swig`, e.g. installing them via `apt-get`: diff --git a/README_cn.md b/README_cn.md index 76b164367..ab6b9038e 100644 --- a/README_cn.md +++ b/README_cn.md @@ -25,7 +25,11 @@ ### 前提 - 只支持Python 2.7 -- PaddlePaddle 0.13 版本(请参考[安装指南](https://www.paddlepaddle.org.cn/documentation/docs/zh/0.13.0/build_and_install/index_cn.html)) +- PaddlePaddle 0.13 版本 + +```bash +pip install paddlepaddle==0.13 +``` ### 安装 - 请确保以下库或工具已安装完毕：`pkg-config`, `flac`, `ogg`, `vorbis`, `boost` 和 `swig`, 如可以通过`apt-get`安装： From 9fcd634f568829c91a100db208f92f856425bccb Mon Sep 17 00:00:00 2001 From: lfchener Date: Wed, 9 Oct 2019 11:50:24 +0000 Subject: [PATCH 3/3] Update README.md and README_cn.md --- README.md | 2 +- README_cn.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f5f90b8e9..9b4898442 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ For this project was developed in PaddlePaddle V2 API, which is not maintained o - PaddlePaddle the 0.13 version ```bash -pip install paddlepaddle==0.13 +pip install paddlepaddle-gpu==0.13 ``` ### Setup diff --git a/README_cn.md b/README_cn.md index ab6b9038e..f26c5d9a9 100644 --- a/README_cn.md +++ b/README_cn.md @@ -28,7 +28,7 @@ - PaddlePaddle 0.13 版本 ```bash -pip install paddlepaddle==0.13 +pip install paddlepaddle-gpu==0.13 ``` ### 安装