summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy Tang <jcftang@gmail.com>2019-10-01 18:24:03 +0100
committerPeter Scheibel <scheibel1@llnl.gov>2019-10-01 10:24:03 -0700
commita7e64e539699a6b2387ec393f36b511e84833625 (patch)
treea71a079209387a1e9cda17179eb8f8436f4483d6
parent5868e0f5f2459b7587d79ad475c106665322213c (diff)
downloadspack-a7e64e539699a6b2387ec393f36b511e84833625.tar.gz
spack-a7e64e539699a6b2387ec393f36b511e84833625.tar.bz2
spack-a7e64e539699a6b2387ec393f36b511e84833625.tar.xz
spack-a7e64e539699a6b2387ec393f36b511e84833625.zip
Kaldi package: add version 7637de7 and egs (#12911)
-rw-r--r--var/spack/repos/builtin/packages/kaldi/package.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py
index 461929b228..8455763add 100644
--- a/var/spack/repos/builtin/packages/kaldi/package.py
+++ b/var/spack/repos/builtin/packages/kaldi/package.py
@@ -18,6 +18,7 @@ class Kaldi(Package): # Does not use Autotools
git = "https://github.com/kaldi-asr/kaldi.git"
version('master')
+ version('2019-07-29', commit='7637de77e0a77bf280bef9bf484e4f37c4eb9475')
version('2018-07-11', commit='6f2140b032b0108bc313eefdca65151289642773')
version('2015-10-07', commit='c024e8aa0a727bf76c91a318f76a1f8b0b59249e')
@@ -35,6 +36,8 @@ class Kaldi(Package): # Does not use Autotools
depends_on('speex', type='run')
depends_on('openfst@1.4.1-patch', when='@2015-10-07')
depends_on('openfst@1.6.0:', when='@2018-07-11')
+ depends_on('openfst@1.6.0:', when='@2019-07-29')
+ depends_on('cub', when='@2019-07-29:')
depends_on('openfst')
patch('openfst-1.4.1.patch', when='@2015-10-07')
@@ -69,6 +72,9 @@ class Kaldi(Package): # Does not use Autotools
configure_args.append('--use-cuda=yes')
configure_args.append('--cudatk-dir=' + spec['cuda'].prefix)
+ if spec.satisfies('@2019-07-29:'):
+ configure_args.append('--cub-root=' + spec['cub'].prefix.include)
+
with working_dir("src"):
configure(*configure_args)
make()
@@ -99,3 +105,5 @@ class Kaldi(Package): # Does not use Autotools
mkdirp(join(prefix.include, root.strip("./")))
install(join(root, name),
join(prefix.include, root.strip("./")))
+ egs_dir = join(prefix, 'egs')
+ install_tree('egs', egs_dir)