experiments/STT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3043 from mozilla/version-not-symlink

Browse Source 
Move VERSION and GRAPH_VERSION to training directory
This commit is contained in:
Reuben Morais 2020-06-08 14:34:28 +02:00 committed by GitHub
commit 572963e7bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@ -194,16 +194,17 @@ WORKDIR /DeepSpeech/
RUN pip3 install tensorflow-gpu==1.15.0 RUN pip3 install tensorflow-gpu==1.15.0
# Make DeepSpeech and install Python bindings # Build client.cc and install Python client and decoder bindings
ENV TFDIR /tensorflow ENV TFDIR /tensorflow
WORKDIR /DeepSpeech/native_client WORKDIR /DeepSpeech/native_client
RUN make deepspeech RUN make deepspeech
WORKDIR /DeepSpeech/native_client/python
RUN make bindings WORKDIR /DeepSpeech
RUN pip3 install --upgrade dist/deepspeech* RUN cd native_client/python && make bindings
WORKDIR /DeepSpeech/native_client/ctcdecode RUN pip3 install --upgrade native_client/python/dist/*.whl
RUN make bindings
RUN pip3 install --upgrade dist/*.whl RUN cd native_client/ctcdecode && make bindings
RUN pip3 install --upgrade native_client/ctcdecode/dist/*.whl
# << END Build and bind # << END Build and bind

1
GRAPH_VERSION
View File

@ -1 +0,0 @@
6

1
GRAPH_VERSION Symbolic link
View File

@ -0,0 +1 @@
training/deepspeech_training/GRAPH_VERSION

1
VERSION
View File

@ -1 +0,0 @@
0.7.3

1
VERSION Symbolic link
View File

@ -0,0 +1 @@
training/deepspeech_training/VERSION

4
native_client/bazel_workspace_status_cmd.sh
View File

@ -22,8 +22,8 @@ echo "STABLE_TF_GIT_VERSION ${tf_git_rev}"
pushd $(dirname "$0") pushd $(dirname "$0")
ds_git_rev=$(git describe --long --tags) ds_git_rev=$(git describe --long --tags)
echo "STABLE_DS_GIT_VERSION ${ds_git_rev}" echo "STABLE_DS_GIT_VERSION ${ds_git_rev}"
ds_version=$(cat ../VERSION) ds_version=$(cat ../training/deepspeech_training/VERSION)
echo "STABLE_DS_VERSION ${ds_version}" echo "STABLE_DS_VERSION ${ds_version}"
ds_graph_version=$(cat ../GRAPH_VERSION) ds_graph_version=$(cat ../training/deepspeech_training/GRAPH_VERSION)
echo "STABLE_DS_GRAPH_VERSION ${ds_graph_version}" echo "STABLE_DS_GRAPH_VERSION ${ds_graph_version}"
popd popd

2
native_client/ctcdecode/setup.py
View File

@ -51,7 +51,7 @@ def maybe_rebuild(srcs, out_name, build_dir):
num_parallel=known_args.num_processes, num_parallel=known_args.num_processes,
debug=debug) debug=debug)
project_version = read('../../VERSION').strip() project_version = read('../../training/deepspeech_training/VERSION').strip()
build_dir = 'temp_build/temp_build' build_dir = 'temp_build/temp_build'

2
native_client/javascript/Makefile
View File

@ -3,7 +3,7 @@ NODE_ABI_TARGET ?=
NODE_BUILD_VERBOSE ?= --verbose NODE_BUILD_VERBOSE ?= --verbose
NPM_TOOL ?= npm NPM_TOOL ?= npm
PROJECT_NAME ?= deepspeech PROJECT_NAME ?= deepspeech
PROJECT_VERSION ?= $(shell cat ../../VERSION | tr -d '\n') PROJECT_VERSION ?= $(shell cat ../../training/deepspeech_training/VERSION | tr -d '\n')
NPM_ROOT ?= $(shell npm root) NPM_ROOT ?= $(shell npm root)
NODE_MODULES_BIN ?= $(NPM_ROOT)/.bin/ NODE_MODULES_BIN ?= $(NPM_ROOT)/.bin/

2
native_client/python/setup.py
View File

@ -31,7 +31,7 @@ def main():
sys.argv.remove('--project_name') sys.argv.remove('--project_name')
sys.argv.pop(project_name_idx) sys.argv.pop(project_name_idx)
with open('../../VERSION', 'r') as ver: with open('../../training/deepspeech_training/VERSION', 'r') as ver:
project_version = ver.read().strip() project_version = ver.read().strip()
class BuildExtFirst(build): class BuildExtFirst(build):

2
taskcluster/tc-all-vars.sh
View File

@ -57,7 +57,7 @@ export DS_TFDIR=${DS_ROOT_TASK}/DeepSpeech/tf
export DS_DSDIR=${DS_ROOT_TASK}/DeepSpeech/ds export DS_DSDIR=${DS_ROOT_TASK}/DeepSpeech/ds
export DS_EXAMPLEDIR=${DS_ROOT_TASK}/DeepSpeech/examples export DS_EXAMPLEDIR=${DS_ROOT_TASK}/DeepSpeech/examples
export DS_VERSION="$(cat ${DS_DSDIR}/VERSION)" export DS_VERSION="$(cat ${DS_DSDIR}/training/deepspeech_training/VERSION)"
export GRADLE_USER_HOME=${DS_ROOT_TASK}/gradle-cache export GRADLE_USER_HOME=${DS_ROOT_TASK}/gradle-cache
export ANDROID_SDK_HOME=${DS_ROOT_TASK}/DeepSpeech/Android/SDK/ export ANDROID_SDK_HOME=${DS_ROOT_TASK}/DeepSpeech/Android/SDK/

1
training/deepspeech_training/GRAPH_VERSION
View File

@ -1 +0,0 @@
../../GRAPH_VERSION

1
training/deepspeech_training/GRAPH_VERSION Normal file
View File

@ -0,0 +1 @@
6

1
training/deepspeech_training/VERSION
View File

@ -1 +0,0 @@
../../VERSION

1
training/deepspeech_training/VERSION Normal file
View File

@ -0,0 +1 @@
0.7.3