zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add patched openfst-1.4.1 and kaldi@c024e8 required by CNTK. (#3806)

Browse Source
This commit is contained in:
健美猫
2017-04-18 19:56:18 +08:00
committed by Adam J. Stewart
parent fc938962fa
commit 4e95525280
5 changed files with 321 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
var/spack/repos/builtin/packages/kaldi/openfst-1.4.1.patch Normal file
View File

@@ -0,0 +1,45 @@
From ef1c38844fd4c40304176f4e672189010805a3d9 Mon Sep 17 00:00:00 2001
From: Jianwen WEI <weijianwen@gmail.com>
Date: Thu, 13 Apr 2017 15:17:12 +0800
Subject: [PATCH 1/1] Add a patched openfst@1.4.1-patch for Kaldi.
---
src/configure | 4 ++--
tools/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/configure b/src/configure
index c90e9ba4e..ff328772c 100755
--- a/src/configure
+++ b/src/configure
@@ -793,9 +793,9 @@ echo "CONFIGURE_VERSION := $CONFIGURE_VERSION" >> kaldi.mk
echo "FSTROOT = $FSTROOT" >> kaldi.mk
# Check installed OpenFst version and add C++11 flags if OpenFst >= 1.4
-OPENFST_VER=`grep 'PACKAGE_VERSION' $FSTROOT/Makefile | sed -e 's:.*= ::'`
+OPENFST_VER=1.4.1
echo "OPENFST_VER = $OPENFST_VER" >> kaldi.mk
-OPENFST_VER_NUM=`echo $OPENFST_VER | sed 's/\./ /g' | xargs printf "%d%02d%02d"`
+OPENFST_VER_NUM=104001
if [ $OPENFST_VER_NUM -ge 10400 ]; then
echo "OPENFST_GE_10400 = 1" >> kaldi.mk
echo "EXTRA_CXXFLAGS += -DHAVE_OPENFST_GE_10400 -std=c++0x" >> kaldi.mk
diff --git a/tools/Makefile b/tools/Makefile
index cb3a35b2a..b868e600a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,9 +3,9 @@
CXX = g++
# CXX = clang++ # Uncomment this line to build with Clang.
-OPENFST_VERSION = 1.3.4
+# OPENFST_VERSION = 1.3.4
# Uncomment the next line to build with OpenFst-1.4.1.
-# OPENFST_VERSION = 1.4.1
+OPENFST_VERSION = 1.4.1
# Note: OpenFst >= 1.4 requires C++11 support, hence you will need to use a
# relatively recent C++ compiler, e.g. gcc >= 4.6, clang >= 3.0.
--
2.11.1

23
var/spack/repos/builtin/packages/kaldi/package.py
View File

@@ -38,6 +38,8 @@ class Kaldi(Package): # Does not use Autotools
url = "https://github.com/kaldi-asr/kaldi/archive/master.zip"
version('master', git='https://github.com/kaldi-asr/kaldi.git')
version('c024e8', git='https://github.com/kaldi-asr/kaldi.git',
commit='c024e8aa0a727bf76c91a318f76a1f8b0b59249e')
variant('shared', default=True,
description='build shared libraries')
@@ -47,19 +49,22 @@ class Kaldi(Package): # Does not use Autotools
description='build with CUDA')
depends_on('blas')
depends_on('speex')
depends_on('openfst@1.6:')
depends_on('cuda', when='+cuda')
depends_on('sph2pipe', type='run')
depends_on('sctk', type='run')
depends_on('speex', type='run')
depends_on('openfst@1.4.1-patch', when='@c024e8')
depends_on('openfst')
patch('openfst-1.4.1.patch', when='@c024e8')
def install(self, spec, prefix):
configure_args = [
'--threaded-math',
'--speex-root=' + spec['speex'].prefix,
'--fst-root=' + spec['openfst'].prefix,
'--fst-version=' + str(spec['openfst'].version)
]
configure_args = ['--fst-root=' + spec['openfst'].prefix]
if spec.satisfies('c024e8'):
configure_args.append('--speex-root=' + spec['speex'].prefix)
configure_args.append('--fst-version=' +
str(spec['openfst'].version))
if '~shared' in spec:
configure_args.append('--static')
@@ -70,7 +75,7 @@ def install(self, spec, prefix):
configure_args.append('--mathlib=OPENBLAS')
configure_args.append('--openblas-root=' + spec['blas'].prefix)
if '+openmp' in spec['blas'].variants:
configure_args.append('--threaded-math')
configure_args.append('--threaded-math=yes')
elif '^atlas' in spec:
configure_args.append('--mathlib=ATLAS')
configure_args.append('--atlas-root=' + spec['blas'].prefix)