mirrors/DeepSpeech
2
0
Fork 0
mirror of https://github.com/mozilla/DeepSpeech.git synced 2025-10-26 11:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into no-scipy

Browse Source
This commit is contained in:
Reuben Morais 2018-07-04 12:31:33 +00:00 committed by GitHub
commit 6a76bc7329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native_client/definitions.mk
View File

@ -12,7 +12,7 @@ CXXFLAGS :=
LDFLAGS :=
SOX_CFLAGS := `pkg-config --cflags sox`
SOX_LDFLAGS := `pkg-config --libs sox`
PYTHON_PACKAGES := numpy
PYTHON_PACKAGES := numpy==${NUMPY_VERSION}
ifeq ($(OS),Linux)
PYTHON_PLATFORM_NAME := --plat-name manylinux1_x86_64
endif

3
native_client/setup.py
View File

@ -21,6 +21,7 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
numpy_include = os.getenv('NUMPY_INCLUDE', numpy_include)
numpy_min_ver = os.getenv('NUMPY_VERSION', '1.7.0')
project_name = 'deepspeech'
if '--project_name' in sys.argv:
@ -69,7 +70,7 @@ setup(name = project_name,
},
ext_modules = [model, utils],
entry_points={'console_scripts':['deepspeech = deepspeech.client:main']},
install_requires = ['numpy'],
install_requires = ['numpy>=%s' % numpy_min_ver],
include_package_data = True,
classifiers = [
'Development Status :: 3 - Alpha',

6
tc-tests-utils.sh
View File

@ -528,6 +528,8 @@ maybe_ssl102_py37()
export PY37_OPENSSL="--with-openssl=${PY37_OPENSSL_DIR}/usr"
export PY37_LDPATH="${PY37_OPENSSL_DIR}/usr/lib/"
fi;
export NUMPY_VERSION="1.14.5"
;;
esac
}
@ -555,6 +557,8 @@ do_deepspeech_python_build()
pyver=$(echo "${pyver_conf}" | cut -d':' -f1)
pyconf=$(echo "${pyver_conf}" | cut -d':' -f2)
export NUMPY_VERSION="1.7.0"
maybe_ssl102_py37 ${pyver}
LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf} ${PY37_OPENSSL}" pyenv install ${pyver}
@ -578,6 +582,8 @@ do_deepspeech_python_build()
make -C native_client/ bindings-clean
unset NUMPY_VERSION
deactivate
pyenv uninstall --force deepspeech
pyenv uninstall --force ${pyver}