From e369022f71fbd8d68167825419083ee87916a387 Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Wed, 3 Nov 2021 10:28:06 +0000 Subject: [PATCH] remve .travis; fix install doc; more kws in setup.py --- .travis/install.sh | 37 ----------------------------- .travis/precommit.sh | 23 ------------------ .travis/unittest.sh | 54 ------------------------------------------ docs/make.bat | 35 --------------------------- docs/source/install.md | 4 ++-- setup.py | 5 ++++ 6 files changed, 7 insertions(+), 151 deletions(-) delete mode 100755 .travis/install.sh delete mode 100755 .travis/precommit.sh delete mode 100755 .travis/unittest.sh delete mode 100644 docs/make.bat diff --git a/.travis/install.sh b/.travis/install.sh deleted file mode 100755 index ebb9fa65..00000000 --- a/.travis/install.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -setup_env(){ - cd tools && make && cd - -} - -install(){ - if [ -f "setup.sh" ]; then - bash setup.sh - #export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - fi - if [ $? != 0 ]; then - exit 1 - fi -} - -print_env(){ - cat /etc/lsb-release - gcc -v - g++ -v -} - -abort(){ - echo "Run install failed" 1>&2 - echo "Please check your code" 1>&2 - exit 1 -} - -trap 'abort' 0 -set -e - -print_env -setup_env -source tools/venv/bin/activate -install - -trap : 0 diff --git a/.travis/precommit.sh b/.travis/precommit.sh deleted file mode 100755 index e2444745..00000000 --- a/.travis/precommit.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -function abort(){ - echo "Your commit not fit PaddlePaddle code style" 1>&2 - echo "Please use pre-commit scripts to auto-format your code" 1>&2 - exit 1 -} - - -trap 'abort' 0 -set -e - -source tools/venv/bin/activate - -python3 --version - -if ! pre-commit run -a ; then - ls -lh - git diff --exit-code - exit 1 -fi - -trap : 0 diff --git a/.travis/unittest.sh b/.travis/unittest.sh deleted file mode 100755 index 416042c8..00000000 --- a/.travis/unittest.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - - - -abort(){ - echo "Run unittest failed" 1>&2 - echo "Please check your code" 1>&2 - exit 1 -} - - -unittest(){ - cd $1 > /dev/null - if [ -f "setup.sh" ]; then - bash setup.sh - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - fi - if [ $? != 0 ]; then - exit 1 - fi - find . -path ./tools/venv -prune -false -o -name 'tests' -type d -print0 | \ - xargs -0 -I{} -n1 bash -c \ - 'python3 -m unittest discover -v -s {}' - cd - > /dev/null -} - -coverage(){ - cd $1 > /dev/null - - if [ -f "setup.sh" ]; then - bash setup.sh - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - fi - if [ $? != 0 ]; then - exit 1 - fi - - find . -path ./tools/venv -prune -false -o -name 'tests' -type d -print0 | \ - xargs -0 -I{} -n1 bash -c \ - 'python3 -m coverage run --branch {}' - python3 -m coverage report -m - python3 -m coverage html - cd - > /dev/null -} - -trap 'abort' 0 -set -e - -source tools/venv/bin/activate -#pip3 install pytest -#unittest . -coverage . - -trap : 0 diff --git a/docs/make.bat b/docs/make.bat deleted file mode 100644 index 6247f7e2..00000000 --- a/docs/make.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO OFF - -pushd %~dp0 - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -) -set SOURCEDIR=source -set BUILDDIR=build - -if "%1" == "" goto help - -%SPHINXBUILD% >NUL 2>NUL -if errorlevel 9009 ( - echo. - echo.The 'sphinx-build' command was not found. Make sure you have Sphinx - echo.installed, then set the SPHINXBUILD environment variable to point - echo.to the full path of the 'sphinx-build' executable. Alternatively you - echo.may add the Sphinx directory to PATH. - echo. - echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ - exit /b 1 -) - -%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% -goto end - -:help -%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% - -:end -popd diff --git a/docs/source/install.md b/docs/source/install.md index 0c27a4db..f7c8c1c0 100644 --- a/docs/source/install.md +++ b/docs/source/install.md @@ -33,9 +33,9 @@ make install ```bash git clone https://github.com/PaddlePaddle/DeepSpeech.git cd DeepSpeech -pushd tools; make; popd +pushd tools; make virtualenv.done:; popd source tools/venv/bin/activate -bash setup.sh +pip install -e . ``` - Source venv before do experiment. diff --git a/setup.py b/setup.py index 95044e74..7ca27ac8 100644 --- a/setup.py +++ b/setup.py @@ -145,9 +145,14 @@ setup_info = dict( "speech", "asr", "tts", + "speaker verfication", + "speech classfication", "text frontend", "MFA", "paddlepaddle", + "beam search", + "ctcdecoder", + "deepspeech2", "transformer", "conformer", "fastspeech",