disabled cuda

2 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77a1e32ef078..a0593d0d2304 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
 pkgbase = kaldi
 	pkgdesc = Speech recognition research toolkit
-	pkgver = 5.5.r8988.00625e851
+	pkgver = 5.5.r9016.ebb43a76e
 	pkgrel = 1
 	url = https://github.com/kaldi-asr/kaldi
 	arch = x86_64
 	arch = i686
 	license = APACHE
-	makedepends = cub
-	makedepends = cuda
 	makedepends = git
 	makedepends = wget
 	makedepends = sed
@@ -15,7 +13,6 @@ pkgbase = kaldi
 	depends = kaldi-openfst
 	depends = lapack
 	depends = python2
-	optdepends = cub
 	optdepends = cuda
 	optdepends = kaldi-irstlm
 	optdepends = kaldi-kaldi_lm
diff --git a/PKGBUILD b/PKGBUILD
index 05de5ddda23b..05340a972d85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Jingbei Li <i@jingbei.lli>
 pkgname='kaldi'
 pkgdesc='Speech recognition research toolkit'
-pkgver=5.5.r8988.00625e851
+pkgver=5.5.r9016.ebb43a76e
 pkgrel=1
 depends=('cblas' 'kaldi-openfst' 'lapack' 'python2')
-optdepends=('cub' 'cuda' 'kaldi-irstlm' 'kaldi-kaldi_lm' 'kaldi-sctk' 'kaldi-sph2pipe' 'kaldi-srilm')
-makedepends=('cub' 'cuda' 'git' 'wget' 'sed')
+optdepends=('cuda' 'kaldi-irstlm' 'kaldi-kaldi_lm' 'kaldi-sctk' 'kaldi-sph2pipe' 'kaldi-srilm')
+makedepends=('git' 'wget' 'sed')
 arch=('x86_64' 'i686')
 url='https://github.com/kaldi-asr/kaldi'
 license=('APACHE')
@@ -26,23 +26,24 @@ prepare(){
 	cd $srcdir/$pkgname
 	find . -name '*.py' -exec sed '1s/python/python2/' -i {} \;
 
-	if (pacman -Q cuda &> /dev/null); then
+	if (false && pacman -Q cuda &> /dev/null); then
 		msg2 "Compiling with CUDA support"
 		_cuda_config_opts="--cudatk-dir=/opt/cuda"
 	else
-		msg2 "Compiling _without_ CUDA support"
+		msg2 "Compiling without CUDA support"
+		_cuda_config_opts="--use-cuda=no"
 	fi
 }
 
 build () {
 	cd $srcdir/$pkgname/src
-	CXX=/opt/cuda/bin/g++ \
+	#CXX=/opt/cuda/bin/g++ \
 	LDFLAGS='-lcblas -llapack' \
 	./configure $_cuda_config_opts \
 		--shared \
 		--fst-root=/opt/kaldi/tools/openfst \
-		--cub-root=/usr/include \
 		--clapack-root=/usr
+	#	--cub-root=/usr/include \
 	make depend
 	make
 }
@@ -56,23 +57,22 @@ package () {
 	done
 	rm -f src/*/*.{cc,cu,o,a,orig}
 	rm -r src/{doc,feat/test_data,lm/examples,lm/test_data,makefiles,onlinebin,probe}
-	find src \
+	find src \( \
 		-name 'Makefile*' \
 		-or -name 'README' \
-		-exec rm {} \;
-	find src \
-		-name '*.mk' \
-		-not -name 'kaldi.mk' \
-		-exec rm {} \;
+		-or -name 'CMake*' \
+		-or -name '*.mk' \
+		-not -name 'kaldi.mk'\
+		\) -exec rm {} \;
 	find src -maxdepth 1 -type f -not -name 'kaldi.mk' -exec rm {} \;
 	rm -r tools/{ATLAS_headers,CLAPACK,INSTALL,Makefile}
 
 	sed "s|$srcdir|/opt|g" -i `grep $srcdir . -rIl`
 	find . -name 'path.sh' -exec sed 's?^\(export KALDI_ROOT\)=.*$?\1=/opt/'$pkgname'?' -i {} \;
-	echo "export OPENFST=/opt/$pkgname/$(find /opt/$pkgname/tools -type d -name 'openfst*')" >> tools/env.sh
+	echo "export OPENFST=$(find /opt/$pkgname/tools -type d -name 'openfst*')" >> tools/env.sh
 	echo 'export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:${OPENFST}/lib' >> tools/env.sh
-	echo "export IRSTLM=/opt/kaldi/tools/irstlm" >> tools/env.sh
-	echo "export export PATH=${PATH}:${IRSTLM}/bin" >> tools/env.sh
+	echo "export IRSTLM=/opt/$pkgname/tools/irstlm" >> tools/env.sh
+	echo 'export PATH=${PATH}:${IRSTLM}/bin' >> tools/env.sh
 
 	install -dm755 "$pkgdir"/etc/ld.so.conf.d/
 	echo "/opt/$pkgname/src/lib" > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf