Deepspeech 2.0

3 files changed, 121 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0927e4cbe5f..300a43d763d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,33 @@
-# Generated by mksrcinfo v8
-# Sun Dec 17 12:46:12 UTC 2017
 pkgbase = deepspeech
 	pkgdesc = A TensorFlow implementation of Baidu's DeepSpeech architecture
-	pkgver = 0.1.0
-	pkgrel = 2
+	pkgver = 0.2.0
+	pkgrel = 1
 	url = https://github.com/mozilla/DeepSpeech
 	arch = x86_64
 	license = MPL2
 	makedepends = bazel
 	makedepends = python-numpy
+	makedepends = python-scipy
 	makedepends = python-pip
 	makedepends = python-wheel
 	makedepends = python-setuptools
-	depends = python-tensorflow
-	depends = python-scipy
-	source = deepspeech-0.1.0.tar.gz:https://github.com/mozilla/DeepSpeech/archive/v0.1.0.tar.gz
-	source = git+https://github.com/mozilla/tensorflow.git
-	sha512sums = 4103ac9bd5cd313f87ad2786133aafb70211f420e1856187cf47ab7f6bc824f79033b8fbae7a3e2d8981a5f63d61b8f5428e0ffe5c849333dc7d9e2c710a1f3a
+	makedepends = git
+	makedepends = sox
+	makedepends = swig
+	source = deepspeech-0.2.0.tar.gz::https://github.com/mozilla/DeepSpeech/archive/v0.2.0.tar.gz
+	source = git+https://github.com/mozilla/tensorflow.git#branch=r1.6
+	source = 17508.patch
+	sha512sums = 3298a6f1a80865e933796ed386b8988f04d546752e79cc1f18b1adf389523f35fb4e6ae5ce85988da529bfd479b02fccab5c080af27a879d05fce6e617c0ad11
 	sha512sums = SKIP
+	sha512sums = 18e3b22e956bdd759480d2e94212eb83d6a59381f34bbc7154cadbf7f42686c2f703cc61f81e6ebeaf1da8dc5de8472e5afc6012abb1720cadb68607fba8e8e1
 
 pkgname = deepspeech
+	depends = sox
+
+pkgname = python-deepspeech
+	pkgdesc = DeepSpeech Python bindings
+	depends = deepspeech
+	depends = python
+	depends = python-scipy
+	depends = python-numpy
 
