sync from official repo

[KarelVesely84]

please delete this, it was an accident

[jtrmal]

Karel, can you please generate the pull request against the current master? Seems there are some conflicts.
Thanks, y.

[jtrmal]

I was looking at the patch and I cannot see exactly where the problem is. I
don't think it will be some real problem.
y.

On Wed, Jul 22, 2015 at 6:08 PM, Karel Vesely notifications@github.com
wrote:

---

You can view, comment on, or merge this pull request online at:

#11
Commit Summary

• updating ami recipe,
• foo
• Merge pull request gitignore: add openfst 1.4.1 #1 from kaldi-asr/master
• Adding class for socket I/O, with stub of unit test
• AMI ihm recipe (refacored),
• Merge remote-tracking branch 'refs/remotes/origin/master'
• egs/ami/s5 : updating ami scripts, preliminary

File Changes

• M egs/ami/s5/cmd.sh
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-0 (14)
• A egs/ami/s5/conf/decode_dnn.conf
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-1 (2)
• A egs/ami/s5/conf/decode_tandem.conf
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-2 (3)
• M egs/ami/s5/local/ami_train_lms.sh
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-3 (4)
• A egs/ami/s5/local/nnet/run_dnn.sh
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-4 (117)
• A egs/ami/s5/local/remove_dup_utts.sh
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-5 (50)
• D egs/ami/s5/local/run_dnn.sh
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-6 (142)
• M egs/ami/s5/run_ihm.sh
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-7 (323)
• M egs/ami/s5/run_mdm.sh
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-8 (15)
• M egs/wsj/s5/utils/queue.pl
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-9 (1)
• M src/nnet/Makefile
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-10 (4)
• A src/nnet/nnet-io-socket-test-server.py
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-11 (80)
• A src/nnet/nnet-io-socket-test.cc
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-12 (58)
• A src/nnet/nnet-io-socket.cc
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-13 (127)
• A src/nnet/nnet-io-socket.h
  https://github.com/kaldi-asr/kaldi/pull/11/files#diff-14 (91)

Patch Links:

• https://github.com/kaldi-asr/kaldi/pull/11.patch
• https://github.com/kaldi-asr/kaldi/pull/11.diff

—
Reply to this email directly or view it on GitHub
#11.

[KarelVesely84]

Ooops, it was an accidet, i meant to update my personal repo, soory, :)