From 051759d4802836f5543a863f64e0b06e91c1bb22 Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Tue, 13 Jun 2023 09:38:20 +0000 Subject: [PATCH] update to py3.8 --- README.md | 6 +++--- README_cn.md | 6 +++--- docs/source/install.md | 4 ++-- docs/source/install_cn.md | 4 ++-- docs/topic/package_release/python_package_release.md | 3 +-- runtime/README.md | 4 ++-- runtime/tools/venv.sh | 2 +- tools/Makefile | 2 +- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index c6e9fc20..a0b28b3b 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 eabb2ead..256a2d1f 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 a4dae364..3607d718 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 7f05cdfe..01ae21fe 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 cb1029e7..c735e0bd 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 553bb29a..0e9c243e 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 3952988c..2aa7e509 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 a5a4485d..c6c667cd 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