Merge pull request #140 from lissyx/fixes-0.5.1

Fixes 0.5.1
common-voice · Aug 26, 2020 · 35b7828 · 35b7828
2 parents 5ab025a + 23e16fc
commit 35b7828
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/DeepSpeech/Dockerfile.train b/DeepSpeech/Dockerfile.train
@@ -173,6 +173,9 @@ RUN patch -p1 < corpora.patch
 # Avoid "error: pandas 1.1.0 is installed but pandas==1.0.5 is required by {'modin'}"
 RUN pip install pandas==1.0.5
 
+# error: parso 0.8.0 is installed but parso<0.8.0,>=0.7.0 is required by {'jedi'}
+RUN pip install parso==0.7.0
+
 RUN python setup.py install
 
 WORKDIR $HOMEDIR

diff --git a/DeepSpeech/build_lm.sh b/DeepSpeech/build_lm.sh
@@ -18,8 +18,7 @@ popd
 
 pushd $HOME/ds/
 
-	if [ ! -f "/mnt/lm/kenlm.scorer" ]; then
-
+	if [ ! -f "/mnt/lm/lm.binary" ]; then
 		python data/lm/generate_lm.py \
 			--input_txt /mnt/extracted/sources_lm.txt \
 			--output_dir /mnt/lm/ \
@@ -31,15 +30,16 @@ pushd $HOME/ds/
 			--binary_a_bits 255 \
 			--binary_q_bits 8 \
 			--binary_type trie
-
-		./generate_scorer_package \
-			--alphabet /mnt/models/alphabet.txt \
-			--lm /mnt/lm/lm.binary \
-			--vocab /mnt/lm/vocab-${LM_TOP_K}.txt \
-			--package /mnt/lm/kenlm.scorer \
-			--default_alpha ${LM_ALPHA} \
-			--default_beta ${LM_BETA}
 	fi;
+
+	./generate_scorer_package \
+		--alphabet /mnt/models/alphabet.txt \
+		--lm /mnt/lm/lm.binary \
+		--vocab /mnt/lm/vocab-${LM_TOP_K}.txt \
+		--package /mnt/lm/kenlm.scorer \
+		--default_alpha ${LM_ALPHA} \
+		--default_beta ${LM_BETA}
+
 popd
 
 if [ "${ENGLISH_COMPATIBLE}" = "1" ]; then

diff --git a/DeepSpeech/fr/metadata.sh b/DeepSpeech/fr/metadata.sh
@@ -9,5 +9,5 @@ export METADATA_CONTACT_INFO="https://discourse.mozilla.org/c/voice/fr"
 export METADATA_LICENSE="MIT-0"
 export METADATA_LANGUAGE="fr-FR"
 export METADATA_MIN_DS_VERSION="0.7"
-export METADATA_MAX_DS_VERSION="0.8"
+export METADATA_MAX_DS_VERSION="0.9"
 export METADATA_DESCRIPTION="A free and re-usable French model for DeepSpeech"
diff --git a/DeepSpeech/package.sh b/DeepSpeech/package.sh
@@ -7,13 +7,13 @@ pushd /mnt
 	if [ ! -f "model_tensorflow_fr.tar.xz" ]; then
 		tar -cf - \
 			-C /mnt/models/ output_graph.pbmm alphabet.txt \
-			-C /mnt/lm/ lm.binary trie | xz -T0 > model_tensorflow_fr.tar.xz
+			-C /mnt/lm/ kenlm.scorer trie | xz -T0 > model_tensorflow_fr.tar.xz
 	fi;
 
 	if [ ! -f "model_tflite_fr.tar.xz" ]; then
 		tar -cf - \
 			-C /mnt/models/ output_graph.tflite alphabet.txt \
-			-C /mnt/lm/ lm.binary trie | xz -T0 > model_tflite_fr.tar.xz
+			-C /mnt/lm/ kenlm.scorer trie | xz -T0 > model_tflite_fr.tar.xz
 	fi;
 
 	if [ ! -f "checkpoint_fr.tar.xz" ]; then

diff --git a/DeepSpeech/run.sh b/DeepSpeech/run.sh
@@ -5,6 +5,8 @@ set -xe
 THIS=$(dirname "$0")
 export PATH=${THIS}:${THIS}/${MODEL_LANGUAGE}:$PATH
 
+export TF_CUDNN_RESET_RND_GEN_STATE=1
+
 env
 
 checks.sh