kaldi: new version 2021-11-16 (#28154)

* [kaldi] Added version 2021-11-16

* [kaldi] Added logic for new version and when cuda 11 is used

* [kaldi] Added patch file when cuda 11 as cub is now built into it

* [kaldi] removed .999 and simplified some logic

Co-authored-by: Doug Heckman <dahdco@rit.edu>

var/spack/repos/builtin/packages/kaldi/0001_CMakeLists_txt.patch

@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt	2021-11-16 14:42:46.804731428 -0500
++++ b/CMakeLists.txt	2021-11-18 10:13:53.680398003 -0500
+@@ -158,10 +158,7 @@
+     include_directories(${NvToolExt_INCLUDE_DIR})
+     link_libraries(${NvToolExt_LIBRARIES})
+ 
+-    get_third_party(cub)
+-    set(CUB_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/cub")
+-    find_package(CUB REQUIRED)
+-    include_directories(${CUB_INCLUDE_DIR})
++    include_directories(${CUDA_INCLUDE_DIRS})
+ endif()
+ 
+ add_definitions(-DKALDI_NO_PORTAUDIO=1)

var/spack/repos/builtin/packages/kaldi/package.py

@@ -19,6 +19,7 @@ class Kaldi(Package):    # Does not use Autotools
     git      = "https://github.com/kaldi-asr/kaldi.git"
 
     version('master')
+    version('2021-11-16', commit='6e03a3f5f99d6d8c22494d90b7e7f9ceb0117ac8')
     version('2019-09-29', commit='6ffde4b41c58de778245149690927d592cd5956a')
     version('2019-07-29', commit='7637de77e0a77bf280bef9bf484e4f37c4eb9475')
     version('2018-07-11', commit='6f2140b032b0108bc313eefdca65151289642773')
@@ -40,9 +41,10 @@ class Kaldi(Package):    # Does not use Autotools
     depends_on('openfst@1.6.0:', when='@2018-07-11')
     depends_on('openfst@1.6.0:', when='@2019-07-29')
     depends_on('openfst@1.6.7:1.7.3', when='@2019-09-29:')
-    depends_on('cub', when='@2019-07-29:')
+    depends_on('cub', when='@2019-07-29:^cuda@:10')
 
     patch('openfst-1.4.1.patch', when='@2015-10-07')
+    patch('0001_CMakeLists_txt.patch', when='+cuda@11:')
 
     # Change process of version analysis when using Fujitsu compiler.
     patch('fujitsu_fix_version_analysis.patch', when='@2018-07-11:%fj')
@@ -51,6 +53,7 @@ def install(self, spec, prefix):
         configure_args = ['--fst-root=' + spec['openfst'].prefix]
         configure_args.append('--fst-version=' + str(spec['openfst'].version))
         configure_args.append('--speex-root=' + spec['speex'].prefix)
+        configure_args.append('--cub-root=' + spec['cuda'].prefix.include)
 
         if '~shared' in spec:
             configure_args.append('--static')
@@ -77,7 +80,7 @@ def install(self, spec, prefix):
             configure_args.append('--use-cuda=yes')
             configure_args.append('--cudatk-dir=' + spec['cuda'].prefix)
 
-        if spec.satisfies('@2019-07-29:'):
+        if spec.satisfies('@2019-07-29: ^cuda@:10'):
             configure_args.append('--cub-root=' + spec['cub'].prefix.include)
 
         with working_dir("src"):