Merge pull request #3336 from zh794390558/py3.8

update to py3.8
pull/3359/head
Hui Zhang 1 year ago committed by GitHub
commit c1dbae6f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -227,13 +227,13 @@ Via the easy-to-use, efficient, flexible and scalable implementation, our vision
## Installation ## 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** ### **Dependency Introduction**
+ gcc >= 4.8.5 + gcc >= 4.8.5
+ paddlepaddle >= 2.4.1 + paddlepaddle >= 2.5.0
+ python >= 3.7 + python >= 3.8
+ OS support: Linux(recommend), Windows, Mac OSX + 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. 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.

@ -8,7 +8,7 @@
<a href="./LICENSE"><img src="https://img.shields.io/badge/license-Apache%202-red.svg"></a> <a href="./LICENSE"><img src="https://img.shields.io/badge/license-Apache%202-red.svg"></a>
<a href="https://github.com/PaddlePaddle/PaddleSpeech/releases"><img src="https://img.shields.io/github/v/release/PaddlePaddle/PaddleSpeech?color=ffa"></a> <a href="https://github.com/PaddlePaddle/PaddleSpeech/releases"><img src="https://img.shields.io/github/v/release/PaddlePaddle/PaddleSpeech?color=ffa"></a>
<a href="support os"><img src="https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-pink.svg"></a> <a href="support os"><img src="https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-pink.svg"></a>
<a href=""><img src="https://img.shields.io/badge/python-3.7+-aff.svg"></a> <a href=""><img src="https://img.shields.io/badge/python-3.8+-aff.svg"></a>
<a href="https://github.com/PaddlePaddle/PaddleSpeech/graphs/contributors"><img src="https://img.shields.io/github/contributors/PaddlePaddle/PaddleSpeech?color=9ea"></a> <a href="https://github.com/PaddlePaddle/PaddleSpeech/graphs/contributors"><img src="https://img.shields.io/github/contributors/PaddlePaddle/PaddleSpeech?color=9ea"></a>
<a href="https://github.com/PaddlePaddle/PaddleSpeech/commits"><img src="https://img.shields.io/github/commit-activity/m/PaddlePaddle/PaddleSpeech?color=3af"></a> <a href="https://github.com/PaddlePaddle/PaddleSpeech/commits"><img src="https://img.shields.io/github/commit-activity/m/PaddlePaddle/PaddleSpeech?color=3af"></a>
<a href="https://github.com/PaddlePaddle/PaddleSpeech/issues"><img src="https://img.shields.io/github/issues/PaddlePaddle/PaddleSpeech?color=9cc"></a> <a href="https://github.com/PaddlePaddle/PaddleSpeech/issues"><img src="https://img.shields.io/github/issues/PaddlePaddle/PaddleSpeech?color=9cc"></a>
@ -241,8 +241,8 @@
### 相关依赖 ### 相关依赖
+ gcc >= 4.8.5 + gcc >= 4.8.5
+ paddlepaddle >= 2.4.1 + paddlepaddle >= 2.5.0
+ python >= 3.7 + python >= 3.8
+ linux(推荐), mac, windows + linux(推荐), mac, windows
PaddleSpeech 依赖于 paddlepaddle安装可以参考[ paddlepaddle 官网](https://www.paddlepaddle.org.cn/),根据自己机器的情况进行选择。这里给出 cpu 版本示例,其它版本大家可以根据自己机器的情况进行安装。 PaddleSpeech 依赖于 paddlepaddle安装可以参考[ paddlepaddle 官网](https://www.paddlepaddle.org.cn/),根据自己机器的情况进行选择。这里给出 cpu 版本示例,其它版本大家可以根据自己机器的情况进行安装。

@ -95,7 +95,7 @@ bash
``` ```
Then you can create a conda virtual environment using the following command: Then you can create a conda virtual environment using the following command:
```bash ```bash
conda create -y -p tools/venv python=3.7 conda create -y -p tools/venv python=3.8
``` ```
Activate the conda virtual environment: Activate the conda virtual environment:
```bash ```bash
@ -181,7 +181,7 @@ $HOME/miniconda3/bin/conda init
# use the "bash" command to make the conda environment works # use the "bash" command to make the conda environment works
bash bash
# create a conda virtual environment # 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: # Activate the conda virtual environment:
conda activate tools/venv conda activate tools/venv
# Install the conda packages # Install the conda packages

@ -91,7 +91,7 @@ bash
``` ```
然后你可以创建一个 conda 的虚拟环境: 然后你可以创建一个 conda 的虚拟环境:
```bash ```bash
conda create -y -p tools/venv python=3.7 conda create -y -p tools/venv python=3.8
``` ```
激活 conda 虚拟环境: 激活 conda 虚拟环境:
```bash ```bash
@ -173,7 +173,7 @@ $HOME/miniconda3/bin/conda init
# 激活 conda # 激活 conda
bash bash
# 创建 Conda 虚拟环境 # 创建 Conda 虚拟环境
conda create -y -p tools/venv python=3.7 conda create -y -p tools/venv python=3.8
# 激活 Conda 虚拟环境: # 激活 Conda 虚拟环境:
conda activate tools/venv conda activate tools/venv
# 安装 Conda 包 # 安装 Conda 包

@ -165,8 +165,7 @@ docker run -it xxxxxx
设置python 设置python
```bash ```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" #export PATH="/opt/python/cp39-cp39/bin/:$PATH"
``` ```

@ -2,7 +2,7 @@
## Environment ## Environment
We develop under: We develop under:
* python - 3.7 * python - >=3.8
* docker - `registry.baidubce.com/paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7` * docker - `registry.baidubce.com/paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7`
* os - Ubuntu 16.04.7 LTS * os - Ubuntu 16.04.7 LTS
* gcc/g++/gfortran - 8.2.0 * 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 patchelf --set-soname libpaddle.so libpaddle.so
``` ```

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
PYTHON=python3.7 PYTHON=python3.8
test -d venv || virtualenv -p ${PYTHON} venv test -d venv || virtualenv -p ${PYTHON} venv

@ -1,5 +1,5 @@
SHELL:= /bin/bash SHELL:= /bin/bash
PYTHON:= python3.7 PYTHON:= python3.8
CXX ?= g++ CXX ?= g++
CC ?= gcc # used for sph2pipe CC ?= gcc # used for sph2pipe

Loading…
Cancel
Save