Remove sinusoid detection code and old SGMM code/scripts

[LvHang]

@danpovey
As your guidance, I modify something about #1315

1. I remove the sinusoid-detection{-test}.{h,cc} in src/feat and detect-sinusoids.cc in src/featbin and the sgmm/sgmmbin directories. At the same time, I fixed the makefile in the src/, src/feat/ and src/featbin. I try to make and "make clean; make". All goes smoothly.
2. I remove the scripts which call sgmm binaries. After generate the candidates with command "find egs -name 'sgmm' -not -name 'sgmm2' -print", I check each file and remove the files which call old sgmm.
3. I check whether the deleted files are called by other top scripts one by one and modify them.
   Please Check it. Thanks

Best Wishes,
Hang

[danpovey]

Build error, check the dependencies in the Makefile: g++-4.9: error: ../sgmm//libkaldi-sgmm.so: No such file or directory

…

On Mon, Jan 9, 2017 at 10:13 PM, LvHang ***@***.***> wrote: @danpovey <https://github.com/danpovey> As your guidance, I modify something about #1315 <#1315> 1. I remove the sinusoid-detection{-test}.{h,cc} in src/feat and detect-sinusoids.cc in src/featbin and the sgmm/sgmmbin directories. At the same time, I fixed the makefile in the src/, src/feat/ and src/featbin. I try to make and "make clean; make". All goes smoothly. 2. I remove the scripts which call sgmm binaries. After generate the candidates with command "find egs -name '*sgmm*' -not -name '*sgmm2*' -print", I check each file and remove the files which call old sgmm. 3. I check whether the deleted files are called by other top scripts one by one and modify them. Please Check it. Thanks Best Wishes, Hang ------------------------------ You can view, comment on, or merge this pull request online at: #1329 Commit Summary - Remove sinusoid detection code and old SGMM code/scripts File Changes - *D* egs/aurora4/s5/local/run_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-0> (113) - *M* egs/babel/s5/local/decode_helper.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-1> (9) - *M* egs/babel/s5b/local/decode_helper.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-2> (9) - *M* egs/babel/s5c/local/decode_helper.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-3> (9) - *D* egs/gp/s1/local/gp_train_multi_sgmm_deltas.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-4> (359) - *D* egs/gp/s1/steps/decode_sgmm_deltas.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-5> (162) - *D* egs/gp/s1/steps/train_sgmm_deltas.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-6> (270) - *M* egs/gp/s5/run.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-7> (6) - *D* egs/rm/s5/local/run_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-8> (39) - *D* egs/sprakbanken/s5/local/run_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-9> (112) - *D* egs/swbd/s5/local/run_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-10> (38) - *D* egs/swbd/s5b/local/run_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-11> (38) - *D* egs/wsj/s5/local/run_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-12> (112) - *D* egs/wsj/s5/steps/align_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-13> (198) - *M* egs/wsj/s5/steps/align_sgmm2.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-14> (4) - *D* egs/wsj/s5/steps/decode_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-15> (266) - *M* egs/wsj/s5/steps/decode_sgmm2_fromlats.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-16> (2) - *M* egs/wsj/s5/steps/decode_sgmm2_rescore.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-17> (4) - *D* egs/wsj/s5/steps/decode_sgmm_fromlats.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-18> (277) - *D* egs/wsj/s5/steps/decode_sgmm_rescore.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-19> (108) - *D* egs/wsj/s5/steps/make_denlats_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-20> (189) - *D* egs/wsj/s5/steps/tandem/align_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-21> (236) - *D* egs/wsj/s5/steps/tandem/decode_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-22> (303) - *D* egs/wsj/s5/steps/tandem/make_denlats_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-23> (199) - *D* egs/wsj/s5/steps/tandem/train_mmi_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-24> (193) - *D* egs/wsj/s5/steps/tandem/train_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-25> (315) - *D* egs/wsj/s5/steps/train_mmi_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-26> (156) - *D* egs/wsj/s5/steps/train_sgmm.sh <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-27> (280) - *M* src/Makefile <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-28> (19) - *M* src/feat/Makefile <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-29> (7) - *D* src/feat/sinusoid-detection-test.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-30> (452) - *D* src/feat/sinusoid-detection.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-31> (945) - *D* src/feat/sinusoid-detection.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-32> (436) - *M* src/featbin/Makefile <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-33> (4) - *D* src/featbin/detect-sinusoids.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-34> (113) - *D* src/sgmm/Makefile <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-35> (18) - *D* src/sgmm/am-sgmm-test.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-36> (278) - *D* src/sgmm/am-sgmm.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-37> (1395) - *D* src/sgmm/am-sgmm.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-38> (420) - *D* src/sgmm/decodable-am-sgmm.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-39> (72) - *D* src/sgmm/decodable-am-sgmm.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-40> (119) - *D* src/sgmm/estimate-am-sgmm-ebw.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-41> (654) - *D* src/sgmm/estimate-am-sgmm-ebw.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-42> (217) - *D* src/sgmm/estimate-am-sgmm-multi-test.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-43> (154) - *D* src/sgmm/estimate-am-sgmm-multi.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-44> (746) - *D* src/sgmm/estimate-am-sgmm-multi.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-45> (146) - *D* src/sgmm/estimate-am-sgmm-test.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-46> (161) - *D* src/sgmm/estimate-am-sgmm.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-47> (2135) - *D* src/sgmm/estimate-am-sgmm.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-48> (475) - *D* src/sgmm/fmllr-sgmm-test.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-49> (233) - *D* src/sgmm/fmllr-sgmm.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-50> (554) - *D* src/sgmm/fmllr-sgmm.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-51> (192) - *D* src/sgmm/sgmm-clusterable.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-52> (280) - *D* src/sgmm/sgmm-clusterable.h <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-53> (112) - *D* src/sgmmbin/Makefile <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-54> (31) - *D* src/sgmmbin/init-ubm.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-55> (95) - *D* src/sgmmbin/sgmm-acc-fmllrbasis-ali.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-56> (216) - *D* src/sgmmbin/sgmm-acc-stats-ali.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-57> (191) - *D* src/sgmmbin/sgmm-acc-stats-gpost.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-58> (174) - *D* src/sgmmbin/sgmm-acc-stats.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-59> (211) - *D* src/sgmmbin/sgmm-acc-stats2.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-60> (217) - *D* src/sgmmbin/sgmm-acc-tree-stats.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-61> (185) - *D* src/sgmmbin/sgmm-align-compiled.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-62> (179) - *D* src/sgmmbin/sgmm-build-tree.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-63> (201) - *D* src/sgmmbin/sgmm-calc-distances.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-64> (74) - *D* src/sgmmbin/sgmm-cluster-phones.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-65> (148) - *D* src/sgmmbin/sgmm-comp-prexform.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-66> (84) - *D* src/sgmmbin/sgmm-copy.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-67> (74) - *D* src/sgmmbin/sgmm-decode-faster.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-68> (218) - *D* src/sgmmbin/sgmm-est-ebw.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-69> (118) - *D* src/sgmmbin/sgmm-est-fmllr-gpost.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-70> (261) - *D* src/sgmmbin/sgmm-est-fmllr.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-71> (318) - *D* src/sgmmbin/sgmm-est-fmllrbasis.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-72> (93) - *D* src/sgmmbin/sgmm-est-multi.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-73> (233) - *D* src/sgmmbin/sgmm-est-spkvecs-gpost.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-74> (223) - *D* src/sgmmbin/sgmm-est-spkvecs.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-75> (257) - *D* src/sgmmbin/sgmm-est.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-76> (172) - *D* src/sgmmbin/sgmm-gselect.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-77> (125) - *D* src/sgmmbin/sgmm-info.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-78> (110) - *D* src/sgmmbin/sgmm-init-from-tree-stats.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-79> (147) - *D* src/sgmmbin/sgmm-init.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-80> (111) - *D* src/sgmmbin/sgmm-latgen-faster.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-81> (271) - *D* src/sgmmbin/sgmm-latgen-simple.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-82> (232) - *D* src/sgmmbin/sgmm-mixup.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-83> (145) - *D* src/sgmmbin/sgmm-normalize.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-84> (85) - *D* src/sgmmbin/sgmm-post-to-gpost.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-85> (190) - *D* src/sgmmbin/sgmm-rescore-lattice.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-86> (0) - *M* src/sgmmbin/sgmm-sum-accs.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-87> (0) - *M* src/sgmmbin/sgmm-sum-tree-stats.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-88> (0) - *M* src/sgmmbin/sgmm-write-ubm.cc <https://github.com/kaldi-asr/kaldi/pull/1329/files#diff-89> (0) Patch Links: - https://github.com/kaldi-asr/kaldi/pull/1329.patch - https://github.com/kaldi-asr/kaldi/pull/1329.diff — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1329>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ADJVuzMP89_PRidNiPgmav5wOWOsYNZ8ks5rQyGVgaJpZM4LfEIy> .

[LvHang]

@danpovey
Hi Dan,

I fix the bug--delete the ../sgmm//libkaldi-sgmm.so in the Makefile of decoder/.
After the update and git push. I download the newest codes from my remote repository and compile them. All passed.
Please check it. Thanks.

Best wishes,
Hang

[danpovey]

Have you grepped in all the run.sh files for 'sgmm' to see if there are commented-out invocations to the SGMM scripts that you need to delete?

[LvHang]

@danpovey
Hi Dan,

I run the command--" find ./ -name 'run.sh' -print | xargs grep -n 'sgmm' > info" and check the output file line by line. Now I think all in the run.sh isn't about sgmm.
In addition, I run the command--" grep -r 'sgmm' ./* " in both src/ and egs/ directories, and check all lines. I try my best to modify all of them. I hope I have fixed all about old sgmm.
Please check it. Thanks a lot.

Best wishes,
Hang