merge from master

This commit is contained in:
josh 2018-12-14 19:28:49 -08:00
commit 64dc41d72b
16 changed files with 20 additions and 7 deletions

View File

@ -5,9 +5,8 @@ transfer=0
## SETUP VIRETUALENV ##
virtualenv -p python3 ../tmp/venv
source ../tmp/venv/bin/activate
pip3 install -r <(grep -v tensorflow requirements.txt)
pip3 install tensorflow-gpu==1.12.0rc2
#pip3 install tensorflow
pip install -r <(grep -v tensorflow requirements.txt)
pip install tensorflow-gpu==1.12.0
## SETUP TASKCLUSTER ##
python3 util/taskcluster.py --arch gpu --target ../tmp/native_client

View File

@ -186,7 +186,7 @@ RUN cp /tensorflow/bazel-bin/native_client/generate_trie /DeepSpeech/native_clie
# Install TensorFlow
WORKDIR /DeepSpeech/
RUN pip install tensorflow-gpu==1.12.0rc2
RUN pip install tensorflow-gpu==1.12.0
# Make DeepSpeech and install Python bindings

View File

@ -227,7 +227,7 @@ If you have a capable (Nvidia, at least 8GB of VRAM) GPU, it is highly recommend
```bash
pip3 uninstall tensorflow
pip3 install 'tensorflow-gpu==1.12.0rc2'
pip3 install 'tensorflow-gpu==1.12.0'
```
### Common Voice training data

View File

@ -1 +1 @@
0.4.0-alpha.1
0.4.0-alpha.2

View File

@ -1,7 +1,7 @@
pandas
progressbar2
python-utils
tensorflow == 1.12.0rc2
tensorflow == 1.12.0
numpy
matplotlib
scipy

View File

@ -18,6 +18,7 @@ build:
scripts:
build: ''
package: ''
nc_asset_name: 'native_client.tar.xz'
args:
tests_cmdline: ''
convert_graphdef: ''

View File

@ -16,6 +16,7 @@ build:
scripts:
build: "taskcluster/android-build.sh arm64-v8a"
package: "taskcluster/android-package.sh arm64-v8a"
nc_asset_name: "native_client.arm64.cpu.android.tar.xz"
metadata:
name: "DeepSpeech Android ARM64"
description: "Building DeepSpeech for Android ARM64, optimized version"

View File

@ -16,6 +16,7 @@ build:
scripts:
build: "taskcluster/android-build.sh armeabi-v7a"
package: "taskcluster/android-package.sh armeabi-v7a"
nc_asset_name: "native_client.armv7.cpu.android.tar.xz"
metadata:
name: "DeepSpeech Android ARMv7"
description: "Building DeepSpeech for Android ARMv7, optimized version"

View File

@ -10,6 +10,7 @@ build:
scripts:
build: "taskcluster/host-build.sh"
package: "taskcluster/package.sh"
nc_asset_name: "native_client.amd64.cpu.osx.tar.xz"
maxRunTime: 14400
metadata:
name: "DeepSpeech OSX AMD64 CPU"

View File

@ -15,6 +15,7 @@ expires:
else: { $fromNow: '7 days' }
extra:
nc_asset_name: { $eval: build.nc_asset_name }
github:
$if: '(event.event == "push") || (event.event == "tag")'
then: { $eval: taskcluster.github_events.merge }

View File

@ -18,6 +18,7 @@ build:
scripts:
build: "taskcluster/host-build.sh"
package: "taskcluster/package.sh"
nc_asset_name: "native_client.amd64.cpu.linux.tar.xz"
metadata:
name: "DeepSpeech Linux AMD64 CPU"
description: "Building DeepSpeech for Linux/AMD64, CPU only, optimized version"

View File

@ -17,6 +17,7 @@ build:
scripts:
build: "taskcluster/cuda-build.sh"
package: "taskcluster/package.sh"
nc_asset_name: "native_client.amd64.cuda.linux.tar.xz"
metadata:
name: "DeepSpeech Linux AMD64 CUDA"
description: "Building DeepSpeech for Linux/AMD64, CUDA-enabled, optimized version"

View File

@ -21,6 +21,7 @@ build:
scripts:
build: "taskcluster/arm64-build.sh"
package: "taskcluster/package.sh"
nc_asset_name: "native_client.arm64.cpu.linux.tar.xz"
metadata:
name: "DeepSpeech Linux ARM64 Cortex-A53 CPU"
description: "Building DeepSpeech for Linux ARM64 Cortex-A53, CPU only, optimized version"

View File

@ -17,6 +17,7 @@ then:
else: { $fromNow: '7 days' }
extra:
nc_asset_name: { $eval: build.nc_asset_name }
github:
$if: '(event.event == "push") || (event.event == "tag")'
then: { $eval: taskcluster.github_events.merge }

View File

@ -21,6 +21,7 @@ build:
scripts:
build: "taskcluster/rpi3-build.sh"
package: "taskcluster/package.sh"
nc_asset_name: "native_client.rpi3.cpu.linux.tar.xz"
metadata:
name: "DeepSpeech Linux RPi3/ARMv7 CPU"
description: "Building DeepSpeech for Linux RPi3 ARMv7, CPU only, optimized version"

View File

@ -8,6 +8,8 @@ build:
- "linux-amd64-gpu-opt"
- "linux-rpi3-cpu-opt"
- "node-package"
- "android-arm64-cpu-opt"
- "android-armv7-cpu-opt"
allowed:
- "tag"
ref_match: "refs/tags/"
@ -34,6 +36,8 @@ build:
- "linux-amd64-gpu-opt"
- "linux-rpi3-cpu-opt"
- "linux-arm64-cpu-opt"
- "android-arm64-cpu-opt"
- "android-armv7-cpu-opt"
metadata:
name: "DeepSpeech GitHub Packages"
description: "Trigger Uploading of DeepSpeech Packages to GitHub release page"