diff --git a/README.md b/README.md index c6e9fc2093b2b4bd311f0f580bcde6ae1b4e4f71..a0b28b3bdbf177b35c99ba8c47542fea3c8a2a20 100644 --- a/README.md +++ b/README.md @@ -227,13 +227,13 @@ Via the easy-to-use, efficient, flexible and scalable implementation, our vision ## Installation -We strongly recommend our users to install PaddleSpeech in **Linux** with *python>=3.7* and *paddlepaddle>=2.4.1*. +We strongly recommend our users to install PaddleSpeech in **Linux** with *python>=3.8* and *paddlepaddle>=2.5.0*. ### **Dependency Introduction** + gcc >= 4.8.5 -+ paddlepaddle >= 2.4.1 -+ python >= 3.7 ++ paddlepaddle >= 2.5.0 ++ python >= 3.8 + OS support: Linux(recommend), Windows, Mac OSX PaddleSpeech depends on paddlepaddle. For installation, please refer to the official website of [paddlepaddle](https://www.paddlepaddle.org.cn/en) and choose according to your own machine. Here is an example of the cpu version. diff --git a/README_cn.md b/README_cn.md index eabb2ead45f46fb6859770d6cb8c1f3d6349babd..256a2d1fcdef416d8f0da844f7bf739d0cb70f84 100644 --- a/README_cn.md +++ b/README_cn.md @@ -8,7 +8,7 @@ - + @@ -241,8 +241,8 @@ ### 相关依赖 + gcc >= 4.8.5 -+ paddlepaddle >= 2.4.1 -+ python >= 3.7 ++ paddlepaddle >= 2.5.0 ++ python >= 3.8 + linux(推荐), mac, windows PaddleSpeech 依赖于 paddlepaddle,安装可以参考[ paddlepaddle 官网](https://www.paddlepaddle.org.cn/),根据自己机器的情况进行选择。这里给出 cpu 版本示例,其它版本大家可以根据自己机器的情况进行安装。 diff --git a/docs/source/install.md b/docs/source/install.md index a4dae3640a08a201bf07a6177a56b9093f4201e7..3607d7185cd7fb72f179bce930ad0478f1f55cab 100644 --- a/docs/source/install.md +++ b/docs/source/install.md @@ -95,7 +95,7 @@ bash ``` Then you can create a conda virtual environment using the following command: ```bash -conda create -y -p tools/venv python=3.7 +conda create -y -p tools/venv python=3.8 ``` Activate the conda virtual environment: ```bash @@ -181,7 +181,7 @@ $HOME/miniconda3/bin/conda init # use the "bash" command to make the conda environment works bash # create a conda virtual environment -conda create -y -p tools/venv python=3.7 +conda create -y -p tools/venv python=3.8 # Activate the conda virtual environment: conda activate tools/venv # Install the conda packages diff --git a/docs/source/install_cn.md b/docs/source/install_cn.md index 7f05cdfe4e6bd7e7aa24b09dfe4e35456ca2850a..01ae21fe7b900f0c5bb72b087bdab4a30d5e08ee 100644 --- a/docs/source/install_cn.md +++ b/docs/source/install_cn.md @@ -91,7 +91,7 @@ bash ``` 然后你可以创建一个 conda 的虚拟环境: ```bash -conda create -y -p tools/venv python=3.7 +conda create -y -p tools/venv python=3.8 ``` 激活 conda 虚拟环境: ```bash @@ -173,7 +173,7 @@ $HOME/miniconda3/bin/conda init # 激活 conda bash # 创建 Conda 虚拟环境 -conda create -y -p tools/venv python=3.7 +conda create -y -p tools/venv python=3.8 # 激活 Conda 虚拟环境: conda activate tools/venv # 安装 Conda 包 diff --git a/docs/topic/package_release/python_package_release.md b/docs/topic/package_release/python_package_release.md index cb1029e7b66711fbd9657965aaca218db77a83a0..c735e0bd8c4a3abf6e372338834ef518f8522687 100644 --- a/docs/topic/package_release/python_package_release.md +++ b/docs/topic/package_release/python_package_release.md @@ -165,8 +165,7 @@ docker run -it xxxxxx 设置python: ```bash -export PATH="/opt/python/cp37-cp37m/bin/:$PATH" -#export PATH="/opt/python/cp38-cp38/bin/:$PATH" +export PATH="/opt/python/cp38-cp38/bin/:$PATH" #export PATH="/opt/python/cp39-cp39/bin/:$PATH" ``` diff --git a/runtime/README.md b/runtime/README.md index 553bb29adb3e94c2b97e60713db8d354814056db..0e9c243e9026024f9f4eefb0f8ab2cb020b80bf5 100644 --- a/runtime/README.md +++ b/runtime/README.md @@ -2,7 +2,7 @@ ## Environment We develop under: -* python - 3.7 +* python - >=3.8 * docker - `registry.baidubce.com/paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7` * os - Ubuntu 16.04.7 LTS * gcc/g++/gfortran - 8.2.0 @@ -98,7 +98,7 @@ please install paddlepaddle >= 2.4rc ``` -cd $YOUR_ENV_PATH/lib/python3.7/site-packages/paddle/fluid +cd $YOUR_ENV_PATH/lib/python3.8/site-packages/paddle/fluid patchelf --set-soname libpaddle.so libpaddle.so ``` diff --git a/runtime/tools/venv.sh b/runtime/tools/venv.sh index 3952988c68498507b7aa1d6f2758ad0a2ce63def..2aa7e5095d4a3c0ed887846f44e4f92c42eb03ec 100755 --- a/runtime/tools/venv.sh +++ b/runtime/tools/venv.sh @@ -1,5 +1,5 @@ #!/bin/bash set -ex -PYTHON=python3.7 +PYTHON=python3.8 test -d venv || virtualenv -p ${PYTHON} venv diff --git a/tools/Makefile b/tools/Makefile index a5a4485da79795ed8f2abec1a24abb2f6d9a98b0..c6c667cd0dfcff91877d4de09193a868d1a78896 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,5 +1,5 @@ SHELL:= /bin/bash -PYTHON:= python3.7 +PYTHON:= python3.8 CXX ?= g++ CC ?= gcc # used for sph2pipe