diff --git a/.install b/.install index ba67de54..917f6f97 100755 --- a/.install +++ b/.install @@ -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 diff --git a/Dockerfile b/Dockerfile index 94282689..5d7d6f64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/README.md b/README.md index 9fb11a85..5310fd51 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/VERSION b/VERSION index 0e633113..27177a94 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.0-alpha.1 +0.4.0-alpha.2 diff --git a/requirements.txt b/requirements.txt index 0199460a..746bca27 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pandas progressbar2 python-utils -tensorflow == 1.12.0rc2 +tensorflow == 1.12.0 numpy matplotlib scipy diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml index 309d26b0..051acc37 100644 --- a/taskcluster/.build.yml +++ b/taskcluster/.build.yml @@ -18,6 +18,7 @@ build: scripts: build: '' package: '' + nc_asset_name: 'native_client.tar.xz' args: tests_cmdline: '' convert_graphdef: '' diff --git a/taskcluster/android-arm64-cpu-opt.yml b/taskcluster/android-arm64-cpu-opt.yml index 53bc920b..4fe0c470 100644 --- a/taskcluster/android-arm64-cpu-opt.yml +++ b/taskcluster/android-arm64-cpu-opt.yml @@ -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" diff --git a/taskcluster/android-armv7-cpu-opt.yml b/taskcluster/android-armv7-cpu-opt.yml index 7f09f0e7..0d323edc 100644 --- a/taskcluster/android-armv7-cpu-opt.yml +++ b/taskcluster/android-armv7-cpu-opt.yml @@ -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" diff --git a/taskcluster/darwin-amd64-cpu-opt.yml b/taskcluster/darwin-amd64-cpu-opt.yml index c06a82c4..28d2d44a 100644 --- a/taskcluster/darwin-amd64-cpu-opt.yml +++ b/taskcluster/darwin-amd64-cpu-opt.yml @@ -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" diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml index 7510a4a5..5ffad79d 100644 --- a/taskcluster/darwin-opt-base.tyml +++ b/taskcluster/darwin-opt-base.tyml @@ -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 } diff --git a/taskcluster/linux-amd64-cpu-opt.yml b/taskcluster/linux-amd64-cpu-opt.yml index 96003a53..83b3d284 100644 --- a/taskcluster/linux-amd64-cpu-opt.yml +++ b/taskcluster/linux-amd64-cpu-opt.yml @@ -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" diff --git a/taskcluster/linux-amd64-gpu-opt.yml b/taskcluster/linux-amd64-gpu-opt.yml index a9f252df..3de1f435 100644 --- a/taskcluster/linux-amd64-gpu-opt.yml +++ b/taskcluster/linux-amd64-gpu-opt.yml @@ -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" diff --git a/taskcluster/linux-arm64-cpu-opt.yml b/taskcluster/linux-arm64-cpu-opt.yml index 680d82db..424037e2 100644 --- a/taskcluster/linux-arm64-cpu-opt.yml +++ b/taskcluster/linux-arm64-cpu-opt.yml @@ -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" diff --git a/taskcluster/linux-opt-base.tyml b/taskcluster/linux-opt-base.tyml index c6fa9baa..e8dcda28 100644 --- a/taskcluster/linux-opt-base.tyml +++ b/taskcluster/linux-opt-base.tyml @@ -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 } diff --git a/taskcluster/linux-rpi3-cpu-opt.yml b/taskcluster/linux-rpi3-cpu-opt.yml index 79d43084..fe8798b1 100644 --- a/taskcluster/linux-rpi3-cpu-opt.yml +++ b/taskcluster/linux-rpi3-cpu-opt.yml @@ -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" diff --git a/taskcluster/scriptworker-task-github.yml b/taskcluster/scriptworker-task-github.yml index 064caeb4..37a37efc 100644 --- a/taskcluster/scriptworker-task-github.yml +++ b/taskcluster/scriptworker-task-github.yml @@ -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"