diff --git a/17508.patch b/17508.patch
new file mode 100644
index 000000000000..50d627c08e3f
--- /dev/null
+++ b/17508.patch
@@ -0,0 +1,28 @@
+From 340327dc8cc637fef01e66f7dd7cae68ce259b94 Mon Sep 17 00:00:00 2001
+From: Yun Peng <pcloudy@google.com>
+Date: Wed, 7 Mar 2018 13:50:31 +0100
+Subject: [PATCH] jpeg.BUILD: Using --cpu instead of --android_cpu
+
+---
+ third_party/jpeg/jpeg.BUILD | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/jpeg/jpeg.BUILD b/third_party/jpeg/jpeg.BUILD
+index 87a23925c43..4418ac32fc4 100644
+--- a/third_party/jpeg/jpeg.BUILD
++++ b/third_party/jpeg/jpeg.BUILD
+@@ -526,12 +526,12 @@ config_setting(
+
+ config_setting(
+     name = "armeabi-v7a",
+-    values = {"android_cpu": "armeabi-v7a"},
++    values = {"cpu": "armeabi-v7a"},
+ )
+
+ config_setting(
+     name = "arm64-v8a",
+-    values = {"android_cpu": "arm64-v8a"},
++    values = {"cpu": "arm64-v8a"},
+ )
+
+ config_setting(
diff --git a/PKGBUILD b/PKGBUILD
index 4e1b806baf40..776fb6848c04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,86 @@
-# Maintainer: Jonas Heinrich <onny@project-insanity.org>
+# Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
+# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
-pkgname=deepspeech
-pkgver=0.1.0
-pkgrel=2
+pkgbase=deepspeech
+pkgname=('deepspeech' 'python-deepspeech')
+_pkgname=DeepSpeech
+pkgver=0.2.0
+pkgrel=1
 pkgdesc="A TensorFlow implementation of Baidu's DeepSpeech architecture"
 arch=('x86_64')
 url="https://github.com/mozilla/DeepSpeech"
 license=('MPL2')
-makedepends=('bazel' 'python-numpy' 'python-pip' 'python-wheel' 'python-setuptools')
-depends=('python-tensorflow' 'python-scipy')
-source=("deepspeech-${pkgver}.tar.gz:https://github.com/mozilla/DeepSpeech/archive/v${pkgver}.tar.gz"
-	"git+https://github.com/mozilla/tensorflow.git")
-sha512sums=('4103ac9bd5cd313f87ad2786133aafb70211f420e1856187cf47ab7f6bc824f79033b8fbae7a3e2d8981a5f63d61b8f5428e0ffe5c849333dc7d9e2c710a1f3a'
-	    'SKIP')
-
-prepare() {
-  cd "$srcdir/tensorflow"
-  # These environment variables influence the behavior of the configure call below.
-  export PYTHON_BIN_PATH=/usr/bin/python
-  export USE_DEFAULT_PYTHON_LIB_PATH=1
-  export TF_NEED_JEMALLOC=1
-  export TF_NEED_GCP=0
-  export TF_NEED_HDFS=0
-  export TF_NEED_S3=0
-  export TF_ENABLE_XLA=1
-  export TF_NEED_GDR=0
-  export TF_NEED_VERBS=0
-  export TF_NEED_OPENCL=0
-  export TF_NEED_MPI=0
-  ln -sf ../DeepSpeech-${pkgver}/native_client ./
+makedepends=('bazel' 'python-numpy' 'python-scipy' 'python-pip' 'python-wheel' 'python-setuptools' 'git' 'sox' 'swig')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/mozilla/DeepSpeech/archive/v${pkgver//_/-}.tar.gz"
+        "git+https://github.com/mozilla/tensorflow.git#branch=r1.6"
+        17508.patch)
+sha512sums=('3298a6f1a80865e933796ed386b8988f04d546752e79cc1f18b1adf389523f35fb4e6ae5ce85988da529bfd479b02fccab5c080af27a879d05fce6e617c0ad11'
+            'SKIP'
+            '18e3b22e956bdd759480d2e94212eb83d6a59381f34bbc7154cadbf7f42686c2f703cc61f81e6ebeaf1da8dc5de8472e5afc6012abb1720cadb68607fba8e8e1')
+
+prepare()
+{
+	patch -Np1 -i ${srcdir}/17508.patch -d tensorflow
+	cd "$srcdir/tensorflow"
+
+	# These environment variables influence the behavior of the configure call below.
+	export PYTHON_BIN_PATH=/usr/bin/python
+	export USE_DEFAULT_PYTHON_LIB_PATH=1
+	export TF_NEED_JEMALLOC=1
+	export TF_NEED_KAFKA=0
+	export TF_NEED_OPENCL_SYCL=0
+	export TF_NEED_GCP=0
+	export TF_NEED_HDFS=0
+	export TF_NEED_S3=0
+	export TF_ENABLE_XLA=1
+	export TF_NEED_GDR=0
+	export TF_NEED_VERBS=0
+	export TF_NEED_OPENCL=0
+	export TF_NEED_MPI=0
+	export TF_NEED_TENSORRT=0
+	export TF_SET_ANDROID_WORKSPACE=0
+	ln -sf "../${_pkgname}-${pkgver//_/-}/native_client" ./
 }
 
 build() {
-  cd "$srcdir/tensorflow"
-  export CC_OPT_FLAGS="-march=x86-64"
-  export TF_NEED_CUDA=0
-  ./configure
-  bazel build -c opt --copt=-O3 //tensorflow:libtensorflow_cc.so //tensorflow:libtensorflow_framework.so //native_client:deepspeech //native_client:deepspeech_utils //native_client:ctc_decoder_with_kenlm //native_client:generate_trie
-
-  cd "${srcdir}/DeepSpeech-${pkgver}/native_client"
-  make deepspeech
+	cd "$srcdir/tensorflow"
+	export CC_OPT_FLAGS="-march=x86-64"
+	export TF_NEED_CUDA=0
+	./configure
+
+	bazel build -c opt --copt=-mtune=generic --copt=-march=x86-64 --copt=-msse \
+		--copt=-msse2 --copt=-msse3 --copt=-msse4.1 --copt=-msse4.2 \
+		--copt=-mavx --copt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+		//native_client:libctc_decoder_with_kenlm.so
+
+	bazel build --config=monolithic -c opt --copt=-mtune=generic \
+		--copt=-march=x86-64 --copt=-msse --copt=-msse2 --copt=-msse3 \
+		--copt=-msse4.1 --copt=-msse4.2 --copt=-mavx \
+		--copt="-D_GLIBCXX_USE_CXX11_ABI=0" --copt=-fvisibility=hidden \
+		//native_client:libdeepspeech.so \
+		//native_client:generate_trie
+
+	cd "${srcdir}/${_pkgname}-${pkgver//_/-}/native_client"
+	make deepspeech
+    # TODO fix python bindings
+	#make bindings
+}
+
+package_deepspeech() {
+	depends=('sox')
+	cd "${srcdir}/${_pkgname}-${pkgver//_/-}/native_client"
+	PREFIX=${pkgdir}/usr make install
 }
 
-package() {
-  cd "${srcdir}/DeepSpeech-${pkgver}/native_client"
-  PREFIX="${pkgdir}/usr" make install
+package_python-deepspeech() {
+	pkgdesc="DeepSpeech Python bindings"
+	depends=('deepspeech' 'python' 'python-scipy' 'python-numpy')
+	cd "${srcdir}/${_pkgname}-${pkgver//_/-}/native_client"
+	#PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps dist/deepspeech*.whl
+
+	# Reuse deepspeech .so files
+	#mv "$pkgdir/usr/bin/deepspeech" "$pkgdir/usr/bin/deepspeech_python"
+	#rm -rf "$pkgdir/usr/lib/python3.6/site-packages/deepspeech/lib"
+	#ln -s /usr/lib "$pkgdir/usr/lib/python3.6/site-packages/deepspeech/lib"
 }