1. git status -uno:On branch modify_wer_return
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
modified: ../../.gitignore
new file: ../../LICENSE
new file: ../../analysis_train_log.ipynb
new file: ../../cmd.sh
new file: ../../conf/decode.config
new file: ../../conf/mfcc.conf
new file: ../../conf/mfcc_8kHz.conf
new file: ../../conf/mfcc_hires.conf
new file: ../../conf/mfcc_hires_8kHz.conf
new file: ../../conf/online_cmvn.conf
new file: ../../conf/queue.conf
new file: ../../conf/vad.conf
new file: ../../local/align-visual.py
new file: ../../local/align.sh
new file: ../../local/analysis_tdnn_train.sh
new file: ../../local/apply_segmentation.sh
new file: ../../local/buildLM/at_unicode.py
new file: ../../local/buildLM/normStep1.py
new file: ../../local/buildLM/normStep2.py
new file: ../../local/buildLM/normStep3.py
new file: ../../local/buildLM/normStep4.py
new file: ../../local/buildLM/normStepFinal.py
new file: ../../local/buildLM/strip.py
new file: ../../local/chain/multi_condition/run_tdnn_1b.sh
new file: ../../local/chain/multi_condition/run_tdnn_1f.sh
new file: ../../local/chain/multi_condition/run_tdnn_1g.sh
new file: ../../local/chain/multi_condition/run_tdnn_1g_zeroth.sh
new file: ../../local/chain/multi_condition/run_tdnn_1n.sh
new file: ../../local/chain/multi_condition/run_tdnn_lstm_1e.sh
new file: ../../local/chain/run_tdnn_1a.sh
new file: ../../local/chain/run_tdnn_1b.sh
new file: ../../local/chain/run_tdnn_1b_transferlearning_1a.sh
new file: ../../local/chain/run_tdnn_1n_transferlearning_1a.sh
new file: ../../local/chain/run_tdnn_lstm_1e.sh
new file: ../../local/character_tokenizer.sh
new file: ../../local/checkDur.sh
new file: ../../local/checkHours.sh
new file: ../../local/check_mfcc_log.sh
new file: ../../local/convKor2Num.py
new file: ../../local/copy_lat_dir.sh
new file: ../../local/copy_lat_dir_rvb.sh
new file: ../../local/data/get_reco2dur.sh
new file: ../../local/data_prep.sh
new file: ../../local/data_prep_car_clean.sh
new file: ../../local/data_prep_noisy01_clean.sh
new file: ../../local/data_prep_nospkinfo.sh
new file: ../../local/export_sad.sh
new file: ../../local/fName_norm.py
new file: ../../local/filter.py
new file: ../../local/filter_data_dir.sh
new file: ../../local/format_lms.sh
new file: ../../local/multi_condition/copy_ali_dir.sh
new file: ../../local/nnet3/multi_condition/data_augmentation.sh
new file: ../../local/nnet3/multi_condition/data_augmentation_v2.sh
new file: ../../local/nnet3/multi_condition/run_ivector_common.sh
new file: ../../local/nnet3/multi_condition/run_ivector_common_v2.sh
new file: ../../local/nnet3/run_ivector_common.sh
new file: ../../local/nnet3/segment_and_decode.sh
new file: ../../local/prepare_dict.sh
new file: ../../local/report_cer.sh
new file: ../../local/revert_segmentation.sh
new file: ../../local/run_sad_test.sh
new file: ../../local/run_sad_training.sh
new file: ../../local/score.sh
new file: ../../local/segmentation/tuning/train_lstm_asr_sad_1a.sh
new file: ../../local/segmentation/tuning/train_stats_asr_sad_1a.sh
new file: ../../local/split_dataset.sh
new file: ../../path.sh
new file: ../../run.sh
new file: ../../speechDATA
new file: ../../steps
new file: ../../utils
Unmerged paths:
(use "git add <file>..." to mark resolution)
both added: ../../README.md
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
deleted: ../ami/s5/README
modified: ../callhome_diarization/v2/run.sh
modified: ../librispeech/s5/cmd.sh
modified: ../librispeech/s5/run.sh
modified: ../mini_librispeech/s5/cmd.sh
deleted: ../zeroth_korean/s5/README.txt
deleted: ../zeroth_korean/s5/RESULTS
deleted: ../zeroth_korean/s5/cmd.sh
deleted: ../zeroth_korean/s5/conf/decode.config
deleted: ../zeroth_korean/s5/conf/mfcc.conf
deleted: ../zeroth_korean/s5/conf/mfcc_hires.conf
deleted: ../zeroth_korean/s5/conf/online_cmvn.conf
deleted: ../zeroth_korean/s5/local/chain/compare_wer.sh
deleted: ../zeroth_korean/s5/local/chain/run_tdnn.sh
deleted: ../zeroth_korean/s5/local/chain/run_tdnn_opgru.sh
deleted: ../zeroth_korean/s5/local/chain/tuning/run_tdnn_1a.sh
deleted: ../zeroth_korean/s5/local/chain/tuning/run_tdnn_opgru_1a.sh
deleted: ../zeroth_korean/s5/local/data_prep.sh
deleted: ../zeroth_korean/s5/local/download_and_untar.sh
deleted: ../zeroth_korean/s5/local/format_lms.sh
deleted: ../zeroth_korean/s5/local/nnet3/run_ivector_common.sh
deleted: ../zeroth_korean/s5/local/prepare_dict.sh
deleted: ../zeroth_korean/s5/local/score.sh
deleted: ../zeroth_korean/s5/local/update_segmentation.sh
deleted: ../zeroth_korean/s5/path.sh
deleted: ../zeroth_korean/s5/run.sh
deleted: ../zeroth_korean/s5/steps
deleted: ../zeroth_korean/s5/utils
modified: ../../scripts/rnnlm/compute_sentence_scores.sh
modified: ../../scripts/rnnlm/lmrescore_nbest.sh
modified: ../../scripts/rnnlm/train_rnnlm.sh
2. git log -3 :
commit f107cdba3252c884d58acc59584df2b75b33fb04
Author: Hosung Park <
indr...@gmail.com>
Date: Sun Apr 21 13:11:54 2019 +0900
[egs] Improve chain example script for Resource Management (RM) (#3252)
commit c3260f242f0f331d5131dbd7ac9835f391756e06
Author: Soonshin Seo <
ss...@sogang.ac.kr>
Date: Sat Apr 20 04:38:37 2019 +0900
[egs] Make voxceleb recipe work with latest version of the dataset (#3249)
commit 84ecd0e1e2a09b3196ebacecee3e2f40505dd067
Author: Hosung Park <
indr...@gmail.com>
Date: Fri Apr 19 12:14:37 2019 +0900
[egs] Update RM chain recipe with more recent configuration (#3237)