From 941cc12ececd87ff44670716abbd73502e6002fc Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Wed, 9 Jan 2019 02:11:23 -0500 Subject: [PATCH 01/10] sed compatibility --- egs/ami/s5/local/ami_ihm_scoring_data_prep.sh | 2 +- egs/ami/s5/local/ami_mdm_scoring_data_prep.sh | 2 +- egs/ami/s5/local/ami_sdm_scoring_data_prep.sh | 2 +- egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh | 2 +- egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh | 2 +- egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh | 2 +- .../multi_condition/prepare_impulses_noises.sh | 2 +- .../s5c/local/syllab/generate_syllable_lang.sh | 4 ++-- egs/babel/s5d/local/syllab/generate_phone_lang.sh | 4 ++-- .../s5d/local/syllab/generate_syllable_lang.sh | 4 ++-- egs/bentham/v1/local/create_splits.sh | 6 +++--- .../s5/local/callhome_prepare_dict.sh | 2 +- egs/callhome_egyptian/s5/local/ctm.sh | 6 +++--- egs/fisher_callhome_spanish/s5/local/ctm.sh | 6 +++--- .../s5/local/fsp_prepare_dict.sh | 2 +- egs/gale_arabic/s5/local/gale_prep_dict.sh | 2 +- .../s5b/local/gale_prep_grapheme_dict.sh | 2 +- egs/iam/v1/local/prepare_dict.sh | 2 +- egs/iam/v2/local/prepare_dict.sh | 2 +- egs/reverb/s5/local/download_se_eval_tool.sh | 14 +++++++------- egs/yomdle_fa/v1/local/prepare_dict.sh | 2 +- egs/yomdle_zh/v1/local/create_download.sh | 2 +- misc/maintenance/fix_cpplint_whitespace.sh | 12 ++++++------ tools/extras/install_portaudio.sh | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh b/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh index 3157d7ffec7..ab729265623 100755 --- a/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh @@ -97,7 +97,7 @@ if [ `cat $dir/segments_to_fix | wc -l` -gt 0 ]; then while read line; do p1=`echo $line | awk -F'>' '{print $1}'` p2=`echo $line | awk -F'>' '{print $2}'` - sed -ir "s!$p1!$p2!" $dir/segments + perl -i -pe "s!$p1!$p2!" $dir/segments done < $dir/segments_to_fix fi diff --git a/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh b/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh index 4cfa9110edf..90eee48400c 100755 --- a/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh @@ -105,7 +105,7 @@ if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then while read line; do p1=`echo $line | awk -F'>' '{print $1}'` p2=`echo $line | awk -F'>' '{print $2}'` - sed -ir "s:$p1:$p2:" $tmpdir/segments + perl -i -pe "s:$p1:$p2:" $tmpdir/segments done < $tmpdir/segments_to_fix fi diff --git a/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh b/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh index 91baa37d6e1..44d77a5de86 100755 --- a/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh @@ -112,7 +112,7 @@ if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then while read line; do p1=`echo $line | awk -F'>' '{print $1}'` p2=`echo $line | awk -F'>' '{print $2}'` - sed -ir "s:$p1:$p2:" $tmpdir/segments + perl -i -pe "s:$p1:$p2:" $tmpdir/segments done < $tmpdir/segments_to_fix fi diff --git a/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh index 746c42c4c1a..29c63241d4a 100755 --- a/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh @@ -103,7 +103,7 @@ if [ `cat $dir/segments_to_fix | wc -l` -gt 0 ]; then while read line; do p1=`echo $line | awk -F'>' '{print $1}'` p2=`echo $line | awk -F'>' '{print $2}'` - sed -ir "s!$p1!$p2!" $dir/segments + perl -i -pe "s!$p1!$p2!" $dir/segments done < $dir/segments_to_fix fi diff --git a/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh index 65f514f223c..cb4a4a1c81e 100755 --- a/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh @@ -110,7 +110,7 @@ if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then while read line; do p1=`echo $line | awk -F'>' '{print $1}'` p2=`echo $line | awk -F'>' '{print $2}'` - sed -ir "s:$p1:$p2:" $tmpdir/segments + perl -i -pe "s:$p1:$p2:" $tmpdir/segments done < $tmpdir/segments_to_fix fi diff --git a/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh index 1378f8b8965..68f493ea180 100755 --- a/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh @@ -122,7 +122,7 @@ if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then while read line; do p1=`echo $line | awk -F'>' '{print $1}'` p2=`echo $line | awk -F'>' '{print $2}'` - sed -ir "s:$p1:$p2:" $tmpdir/segments + perl -i -pe "s:$p1:$p2:" $tmpdir/segments done < $tmpdir/segments_to_fix fi diff --git a/egs/aspire/s5/local/multi_condition/prepare_impulses_noises.sh b/egs/aspire/s5/local/multi_condition/prepare_impulses_noises.sh index 804de611cae..8297cdee9ca 100755 --- a/egs/aspire/s5/local/multi_condition/prepare_impulses_noises.sh +++ b/egs/aspire/s5/local/multi_condition/prepare_impulses_noises.sh @@ -114,7 +114,7 @@ cp ${output_dir}_non_normalized/info/* $output_dir/info # rename file location in the noise-rir pairing files for file in `ls $output_dir/info/noise_impulse*`; do - sed -i "s/_non_normalized//g" $file + perl -i -pe "s/_non_normalized//g" $file done # generating the rir-list with probabilities alloted for each rir diff --git a/egs/babel/s5c/local/syllab/generate_syllable_lang.sh b/egs/babel/s5c/local/syllab/generate_syllable_lang.sh index 2d1fcb2259e..558e05adb1b 100755 --- a/egs/babel/s5c/local/syllab/generate_syllable_lang.sh +++ b/egs/babel/s5c/local/syllab/generate_syllable_lang.sh @@ -118,8 +118,8 @@ ln -s lex.syllabs2phones.disambig.fst $out/L_disambig.fst echo "Validating the output lang dir" utils/validate_lang.pl $out || exit 1 -sed -i'' 's/#1$//g' $lout/lexicon.txt -sed -i'' 's/#1$//g' $lout/lexiconp.txt +perl -i'' -pe 's/#1$//g' $lout/lexicon.txt +perl -i'' -pe 's/#1$//g' $lout/lexiconp.txt echo "Done OK." exit 0 diff --git a/egs/babel/s5d/local/syllab/generate_phone_lang.sh b/egs/babel/s5d/local/syllab/generate_phone_lang.sh index fc21a23231b..c7f4541b528 100755 --- a/egs/babel/s5d/local/syllab/generate_phone_lang.sh +++ b/egs/babel/s5d/local/syllab/generate_phone_lang.sh @@ -122,8 +122,8 @@ ln -s lex.syllabs2phones.disambig.fst $out/L_disambig.fst echo "Validating the output lang dir" utils/validate_lang.pl $out || exit 1 -sed -i'' 's/#1$//g' $lout/lexicon.txt -sed -i'' 's/#1$//g' $lout/lexiconp.txt +perl -i'' -pe 's/#1$//g' $lout/lexicon.txt +perl -i'' -pe 's/#1$//g' $lout/lexiconp.txt echo "Done OK." exit 0 diff --git a/egs/babel/s5d/local/syllab/generate_syllable_lang.sh b/egs/babel/s5d/local/syllab/generate_syllable_lang.sh index db7b0902425..c28be63e743 100755 --- a/egs/babel/s5d/local/syllab/generate_syllable_lang.sh +++ b/egs/babel/s5d/local/syllab/generate_syllable_lang.sh @@ -122,8 +122,8 @@ ln -s lex.syllabs2phones.disambig.fst $out/L_disambig.fst echo "Validating the output lang dir" utils/validate_lang.pl $out || exit 1 -sed -i'' 's/#1$//g' $lout/lexicon.txt -sed -i'' 's/#1$//g' $lout/lexiconp.txt +perl -i'' -pe 's/#1$//g' $lout/lexicon.txt +perl -i'' -pe 's/#1$//g' $lout/lexiconp.txt echo "Done OK." exit 0 diff --git a/egs/bentham/v1/local/create_splits.sh b/egs/bentham/v1/local/create_splits.sh index 93e8bf1b12e..203ad3ffb30 100755 --- a/egs/bentham/v1/local/create_splits.sh +++ b/egs/bentham/v1/local/create_splits.sh @@ -28,9 +28,9 @@ function split { echo $name $spkid >> $split_dir/utt2spk done < "$line_file" - sed -i '/^\s*$/d' $split_dir/images.scp - sed -i '/^\s*$/d' $split_dir/text - sed -i '/^\s*$/d' $split_dir/utt2spk + perl -i -pe '/^\s*$/d' $split_dir/images.scp + perl -i -pe '/^\s*$/d' $split_dir/text + perl -i -pe '/^\s*$/d' $split_dir/utt2spk utils/utt2spk_to_spk2utt.pl $split_dir/utt2spk > $split_dir/spk2utt } diff --git a/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh b/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh index 62bca974e53..61b18993afe 100755 --- a/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh +++ b/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh @@ -55,7 +55,7 @@ $dir/extra_questions.txt || exit 1; # Add prons for laughter, noise, oov for w in `grep -v sil $dir/silence_phones.txt`; do -sed -i "/\[$w\]/d" $tmpdir/lexicon.3 +perl -i -pe "/\[$w\]/d" $tmpdir/lexicon.3 done for w in `grep -v sil $dir/silence_phones.txt`; do diff --git a/egs/callhome_egyptian/s5/local/ctm.sh b/egs/callhome_egyptian/s5/local/ctm.sh index 14056b7a44b..64a7cf0d4f6 100755 --- a/egs/callhome_egyptian/s5/local/ctm.sh +++ b/egs/callhome_egyptian/s5/local/ctm.sh @@ -18,9 +18,9 @@ fi steps/get_ctm.sh $data_dir $lang_dir $decode_dir # Make sure that channel markers match -#sed -i "s:\s.*_fsp-([AB]): \1:g" data/dev/stm -#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} sed -i -r 's:fsp\s1\s:fsp A :g' {} -#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} sed -i -r 's:fsp\s2\s:fsp B :g' {} +#perl -i -pe "s:\s.*_fsp-([AB]): \1:g" data/dev/stm +#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} perl -i -pe 's:fsp\s1\s:fsp A :g' {} +#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} perl -i -pe 's:fsp\s2\s:fsp B :g' {} # Get the environment variables . /export/babel/data/software/env.sh diff --git a/egs/fisher_callhome_spanish/s5/local/ctm.sh b/egs/fisher_callhome_spanish/s5/local/ctm.sh index 7d09f574580..62860a10b7b 100755 --- a/egs/fisher_callhome_spanish/s5/local/ctm.sh +++ b/egs/fisher_callhome_spanish/s5/local/ctm.sh @@ -19,9 +19,9 @@ fi steps/get_ctm.sh $data_dir $lang_dir $decode_dir # Make sure that channel markers match -#sed -i "s:\s.*_fsp-([AB]): \1:g" data/dev/stm -#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} sed -i -r 's:fsp\s1\s:fsp A :g' {} -#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} sed -i -r 's:fsp\s2\s:fsp B :g' {} +#perl -i -pe "s:\s.*_fsp-([AB]): \1:g" data/dev/stm +#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} perl -i -pe 's:fsp\s1\s:fsp A :g' {} +#ls exp/tri5a/decode_dev/score_*/dev.ctm | xargs -I {} perl -i -pe 's:fsp\s2\s:fsp B :g' {} # Get the environment variables . /export/babel/data/software/env.sh diff --git a/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh b/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh index 7b2de2db392..5c417bc38d8 100755 --- a/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh +++ b/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh @@ -106,7 +106,7 @@ if [ $stage -le 4 ]; then # Add prons for laughter, noise, oov for w in `grep -v sil $dir/silence_phones.txt`; do - sed -i "/\[$w\]/d" $tmpdir/lexicon.2 + perl -i -pe "/\[$w\]/d" $tmpdir/lexicon.2 done for w in `grep -v sil $dir/silence_phones.txt`; do diff --git a/egs/gale_arabic/s5/local/gale_prep_dict.sh b/egs/gale_arabic/s5/local/gale_prep_dict.sh index 74ef789eda7..bbbeff00cb8 100755 --- a/egs/gale_arabic/s5/local/gale_prep_dict.sh +++ b/egs/gale_arabic/s5/local/gale_prep_dict.sh @@ -26,7 +26,7 @@ cat $dir/lexicon.txt | cut -d ' ' -f2- | tr -s ' ' '\n' |\ sort -u > $dir/nonsilence_phones.txt || exit 1; - sed -i '1i SIL' $dir/lexicon.txt + perl -i -pe '1i SIL' $dir/lexicon.txt echo Dictionary preparation succeeded diff --git a/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh b/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh index 5f101f8245b..9dd895375c8 100755 --- a/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh +++ b/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh @@ -30,7 +30,7 @@ echo SIL > $dir/optional_silence.txt # really to the same base phone. cat tmp2.$$ | tr -s ' ' '\n' | grep -v ^$ | sort -u > $dir/nonsilence_phones.txt || exit 1; -sed -i '1i SIL' $dir/lexicon.txt # insert word with phone sil at the begining of the dictionary +perl -i -pe '1i SIL' $dir/lexicon.txt # insert word with phone sil at the begining of the dictionary rm -fr ar-ar_lexicon_2014-03-17.txt.bz2 ar-ar_grapheme_lexicon_2016-02-09.bz2 tmp$$ tmp1.$$ tmp2.$$ echo Dictionary preparation succeeded diff --git a/egs/iam/v1/local/prepare_dict.sh b/egs/iam/v1/local/prepare_dict.sh index f691d577fba..7451f6b85f7 100755 --- a/egs/iam/v1/local/prepare_dict.sh +++ b/egs/iam/v1/local/prepare_dict.sh @@ -38,7 +38,7 @@ while(<>){ }' | sort -u > $dir/lexicon.txt -sed -i "s/#//" $dir/nonsilence_phones.txt +perl -i -pe "s/#//" $dir/nonsilence_phones.txt echo ' SIL' >> $dir/lexicon.txt echo ' SIL' >> $dir/lexicon.txt diff --git a/egs/iam/v2/local/prepare_dict.sh b/egs/iam/v2/local/prepare_dict.sh index e21a59c7e92..714b5b51788 100755 --- a/egs/iam/v2/local/prepare_dict.sh +++ b/egs/iam/v2/local/prepare_dict.sh @@ -39,7 +39,7 @@ while(<>){ }' | sort -u > $dir/lexicon.txt -sed -i "s/#//" $dir/nonsilence_phones.txt +perl -i -pe "s/#//" $dir/nonsilence_phones.txt echo ' SIL' >> $dir/lexicon.txt diff --git a/egs/reverb/s5/local/download_se_eval_tool.sh b/egs/reverb/s5/local/download_se_eval_tool.sh index c7b272907b6..d0ed8d683b6 100755 --- a/egs/reverb/s5/local/download_se_eval_tool.sh +++ b/egs/reverb/s5/local/download_se_eval_tool.sh @@ -18,14 +18,14 @@ unzip REVERB_scores.zip -d local/REVERB_scores_source rm REVERB_scores.zip pushd local/REVERB_scores_source/REVERB-SPEENHA.Release04Oct/evaltools -sed -i 's/wavread/audioread/g' prog/score_sim.m +perl -i -pe 's/wavread/audioread/g' prog/score_sim.m git clone https://github.com/MuSAELab/SRMRToolbox.git -sed -i 's/wavread/audioread/g' SRMRToolbox/libs/preprocess.m -sed -i 's/SRMR_main/SRMR/g' prog/score_real.m -sed -i 's/SRMR_main/SRMR/g' prog/score_sim.m -sed -i 's/+wb\ //g' prog/calcpesq.m -sed -i 's/pesq_/_pesq_/g' prog/calcpesq.m -sed -ie '30d;31d' prog/calcpesq.m +perl -i -pe 's/wavread/audioread/g' SRMRToolbox/libs/preprocess.m +perl -i -pe 's/SRMR_main/SRMR/g' prog/score_real.m +perl -i -pe 's/SRMR_main/SRMR/g' prog/score_sim.m +perl -i -pe 's/+wb\ //g' prog/calcpesq.m +perl -i -pe 's/pesq_/_pesq_/g' prog/calcpesq.m +perl -i -pe '30d;31d' prog/calcpesq.m patch score_RealData.m -i ../../../score_RealData.patch -o score_RealData_new.m mv score_RealData_new.m score_RealData.m patch score_SimData.m -i ../../../score_SimData.patch -o score_SimData_new.m diff --git a/egs/yomdle_fa/v1/local/prepare_dict.sh b/egs/yomdle_fa/v1/local/prepare_dict.sh index f1b1a8d70cc..11ae1dc5aae 100755 --- a/egs/yomdle_fa/v1/local/prepare_dict.sh +++ b/egs/yomdle_fa/v1/local/prepare_dict.sh @@ -18,7 +18,7 @@ mkdir -p $dir local/prepare_lexicon.py --data-dir $data_dir $dir -sed -i '/^\s*$/d' $dir/lexicon.txt +perl -i -pe '/^\s*$/d' $dir/lexicon.txt cut -d' ' -f2- $dir/lexicon.txt | sed 's/SIL//g' | tr ' ' '\n' | sort -u | sed '/^$/d' >$dir/nonsilence_phones.txt || exit 1; echo ' SIL' >> $dir/lexicon.txt diff --git a/egs/yomdle_zh/v1/local/create_download.sh b/egs/yomdle_zh/v1/local/create_download.sh index a440a331747..b1d72d5195a 100755 --- a/egs/yomdle_zh/v1/local/create_download.sh +++ b/egs/yomdle_zh/v1/local/create_download.sh @@ -43,4 +43,4 @@ local/create_line_image_from_page_image.py \ echo "Downloading table for CangJie." wget -P $download_dir/ $cangjie_url || exit 1; -sed -ie '1,8d' $download_dir/cj5-cc.txt +perl -i -pe '1,8d' $download_dir/cj5-cc.txt diff --git a/misc/maintenance/fix_cpplint_whitespace.sh b/misc/maintenance/fix_cpplint_whitespace.sh index 8d99aebbac2..21b9da217a3 100755 --- a/misc/maintenance/fix_cpplint_whitespace.sh +++ b/misc/maintenance/fix_cpplint_whitespace.sh @@ -3,11 +3,11 @@ # Let's run a set of in-place modifications by sed-commands, for file in $@; do - sed -i 's/; \/\//; \/\//' $file # '; //' -> '; //' - sed -i 's/{ \/\//{ \/\//' $file # '{ //' -> '{ //' - sed -i 's/} \/\//} \/\//' $file # '} //' -> '} //' - sed -i 's/for(/for (/' $file # 'for(' -> 'for (' - sed -i 's/if(/if (/' $file # 'if(' -> 'if (' - sed -i 's/\s\s*$//' $file # 'remove white-space at the end of lines' + perl -i -pe 's/; \/\//; \/\//' $file # '; //' -> '; //' + perl -i -pe 's/{ \/\//{ \/\//' $file # '{ //' -> '{ //' + perl -i -pe 's/} \/\//} \/\//' $file # '} //' -> '} //' + perl -i -pe 's/for(/for (/' $file # 'for(' -> 'for (' + perl -i -pe 's/if(/if (/' $file # 'if(' -> 'if (' + perl -i -pe 's/\s\s*$//' $file # 'remove white-space at the end of lines' done diff --git a/tools/extras/install_portaudio.sh b/tools/extras/install_portaudio.sh index ed9529477a6..a237c9f1011 100755 --- a/tools/extras/install_portaudio.sh +++ b/tools/extras/install_portaudio.sh @@ -82,7 +82,7 @@ if [ -z "$MACOS" ]; then fi ./configure --prefix=`pwd`/install --with-pic -sed -i.bk '40s:src/common/pa_ringbuffer.o::g; 40s:$: src/common/pa_ringbuffer.o:' Makefile +perl -i.bk -pe '40s:src/common/pa_ringbuffer.o::g; 40s:$: src/common/pa_ringbuffer.o:' Makefile if [ "$MACOS" != "" ]; then echo "detected MacOS operating system ... trying to fix Makefile" From 96e7d298cd16bb121a50af3f1ac8385e589a0a94 Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Sat, 12 Jan 2019 03:10:25 -0500 Subject: [PATCH 02/10] more fixes for sed --- egs/bentham/v1/local/create_splits.sh | 6 +++--- egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh | 2 +- egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh | 2 +- egs/gale_arabic/s5/local/gale_prep_dict.sh | 3 +-- egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh | 2 +- egs/reverb/s5/local/download_se_eval_tool.sh | 2 +- egs/yomdle_fa/v1/local/prepare_dict.sh | 2 +- egs/yomdle_zh/v1/local/create_download.sh | 2 +- tools/extras/install_portaudio.sh | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/egs/bentham/v1/local/create_splits.sh b/egs/bentham/v1/local/create_splits.sh index 203ad3ffb30..d0ce530443f 100755 --- a/egs/bentham/v1/local/create_splits.sh +++ b/egs/bentham/v1/local/create_splits.sh @@ -28,9 +28,9 @@ function split { echo $name $spkid >> $split_dir/utt2spk done < "$line_file" - perl -i -pe '/^\s*$/d' $split_dir/images.scp - perl -i -pe '/^\s*$/d' $split_dir/text - perl -i -pe '/^\s*$/d' $split_dir/utt2spk + grep -v -e '^\s*$' $split_dir/images.scp + grep -v -e '^\s*$' $split_dir/text + grep -v -e '^\s*$' $split_dir/utt2spk utils/utt2spk_to_spk2utt.pl $split_dir/utt2spk > $split_dir/spk2utt } diff --git a/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh b/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh index 61b18993afe..8316d79ad1e 100755 --- a/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh +++ b/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh @@ -55,7 +55,7 @@ $dir/extra_questions.txt || exit 1; # Add prons for laughter, noise, oov for w in `grep -v sil $dir/silence_phones.txt`; do -perl -i -pe "/\[$w\]/d" $tmpdir/lexicon.3 +grep -v -e "\[$w\]" $tmpdir/lexicon.3 done for w in `grep -v sil $dir/silence_phones.txt`; do diff --git a/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh b/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh index 5c417bc38d8..496d87b4944 100755 --- a/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh +++ b/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh @@ -106,7 +106,7 @@ if [ $stage -le 4 ]; then # Add prons for laughter, noise, oov for w in `grep -v sil $dir/silence_phones.txt`; do - perl -i -pe "/\[$w\]/d" $tmpdir/lexicon.2 + grep -v -e "\[$w\]" $tmpdir/lexicon.2 done for w in `grep -v sil $dir/silence_phones.txt`; do diff --git a/egs/gale_arabic/s5/local/gale_prep_dict.sh b/egs/gale_arabic/s5/local/gale_prep_dict.sh index bbbeff00cb8..373d97def6b 100755 --- a/egs/gale_arabic/s5/local/gale_prep_dict.sh +++ b/egs/gale_arabic/s5/local/gale_prep_dict.sh @@ -25,8 +25,7 @@ echo SIL > $dir/optional_silence.txt cat $dir/lexicon.txt | cut -d ' ' -f2- | tr -s ' ' '\n' |\ sort -u > $dir/nonsilence_phones.txt || exit 1; - - perl -i -pe '1i SIL' $dir/lexicon.txt + ex -s -c '1i| SIL' -c x $dir/lexicon.txt echo Dictionary preparation succeeded diff --git a/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh b/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh index 9dd895375c8..63d030d8030 100755 --- a/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh +++ b/egs/gale_arabic/s5b/local/gale_prep_grapheme_dict.sh @@ -30,7 +30,7 @@ echo SIL > $dir/optional_silence.txt # really to the same base phone. cat tmp2.$$ | tr -s ' ' '\n' | grep -v ^$ | sort -u > $dir/nonsilence_phones.txt || exit 1; -perl -i -pe '1i SIL' $dir/lexicon.txt # insert word with phone sil at the begining of the dictionary +ex -s -c '1i| SIL' -c x $dir/lexicon.txt # insert word with phone sil at the begining of the dictionary rm -fr ar-ar_lexicon_2014-03-17.txt.bz2 ar-ar_grapheme_lexicon_2016-02-09.bz2 tmp$$ tmp1.$$ tmp2.$$ echo Dictionary preparation succeeded diff --git a/egs/reverb/s5/local/download_se_eval_tool.sh b/egs/reverb/s5/local/download_se_eval_tool.sh index d0ed8d683b6..54ba29e051c 100755 --- a/egs/reverb/s5/local/download_se_eval_tool.sh +++ b/egs/reverb/s5/local/download_se_eval_tool.sh @@ -25,7 +25,7 @@ perl -i -pe 's/SRMR_main/SRMR/g' prog/score_real.m perl -i -pe 's/SRMR_main/SRMR/g' prog/score_sim.m perl -i -pe 's/+wb\ //g' prog/calcpesq.m perl -i -pe 's/pesq_/_pesq_/g' prog/calcpesq.m -perl -i -pe '30d;31d' prog/calcpesq.m +perl -n -i -e 'print if $. != 30 && $. != 31' prog/calcpesq.m # Delete lines 30 and 31 from file patch score_RealData.m -i ../../../score_RealData.patch -o score_RealData_new.m mv score_RealData_new.m score_RealData.m patch score_SimData.m -i ../../../score_SimData.patch -o score_SimData_new.m diff --git a/egs/yomdle_fa/v1/local/prepare_dict.sh b/egs/yomdle_fa/v1/local/prepare_dict.sh index 11ae1dc5aae..4049628e705 100755 --- a/egs/yomdle_fa/v1/local/prepare_dict.sh +++ b/egs/yomdle_fa/v1/local/prepare_dict.sh @@ -18,7 +18,7 @@ mkdir -p $dir local/prepare_lexicon.py --data-dir $data_dir $dir -perl -i -pe '/^\s*$/d' $dir/lexicon.txt +grep -v -e '^\s*$' $dir/lexicon.txt cut -d' ' -f2- $dir/lexicon.txt | sed 's/SIL//g' | tr ' ' '\n' | sort -u | sed '/^$/d' >$dir/nonsilence_phones.txt || exit 1; echo ' SIL' >> $dir/lexicon.txt diff --git a/egs/yomdle_zh/v1/local/create_download.sh b/egs/yomdle_zh/v1/local/create_download.sh index b1d72d5195a..1daad354473 100755 --- a/egs/yomdle_zh/v1/local/create_download.sh +++ b/egs/yomdle_zh/v1/local/create_download.sh @@ -43,4 +43,4 @@ local/create_line_image_from_page_image.py \ echo "Downloading table for CangJie." wget -P $download_dir/ $cangjie_url || exit 1; -perl -i -pe '1,8d' $download_dir/cj5-cc.txt +perl -n -i -e 'print if $. > 8' $download_dir/cj5-cc.txt diff --git a/tools/extras/install_portaudio.sh b/tools/extras/install_portaudio.sh index a237c9f1011..423291edbf0 100755 --- a/tools/extras/install_portaudio.sh +++ b/tools/extras/install_portaudio.sh @@ -82,7 +82,7 @@ if [ -z "$MACOS" ]; then fi ./configure --prefix=`pwd`/install --with-pic -perl -i.bk -pe '40s:src/common/pa_ringbuffer.o::g; 40s:$: src/common/pa_ringbuffer.o:' Makefile +perl -i.bk -pe 's:src/common/pa_ringbuffer.o:: if $.==40; s:$: src/common/pa_ringbuffer.o: if $.==40' Makefile if [ "$MACOS" != "" ]; then echo "detected MacOS operating system ... trying to fix Makefile" From d40fed799f7a5ee55292f16c2919b31028c9fb4f Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Sat, 12 Jan 2019 06:39:22 -0500 Subject: [PATCH 03/10] remove trailing whitespace at the end of line --- misc/maintenance/fix_cpplint_whitespace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/maintenance/fix_cpplint_whitespace.sh b/misc/maintenance/fix_cpplint_whitespace.sh index 21b9da217a3..19402cbcf16 100755 --- a/misc/maintenance/fix_cpplint_whitespace.sh +++ b/misc/maintenance/fix_cpplint_whitespace.sh @@ -8,6 +8,6 @@ for file in $@; do perl -i -pe 's/} \/\//} \/\//' $file # '} //' -> '} //' perl -i -pe 's/for(/for (/' $file # 'for(' -> 'for (' perl -i -pe 's/if(/if (/' $file # 'if(' -> 'if (' - perl -i -pe 's/\s\s*$//' $file # 'remove white-space at the end of lines' + perl -i -pe 's/[ \t]+$//' $file # 'remove white-space at the end of lines' done From cfccf4bd5de65e38cbe4acceee9a2ee62aa37e78 Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Wed, 6 Mar 2019 14:46:49 -0500 Subject: [PATCH 04/10] single-pass segment modification with perl --- egs/ami/s5/local/ami_ihm_scoring_data_prep.sh | 15 ++++----------- egs/ami/s5/local/ami_mdm_scoring_data_prep.sh | 12 ++---------- egs/ami/s5/local/ami_sdm_scoring_data_prep.sh | 12 ++---------- egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh | 13 +++---------- egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh | 12 ++---------- egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh | 14 +++----------- 6 files changed, 16 insertions(+), 62 deletions(-) diff --git a/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh b/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh index ab729265623..449917599e5 100755 --- a/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh @@ -87,19 +87,12 @@ sort -k 2 $dir/utt2spk | utils/utt2spk_to_spk2utt.pl > $dir/spk2utt || exit 1; join $dir/utt2spk $dir/segments | \ perl -ne '{BEGIN{$pu=""; $pt=0.0;} split; if ($pu eq $_[1] && $pt > $_[3]) { - print "$_[0] $_[2] $_[3] $_[4]>$_[0] $_[2] $pt $_[4]\n" + print "s/^$_[0] $_[2] $_[3] $_[4]\$/$_[0] $_[2] $pt $_[4]/;\n" } - $pu=$_[1]; $pt=$_[4]; + $pu=$_[1]; $pt=$_[4]; }' > $dir/segments_to_fix -if [ `cat $dir/segments_to_fix | wc -l` -gt 0 ]; then - echo "$0. Applying following fixes to segments" - cat $dir/segments_to_fix - while read line; do - p1=`echo $line | awk -F'>' '{print $1}'` - p2=`echo $line | awk -F'>' '{print $2}'` - perl -i -pe "s!$p1!$p2!" $dir/segments - done < $dir/segments_to_fix -fi + +perl -i -pf $dir/segments_to_fix $dir/segments # Copy stuff into its final locations fdir=data/ihm/$SET diff --git a/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh b/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh index 90eee48400c..fded6b4ac72 100755 --- a/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh @@ -94,20 +94,12 @@ awk '{print $1}' $tmpdir/segments | \ join $tmpdir/utt2spk_stm $tmpdir/segments | \ awk '{ utt=$1; spk=$2; wav=$3; t_beg=$4; t_end=$5; if(spk_prev == spk && t_end_prev > t_beg) { - print utt, wav, t_beg, t_end">"utt, wav, t_end_prev, t_end; + print "s/^"utt, wav, t_beg, t_end"$/"utt, wav, t_end_prev, t_end"/;"; } spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then - echo "$0. Applying following fixes to segments" - cat $tmpdir/segments_to_fix - while read line; do - p1=`echo $line | awk -F'>' '{print $1}'` - p2=`echo $line | awk -F'>' '{print $2}'` - perl -i -pe "s:$p1:$p2:" $tmpdir/segments - done < $tmpdir/segments_to_fix -fi +perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments # Copy stuff into its final locations [this has been moved from the format_data # script] diff --git a/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh b/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh index 44d77a5de86..2978c7ee8a0 100755 --- a/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh @@ -101,20 +101,12 @@ awk '{print $1}' $tmpdir/segments | \ join $tmpdir/utt2spk_stm $tmpdir/segments | \ awk '{ utt=$1; spk=$2; wav=$3; t_beg=$4; t_end=$5; if(spk_prev == spk && t_end_prev > t_beg) { - print utt, wav, t_beg, t_end">"utt, wav, t_end_prev, t_end; + print "s/^"utt, wav, t_beg, t_end"$/"utt, wav, t_end_prev, t_end"/;"; } spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then - echo "$0. Applying following fixes to segments" - cat $tmpdir/segments_to_fix - while read line; do - p1=`echo $line | awk -F'>' '{print $1}'` - p2=`echo $line | awk -F'>' '{print $2}'` - perl -i -pe "s:$p1:$p2:" $tmpdir/segments - done < $tmpdir/segments_to_fix -fi +perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments # Copy stuff into its final locations [this has been moved from the format_data # script] diff --git a/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh index 29c63241d4a..29c6341ba6f 100755 --- a/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh @@ -93,19 +93,12 @@ sort -k 2 $dir/utt2spk | utils/utt2spk_to_spk2utt.pl > $dir/spk2utt || exit 1; join $dir/utt2spk $dir/segments | \ perl -ne '{BEGIN{$pu=""; $pt=0.0;} split; if ($pu eq $_[1] && $pt > $_[3]) { - print "$_[0] $_[2] $_[3] $_[4]>$_[0] $_[2] $pt $_[4]\n" + print "s/^$_[0] $_[2] $_[3] $_[4]\$/$_[0] $_[2] $pt $_[4]/;\n" } $pu=$_[1]; $pt=$_[4]; }' > $dir/segments_to_fix -if [ `cat $dir/segments_to_fix | wc -l` -gt 0 ]; then - echo "$0. Applying following fixes to segments" - cat $dir/segments_to_fix - while read line; do - p1=`echo $line | awk -F'>' '{print $1}'` - p2=`echo $line | awk -F'>' '{print $2}'` - perl -i -pe "s!$p1!$p2!" $dir/segments - done < $dir/segments_to_fix -fi + +perl -i -pf $dir/segments_to_fix $dir/segments # Copy stuff into its final locations mkdir -p $odir diff --git a/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh index cb4a4a1c81e..291e061d68b 100755 --- a/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh @@ -99,20 +99,12 @@ awk '{print $1}' $tmpdir/segments | \ join $tmpdir/utt2spk_stm $tmpdir/segments | \ awk '{ utt=$1; spk=$2; wav=$3; t_beg=$4; t_end=$5; if(spk_prev == spk && t_end_prev > t_beg) { - print utt, wav, t_beg, t_end">"utt, wav, t_end_prev, t_end; + print "s/^"utt, wav, t_beg, t_end"$/"utt, wav, t_end_prev, t_end"/;"; } spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then - echo "$0. Applying following fixes to segments" - cat $tmpdir/segments_to_fix - while read line; do - p1=`echo $line | awk -F'>' '{print $1}'` - p2=`echo $line | awk -F'>' '{print $2}'` - perl -i -pe "s:$p1:$p2:" $tmpdir/segments - done < $tmpdir/segments_to_fix -fi +perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments # Copy stuff into its final locations [this has been moved from the format_data # script] diff --git a/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh index 68f493ea180..6994bfc067f 100755 --- a/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh @@ -111,25 +111,17 @@ awk '{print $1}' $tmpdir/segments | \ join $tmpdir/utt2spk_stm $tmpdir/segments | \ awk '{ utt=$1; spk=$2; wav=$3; t_beg=$4; t_end=$5; if(spk_prev == spk && t_end_prev > t_beg) { - print utt, wav, t_beg, t_end">"utt, wav, t_end_prev, t_end; + print "s/^"utt, wav, t_beg, t_end"$/"utt, wav, t_end_prev, t_end"/;"; } spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -if [ `cat $tmpdir/segments_to_fix | wc -l` -gt 0 ]; then - echo "$0. Applying following fixes to segments" - cat $tmpdir/segments_to_fix - while read line; do - p1=`echo $line | awk -F'>' '{print $1}'` - p2=`echo $line | awk -F'>' '{print $2}'` - perl -i -pe "s:$p1:$p2:" $tmpdir/segments - done < $tmpdir/segments_to_fix -fi +perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments # Copy stuff into its final locations [this has been moved from the format_data # script] mkdir -p $dir -for f in spk2utt utt2spk utt2spk_stm wav.scp text segments reco2file_and_channel; do +for f in segments_to_fix spk2utt utt2spk utt2spk_stm wav.scp text segments reco2file_and_channel; do cp $tmpdir/$f $dir/$f || exit 1; done From e34d23e321666401cf48b9836c2f4541ca85d91a Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Wed, 6 Mar 2019 15:21:52 -0500 Subject: [PATCH 05/10] perl for string modifications in files --- egs/babel/s5c/local/syllab/generate_syllable_lang.sh | 3 +-- egs/babel/s5d/local/syllab/generate_phone_lang.sh | 3 +-- egs/babel/s5d/local/syllab/generate_syllable_lang.sh | 3 +-- egs/bentham/v1/local/create_splits.sh | 6 ++---- egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh | 5 ++--- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/egs/babel/s5c/local/syllab/generate_syllable_lang.sh b/egs/babel/s5c/local/syllab/generate_syllable_lang.sh index 558e05adb1b..4a0810b9415 100755 --- a/egs/babel/s5c/local/syllab/generate_syllable_lang.sh +++ b/egs/babel/s5c/local/syllab/generate_syllable_lang.sh @@ -118,8 +118,7 @@ ln -s lex.syllabs2phones.disambig.fst $out/L_disambig.fst echo "Validating the output lang dir" utils/validate_lang.pl $out || exit 1 -perl -i'' -pe 's/#1$//g' $lout/lexicon.txt -perl -i'' -pe 's/#1$//g' $lout/lexiconp.txt +perl -i -pe 's/#1$//g' $lout/lexicon.txt $lout/lexiconp.txt echo "Done OK." exit 0 diff --git a/egs/babel/s5d/local/syllab/generate_phone_lang.sh b/egs/babel/s5d/local/syllab/generate_phone_lang.sh index c7f4541b528..81d8a0acdc7 100755 --- a/egs/babel/s5d/local/syllab/generate_phone_lang.sh +++ b/egs/babel/s5d/local/syllab/generate_phone_lang.sh @@ -122,8 +122,7 @@ ln -s lex.syllabs2phones.disambig.fst $out/L_disambig.fst echo "Validating the output lang dir" utils/validate_lang.pl $out || exit 1 -perl -i'' -pe 's/#1$//g' $lout/lexicon.txt -perl -i'' -pe 's/#1$//g' $lout/lexiconp.txt +perl -i -pe 's/#1$//g' $lout/lexicon.txt $lout/lexiconp.txt echo "Done OK." exit 0 diff --git a/egs/babel/s5d/local/syllab/generate_syllable_lang.sh b/egs/babel/s5d/local/syllab/generate_syllable_lang.sh index c28be63e743..a7bd667027c 100755 --- a/egs/babel/s5d/local/syllab/generate_syllable_lang.sh +++ b/egs/babel/s5d/local/syllab/generate_syllable_lang.sh @@ -122,8 +122,7 @@ ln -s lex.syllabs2phones.disambig.fst $out/L_disambig.fst echo "Validating the output lang dir" utils/validate_lang.pl $out || exit 1 -perl -i'' -pe 's/#1$//g' $lout/lexicon.txt -perl -i'' -pe 's/#1$//g' $lout/lexiconp.txt +perl -i -pe 's/#1$//g' $lout/lexicon.txt $lout/lexiconp.txt echo "Done OK." exit 0 diff --git a/egs/bentham/v1/local/create_splits.sh b/egs/bentham/v1/local/create_splits.sh index d0ce530443f..e8ea2279a49 100755 --- a/egs/bentham/v1/local/create_splits.sh +++ b/egs/bentham/v1/local/create_splits.sh @@ -27,10 +27,8 @@ function split { echo $name $lines_dir"/"$name".png" >> $split_dir/images.scp echo $name $spkid >> $split_dir/utt2spk done < "$line_file" - - grep -v -e '^\s*$' $split_dir/images.scp - grep -v -e '^\s*$' $split_dir/text - grep -v -e '^\s*$' $split_dir/utt2spk + + perl -i -ne 'print if /\S/' $split_dir/images.scp $split_dir/text $split_dir/utt2spk utils/utt2spk_to_spk2utt.pl $split_dir/utt2spk > $split_dir/spk2utt } diff --git a/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh b/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh index 8316d79ad1e..d9faa97f266 100755 --- a/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh +++ b/egs/callhome_egyptian/s5/local/callhome_prepare_dict.sh @@ -54,9 +54,8 @@ cat $dir/silence_phones.txt| awk '{printf("%s ", $1);} END{printf "\n";}' > \ $dir/extra_questions.txt || exit 1; # Add prons for laughter, noise, oov -for w in `grep -v sil $dir/silence_phones.txt`; do -grep -v -e "\[$w\]" $tmpdir/lexicon.3 -done +w=$(grep -v sil $dir/silence_phones.txt | tr '\n' '|') +perl -i -ne "print unless /\[(${w%?})\]/" $tmpdir/lexicon.3 for w in `grep -v sil $dir/silence_phones.txt`; do echo "[$w] $w" From 2f6fed7eb755357eb6effe1d14b616f2f1a74902 Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Wed, 6 Mar 2019 15:26:17 -0500 Subject: [PATCH 06/10] perl for string modification in file --- egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh b/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh index 496d87b4944..779298305c4 100755 --- a/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh +++ b/egs/fisher_callhome_spanish/s5/local/fsp_prepare_dict.sh @@ -105,9 +105,8 @@ if [ $stage -le 4 ]; then cp "$tmpdir/lexicon.1" "$tmpdir/lexicon.2" # Add prons for laughter, noise, oov - for w in `grep -v sil $dir/silence_phones.txt`; do - grep -v -e "\[$w\]" $tmpdir/lexicon.2 - done + w=$(grep -v sil $dir/silence_phones.txt | tr '\n' '|') + perl -i -ne "print unless /\[(${w%?})\]/" $tmpdir/lexicon.2 for w in `grep -v sil $dir/silence_phones.txt`; do echo "[$w] $w" From a24149f366f046652160559c08368925f2b05c13 Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Wed, 6 Mar 2019 21:32:25 -0500 Subject: [PATCH 07/10] perl modifications for robustness --- egs/gale_arabic/s5/local/gale_prep_dict.sh | 4 ++-- egs/reverb/s5/local/download_se_eval_tool.sh | 4 ++-- egs/yomdle_fa/v1/local/prepare_dict.sh | 2 +- egs/yomdle_zh/v1/local/create_download.sh | 2 +- misc/maintenance/fix_cpplint_whitespace.sh | 12 ++++++------ tools/extras/install_portaudio.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/egs/gale_arabic/s5/local/gale_prep_dict.sh b/egs/gale_arabic/s5/local/gale_prep_dict.sh index 373d97def6b..f6fd83378d0 100755 --- a/egs/gale_arabic/s5/local/gale_prep_dict.sh +++ b/egs/gale_arabic/s5/local/gale_prep_dict.sh @@ -25,8 +25,8 @@ echo SIL > $dir/optional_silence.txt cat $dir/lexicon.txt | cut -d ' ' -f2- | tr -s ' ' '\n' |\ sort -u > $dir/nonsilence_phones.txt || exit 1; - ex -s -c '1i| SIL' -c x $dir/lexicon.txt - +perl -i -pe 'print " SIL\n" if $.==1' $dir/lexicon.txt + echo Dictionary preparation succeeded exit 0 diff --git a/egs/reverb/s5/local/download_se_eval_tool.sh b/egs/reverb/s5/local/download_se_eval_tool.sh index 54ba29e051c..c1811264771 100755 --- a/egs/reverb/s5/local/download_se_eval_tool.sh +++ b/egs/reverb/s5/local/download_se_eval_tool.sh @@ -23,9 +23,9 @@ git clone https://github.com/MuSAELab/SRMRToolbox.git perl -i -pe 's/wavread/audioread/g' SRMRToolbox/libs/preprocess.m perl -i -pe 's/SRMR_main/SRMR/g' prog/score_real.m perl -i -pe 's/SRMR_main/SRMR/g' prog/score_sim.m -perl -i -pe 's/+wb\ //g' prog/calcpesq.m +perl -i -pe 's/\+wb //g' prog/calcpesq.m perl -i -pe 's/pesq_/_pesq_/g' prog/calcpesq.m -perl -n -i -e 'print if $. != 30 && $. != 31' prog/calcpesq.m # Delete lines 30 and 31 from file +perl -n -i -e 'print unless /*remove target file name/' prog/calcpesq.m patch score_RealData.m -i ../../../score_RealData.patch -o score_RealData_new.m mv score_RealData_new.m score_RealData.m patch score_SimData.m -i ../../../score_SimData.patch -o score_SimData_new.m diff --git a/egs/yomdle_fa/v1/local/prepare_dict.sh b/egs/yomdle_fa/v1/local/prepare_dict.sh index 4049628e705..8d14130d8c0 100755 --- a/egs/yomdle_fa/v1/local/prepare_dict.sh +++ b/egs/yomdle_fa/v1/local/prepare_dict.sh @@ -18,7 +18,7 @@ mkdir -p $dir local/prepare_lexicon.py --data-dir $data_dir $dir -grep -v -e '^\s*$' $dir/lexicon.txt +perl -i -ne 'print if /\S/' $dir/lexicon.txt cut -d' ' -f2- $dir/lexicon.txt | sed 's/SIL//g' | tr ' ' '\n' | sort -u | sed '/^$/d' >$dir/nonsilence_phones.txt || exit 1; echo ' SIL' >> $dir/lexicon.txt diff --git a/egs/yomdle_zh/v1/local/create_download.sh b/egs/yomdle_zh/v1/local/create_download.sh index 1daad354473..ca7e1dbf41a 100755 --- a/egs/yomdle_zh/v1/local/create_download.sh +++ b/egs/yomdle_zh/v1/local/create_download.sh @@ -43,4 +43,4 @@ local/create_line_image_from_page_image.py \ echo "Downloading table for CangJie." wget -P $download_dir/ $cangjie_url || exit 1; -perl -n -i -e 'print if $. > 8' $download_dir/cj5-cc.txt +#perl -n -i -e 'print if $. > 8' $download_dir/cj5-cc.txt diff --git a/misc/maintenance/fix_cpplint_whitespace.sh b/misc/maintenance/fix_cpplint_whitespace.sh index 19402cbcf16..8d99aebbac2 100755 --- a/misc/maintenance/fix_cpplint_whitespace.sh +++ b/misc/maintenance/fix_cpplint_whitespace.sh @@ -3,11 +3,11 @@ # Let's run a set of in-place modifications by sed-commands, for file in $@; do - perl -i -pe 's/; \/\//; \/\//' $file # '; //' -> '; //' - perl -i -pe 's/{ \/\//{ \/\//' $file # '{ //' -> '{ //' - perl -i -pe 's/} \/\//} \/\//' $file # '} //' -> '} //' - perl -i -pe 's/for(/for (/' $file # 'for(' -> 'for (' - perl -i -pe 's/if(/if (/' $file # 'if(' -> 'if (' - perl -i -pe 's/[ \t]+$//' $file # 'remove white-space at the end of lines' + sed -i 's/; \/\//; \/\//' $file # '; //' -> '; //' + sed -i 's/{ \/\//{ \/\//' $file # '{ //' -> '{ //' + sed -i 's/} \/\//} \/\//' $file # '} //' -> '} //' + sed -i 's/for(/for (/' $file # 'for(' -> 'for (' + sed -i 's/if(/if (/' $file # 'if(' -> 'if (' + sed -i 's/\s\s*$//' $file # 'remove white-space at the end of lines' done diff --git a/tools/extras/install_portaudio.sh b/tools/extras/install_portaudio.sh index 423291edbf0..58797f554e8 100755 --- a/tools/extras/install_portaudio.sh +++ b/tools/extras/install_portaudio.sh @@ -82,7 +82,7 @@ if [ -z "$MACOS" ]; then fi ./configure --prefix=`pwd`/install --with-pic -perl -i.bk -pe 's:src/common/pa_ringbuffer.o:: if $.==40; s:$: src/common/pa_ringbuffer.o: if $.==40' Makefile +perl -i -pe 's:src/common/pa_ringbuffer.o:: if /^OTHER_OBJS\s*=/' Makefile if [ "$MACOS" != "" ]; then echo "detected MacOS operating system ... trying to fix Makefile" From 48c09a55cbd799d2d75d53287403522540c33356 Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Wed, 6 Mar 2019 21:38:33 -0500 Subject: [PATCH 08/10] minor change --- egs/yomdle_zh/v1/local/create_download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/egs/yomdle_zh/v1/local/create_download.sh b/egs/yomdle_zh/v1/local/create_download.sh index ca7e1dbf41a..1daad354473 100755 --- a/egs/yomdle_zh/v1/local/create_download.sh +++ b/egs/yomdle_zh/v1/local/create_download.sh @@ -43,4 +43,4 @@ local/create_line_image_from_page_image.py \ echo "Downloading table for CangJie." wget -P $download_dir/ $cangjie_url || exit 1; -#perl -n -i -e 'print if $. > 8' $download_dir/cj5-cc.txt +perl -n -i -e 'print if $. > 8' $download_dir/cj5-cc.txt From 73ec088107989d82757a45ae68a675d5766042c9 Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Thu, 7 Mar 2019 18:45:13 -0500 Subject: [PATCH 09/10] retain diagnostic output --- egs/ami/s5/local/ami_ihm_scoring_data_prep.sh | 6 +++++- egs/ami/s5/local/ami_mdm_scoring_data_prep.sh | 6 +++++- egs/ami/s5/local/ami_sdm_scoring_data_prep.sh | 6 +++++- egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh | 6 +++++- egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh | 6 +++++- egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh b/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh index 449917599e5..7112e0259a0 100755 --- a/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_ihm_scoring_data_prep.sh @@ -92,7 +92,11 @@ join $dir/utt2spk $dir/segments | \ $pu=$_[1]; $pt=$_[4]; }' > $dir/segments_to_fix -perl -i -pf $dir/segments_to_fix $dir/segments +if [ -s $dir/segments_to_fix ]; then + echo "$0. Applying following fixes to segments" + cat $dir/segments_to_fix + perl -i -pf $dir/segments_to_fix $dir/segments +fi # Copy stuff into its final locations fdir=data/ihm/$SET diff --git a/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh b/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh index fded6b4ac72..9c4b55308f2 100755 --- a/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_mdm_scoring_data_prep.sh @@ -99,7 +99,11 @@ join $tmpdir/utt2spk_stm $tmpdir/segments | \ spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +if [ -s $tmpdir/segments_to_fix ]; then + echo "$0. Applying following fixes to segments" + cat $tmpdir/segments_to_fix + perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +fi # Copy stuff into its final locations [this has been moved from the format_data # script] diff --git a/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh b/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh index 2978c7ee8a0..815e1b2d270 100755 --- a/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh +++ b/egs/ami/s5/local/ami_sdm_scoring_data_prep.sh @@ -106,7 +106,11 @@ join $tmpdir/utt2spk_stm $tmpdir/segments | \ spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +if [ -s $tmpdir/segments_to_fix ]; then + echo "$0. Applying following fixes to segments" + cat $tmpdir/segments_to_fix + perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +fi # Copy stuff into its final locations [this has been moved from the format_data # script] diff --git a/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh index 29c6341ba6f..c54876331f1 100755 --- a/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_ihm_scoring_data_prep.sh @@ -98,7 +98,11 @@ join $dir/utt2spk $dir/segments | \ $pu=$_[1]; $pt=$_[4]; }' > $dir/segments_to_fix -perl -i -pf $dir/segments_to_fix $dir/segments +if [ -s $dir/segments_to_fix ]; then + echo "$0. Applying following fixes to segments" + cat $dir/segments_to_fix + perl -i -pf $dir/segments_to_fix $dir/segments +fi # Copy stuff into its final locations mkdir -p $odir diff --git a/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh index 291e061d68b..475ef5405ba 100755 --- a/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_mdm_scoring_data_prep.sh @@ -104,7 +104,11 @@ join $tmpdir/utt2spk_stm $tmpdir/segments | \ spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +if [ -s $tmpdir/segments_to_fix ]; then + echo "$0. Applying following fixes to segments" + cat $tmpdir/segments_to_fix + perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +fi # Copy stuff into its final locations [this has been moved from the format_data # script] diff --git a/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh b/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh index 6994bfc067f..d7ce038c0a7 100755 --- a/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh +++ b/egs/ami/s5b/local/ami_sdm_scoring_data_prep.sh @@ -116,7 +116,11 @@ join $tmpdir/utt2spk_stm $tmpdir/segments | \ spk_prev=spk; t_end_prev=t_end; }' > $tmpdir/segments_to_fix -perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +if [ -s $tmpdir/segments_to_fix ]; then + echo "$0. Applying following fixes to segments" + cat $tmpdir/segments_to_fix + perl -i -pf $tmpdir/segments_to_fix $tmpdir/segments +fi # Copy stuff into its final locations [this has been moved from the format_data # script] From d8d225c672123d7d52b3f3a55f25b7d986c463b4 Mon Sep 17 00:00:00 2001 From: Desh Raj Date: Thu, 7 Mar 2019 18:51:41 -0500 Subject: [PATCH 10/10] minor fix --- egs/reverb/s5/local/download_se_eval_tool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/egs/reverb/s5/local/download_se_eval_tool.sh b/egs/reverb/s5/local/download_se_eval_tool.sh index c1811264771..0d7bb8305ea 100755 --- a/egs/reverb/s5/local/download_se_eval_tool.sh +++ b/egs/reverb/s5/local/download_se_eval_tool.sh @@ -25,7 +25,7 @@ perl -i -pe 's/SRMR_main/SRMR/g' prog/score_real.m perl -i -pe 's/SRMR_main/SRMR/g' prog/score_sim.m perl -i -pe 's/\+wb //g' prog/calcpesq.m perl -i -pe 's/pesq_/_pesq_/g' prog/calcpesq.m -perl -n -i -e 'print unless /*remove target file name/' prog/calcpesq.m +perl -n -i -e 'print unless /remove target file name/' prog/calcpesq.m patch score_RealData.m -i ../../../score_RealData.patch -o score_RealData_new.m mv score_RealData_new.m score_RealData.m patch score_SimData.m -i ../../../score_SimData.patch -o score_SimData_new.m