sandbox/nnet3: merging changes from trunk.

git-svn-id: http://svn.code.sf.net/p/kaldi/code@5121 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

egs/ami/s5/local/ami_split_segments.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2014  University of Edinburgh (Author: Pawel Swietojanski)
 

egs/ami/s5/local/convert2stm.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Daniel Povey).  Apache 2.0.
 #           2013  University of Edinburgh (Author: Pawel Swietojanski)

egs/ami/s5/local/fisher_map_words.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+use warnings; #sed replacement for -w perl parameter
 
 # Copyright 2013  Arnab Ghoshal
 

egs/ami/s5/local/run_dnn.sh

@@ -67,10 +67,10 @@ if [ $stage -le 2 ]; then
     $data_fmllr/$mic/train_tr90 $data_fmllr/$mic/train_cv10 data/lang $ali $ali $dir || exit 1;
   # Decode (reuse HCLG graph)
   steps/nnet/decode.sh --nj 6 --cmd "$decode_cmd" --config conf/decode_dnn.conf --acwt 0.1 \
-    --num-threads 3 --parallel-opts "-pe smp 4" \
+    --num-threads 3 \
     $graph_dir $data_fmllr/$mic/dev $dir/decode_dev_${lm_suffix} || exit 1;
   steps/nnet/decode.sh --nj 6 --cmd "$decode_cmd" --config conf/decode_dnn.conf --acwt 0.1 \
-    --num-threads 3 --parallel-opts "-pe smp 4" \
+    --num-threads 3 \
     $graph_dir $data_fmllr/$mic/eval $dir/decode_eval_${lm_suffix} || exit 1;
 fi
 
@@ -96,11 +96,11 @@ if [ $stage -le 4 ]; then
   # Decode (reuse HCLG graph)
   for ITER in 1; do
     steps/nnet/decode.sh --nj 6 --cmd "$decode_cmd" --config conf/decode_dnn.conf \
-      --num-threads 3 --parallel-opts "-pe smp 4" \
+      --num-threads 3 \
       --nnet $dir/${ITER}.nnet --acwt $acwt \
       $graph_dir $data_fmllr/$mic/dev $dir/decode_dev_${lm_suffix} || exit 1;
     steps/nnet/decode.sh --nj 6 --cmd "$decode_cmd" --config conf/decode_dnn.conf \
-      --num-threads 3 --parallel-opts "-pe smp 4" \
+      --num-threads 3 \
       --nnet $dir/${ITER}.nnet --acwt $acwt \
       $graph_dir $data_fmllr/$mic/eval $dir/decode_eval_${lm_suffix} || exit 1;
   done 
@@ -126,11 +126,11 @@ if [ $stage -le 6 ]; then
   # Decode (reuse HCLG graph)
   for ITER in 1 2 3 4; do
     steps/nnet/decode.sh --nj 6 --cmd "$decode_cmd" --config conf/decode_dnn.conf \
-      --num-threads 3 --parallel-opts "-pe smp 4" \
+      --num-threads 3 \
       --nnet $dir/${ITER}.nnet --acwt $acwt \
       $graph_dir $data_fmllr/$mic/dev $dir/decode_dev_${lm_suffix}_$ITER || exit 1;
     steps/nnet/decode.sh --nj 6 --cmd "$decode_cmd" --config conf/decode_dnn.conf \
-      --num-threads 3 --parallel-opts "-pe smp 4" \
+      --num-threads 3 \
       --nnet $dir/${ITER}.nnet --acwt $acwt \
       $graph_dir $data_fmllr/$mic/eval $dir/decode_eval_${lm_suffix}_$ITER || exit 1;
   done 

egs/aspire/s5/local/fisher_fix_speakerid.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+use warnings; #sed replacement for -w perl parameter
 
 # Author: Peng Qi (pengqi@cs.stanford.edu)
 # This script maps Switchboard speaker IDs to the true physical speakers

egs/aspire/s5/local/multi_condition/corrupt.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2014  Johns Hopkins University (Authors: Vijayaditya Peddinti).  Apache 2.0.
 
 # corrupts the wave files supplied via input pipe with the specified

egs/aspire/s5/local/multi_condition/create_uniform_segments.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2014  Johns Hopkins University (Authors: Daniel Povey, Vijayaditya Peddinti).  Apache 2.0.
 
 # creates a segments file in the provided data directory 

egs/aspire/s5/local/multi_condition/get_air_file_patterns.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2014  Johns Hopkins University (Authors: Vijayaditya Peddinti).  Apache 2.0.
 
 # script to generate the file_patterns of the AIR database

egs/aspire/s5/local/multi_condition/get_reverberate_parameter_lists.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2014  Johns Hopkins University (Authors: Vijayaditya Peddinti).  Apache 2.0.
 # script to generate multicondition training data / dev data / test data
 import argparse, glob, math, os, random, scipy.io.wavfile, sys

egs/aspire/s5/local/multi_condition/normalize_wavs.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2014  Johns Hopkins University (Authors: Vijayaditya Peddinti).  Apache 2.0.
 
 # normalizes the wave files provided in input file list with a common scaling factor

egs/aspire/s5/local/multi_condition/read_rir.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2014  Johns Hopkins University (Authors: Vijayaditya Peddinti).  Apache 2.0.
 
 # script to read rir files from rwcp/air/reverb2014 databases

egs/aspire/s5/local/multi_condition/resolve_ctm_overlaps.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2014  Johns Hopkins University (Authors: Daniel Povey, Vijayaditya Peddinti).  Apache 2.0.
 
 # Script to combine ctms for uniformly segmented, with overlaps

egs/aurora4/s5/cmd.sh

@@ -7,10 +7,10 @@
 
 #a) JHU cluster options
 export train_cmd="queue.pl -l arch=*64"
-export decode_cmd="queue.pl -l arch=*64,mem_free=2G,ram_free=2G"
+export decode_cmd="queue.pl -l arch=*64 --mem 2G"
-export mkgraph_cmd="queue.pl -l arch=*64,ram_free=4G,mem_free=4G"
+export mkgraph_cmd="queue.pl -l arch=*64 --mem 4G"
-export big_memory_cmd="queue.pl -l arch=*64,ram_free=8G,mem_free=8G"
+export big_memory_cmd="queue.pl -l arch=*64 --mem 8G"
-export cuda_cmd="queue.pl -l gpu=1"
+export cuda_cmd="queue.pl --gpu 1"
 
 
 #b) BUT cluster options

egs/aurora4/s5/local/aurora2flist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2010-2011 Microsoft Corporation
 

egs/aurora4/s5/local/cstr_ndx2flist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2010-2011 Microsoft Corporation
 

egs/aurora4/s5/local/dict/add_counts.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 
 # Add counts to an oovlist.

egs/aurora4/s5/local/dict/count_rules.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program takes the output of score_prons.pl and collates
 # it for each (rule, destress) pair so that we get the

egs/aurora4/s5/local/dict/filter_dict.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 
 # This program reads and writes either a dictionary or just a list

egs/aurora4/s5/local/dict/find_acronyms.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Reads a dictionary, and prints out a list of words that seem to be pronounced
 # as acronyms (not including plurals of acronyms, just acronyms).  Uses

egs/aurora4/s5/local/dict/get_acronym_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Reads a dictionary (for prons of letters), and an OOV list,
 # and puts out candidate pronunciations of words in that list

egs/aurora4/s5/local/dict/get_candidate_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This script takes three command-line arguments (typically files, or "-"):
 # the suffix rules (as output by get_rules.pl), the rule-hierarchy 

egs/aurora4/s5/local/dict/get_rule_hierarchy.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #This reads in rules, of the form put out by get_rules.pl, e.g.:
 # ERT,,ER0 T,

egs/aurora4/s5/local/dict/get_rules.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program creates suggested suffix rules from a dictionary.
 # It outputs quadruples of the form:

egs/aurora4/s5/local/dict/limit_candidate_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program enforces the rule that
 # if a "more specific" rule applies, we cannot use the more general rule.

egs/aurora4/s5/local/dict/reverse_candidates.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This takes the output of e.g. get_candidate_prons.pl or limit_candidate_prons.pl,
 # which is 7-tuples, one per line, of the form:

egs/aurora4/s5/local/dict/reverse_dict.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Used in conjunction with get_rules.pl
 # example input line: XANTHE  Z AE1 N DH

egs/aurora4/s5/local/dict/score_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program takes candidate prons from "get_candidate_prons.pl" or
 # "limit_candidate_prons.pl", and a reference dictionary covering those words,

egs/aurora4/s5/local/dict/score_rules.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program takes the output of count_rules.pl, which is tuples
 # of the form

egs/aurora4/s5/local/dict/select_candidate_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This takes the output of e.g. get_candidate_prons.pl or limit_candidate_prons.pl
 # or reverse_candidates.pl, which is 7-tuples, one per line, of the form:

egs/aurora4/s5/local/find_transcripts.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/aurora4/s5/local/flist2scp.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/aurora4/s5/local/flist2scp_12.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/aurora4/s5/local/ndx2flist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/aurora4/s5/local/normalize_transcript.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5/conf/bnf/config_full.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #################################################
 ## PTDNN - Python Toolkit for Deep Neural Network
 ## Author: Yajie Miao

egs/babel/s5/conf/bnf/config_limited.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #################################################
 ## PTDNN - Python Toolkit for Deep Neural Network
 ## Author: Yajie Miao

egs/babel/s5/local/annotated_kwlist_to_KWs.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5/local/augment_original_stm.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+use warnings; #sed replacement for -w perl parameter
 # Copyright 2012  Johns Hopkins University (Author: Jan Trmal)
 # Apache 2.0.
 

egs/babel/s5/local/build_edit_distance_fst.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5/local/count_to_logprob.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5/local/cstr_ndx2flist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2010-2011 Microsoft Corporation
 

egs/babel/s5/local/dict/add_counts.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 
 # Add counts to an oovlist.

egs/babel/s5/local/dict/count_rules.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program takes the output of score_prons.pl and collates
 # it for each (rule, destress) pair so that we get the

egs/babel/s5/local/dict/filter_dict.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 
 # This program reads and writes either a dictionary or just a list

egs/babel/s5/local/dict/find_acronyms.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Reads a dictionary, and prints out a list of words that seem to be pronounced
 # as acronyms (not including plurals of acronyms, just acronyms).  Uses

egs/babel/s5/local/dict/get_acronym_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Reads a dictionary (for prons of letters), and an OOV list,
 # and puts out candidate pronunciations of words in that list

egs/babel/s5/local/dict/get_candidate_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This script takes three command-line arguments (typically files, or "-"):
 # the suffix rules (as output by get_rules.pl), the rule-hierarchy 

egs/babel/s5/local/dict/get_rule_hierarchy.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 #This reads in rules, of the form put out by get_rules.pl, e.g.:
 # ERT,,ER0 T,

egs/babel/s5/local/dict/get_rules.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program creates suggested suffix rules from a dictionary.
 # It outputs quadruples of the form:

egs/babel/s5/local/dict/limit_candidate_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program enforces the rule that
 # if a "more specific" rule applies, we cannot use the more general rule.

egs/babel/s5/local/dict/reverse_candidates.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This takes the output of e.g. get_candidate_prons.pl or limit_candidate_prons.pl,
 # which is 7-tuples, one per line, of the form:

egs/babel/s5/local/dict/reverse_dict.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Used in conjunction with get_rules.pl
 # example input line: XANTHE  Z AE1 N DH

egs/babel/s5/local/dict/score_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program takes candidate prons from "get_candidate_prons.pl" or
 # "limit_candidate_prons.pl", and a reference dictionary covering those words,

egs/babel/s5/local/dict/score_rules.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This program takes the output of count_rules.pl, which is tuples
 # of the form

egs/babel/s5/local/dict/select_candidate_prons.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This takes the output of e.g. get_candidate_prons.pl or limit_candidate_prons.pl
 # or reverse_candidates.pl, which is 7-tuples, one per line, of the form:

egs/babel/s5/local/extract_oov_words.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2012  Johns Hopkins University (Author: Yenda Trmal)
 # Apache 2.0.
 

egs/babel/s5/local/filter_keywords.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
 use warnings;

egs/babel/s5/local/find_transcripts.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5/local/fix_kwslist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen, Jan Trmal)
 # Apache 2.0.

egs/babel/s5/local/flist2scp.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5/local/gridsearch.pl

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 use warnings;
 use strict;

egs/babel/s5/local/gridsearch2.pl

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 use warnings;
 use strict;

egs/babel/s5/local/kwords2indices.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2012  Johns Hopkins University (Author: Yenda Trmal)
 # Apache 2.0.
 

egs/babel/s5/local/kws_oracle_threshold.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5/local/make_lexicon_fst_special.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+use warnings; #sed replacement for -w perl parameter
 # Copyright 2012  Johns Hopkins University (author: Daniel Povey)
 
 # makes lexicon FST -- special version only for use in keyword search

egs/babel/s5/local/naive_comb.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5/local/ndx2flist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5/local/normalize_transcript.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5/local/prepare_acoustic_training_data.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use Getopt::Long;
 
 ########################################################################

egs/babel/s5/local/prepare_lexicon.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use Getopt::Long;
 use Data::Dumper;
 

egs/babel/s5/local/prepare_stm.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use Getopt::Long;
 use Encode;
 

egs/babel/s5/local/score_combine.sh

@@ -33,7 +33,7 @@ lat_weights=
 word_ins_penalty=0.0
 min_lmwt=7
 max_lmwt=17
-parallel_opts="-pe smp 3"
+parallel_opts="--num-threads 3"
 skip_scoring=false
 ctm_name=
 #end configuration section.
@@ -49,7 +49,7 @@ Options:
   --cmd (run.pl|queue.pl...)      # specify how to run the sub-processes.
   --stage (0|1|2)                 # (createCTM | filterCTM | runSclite).
   --parallel-opts <string>        # extra options to command for combination stage,
-                                  # default '-pe smp 3'
+                                  # default '--num-threads 3'
   --cer (0|1)                     # compute CER in addition to WER
 ";
 

egs/babel/s5/local/subset_atwv.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5/local/uem_ctm2segments.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use Getopt::Long;
 
 ################################################################################

egs/babel/s5/run-6-combine.sh

@@ -13,7 +13,7 @@ set -u
 
 if [ ! -f exp/combine_2/decode_dev2h/.done ]; then
   for iter in 1 2 3 4; do
-    local/score_combine.sh --cmd "queue.pl -l mem_free=2.0G,ram_free=2.0G" \
+    local/score_combine.sh --cmd "queue.pl --mem 2G" \
       data/dev2h data/lang exp/tri6_nnet/decode_dev2h exp/sgmm5_mmi_b0.1/decode_dev2h_fmllr_it$iter exp/combine_2/decode_dev2h_it$iter
     touch exp/combine_2/decode_dev2h/.done 
   done
@@ -25,7 +25,7 @@ if [ ! -f exp/combine_3/decode_dev2h/.done ]; then
     if [ ! -f exp_BNF/sgmm7_mmi_b0.1/decode_dev2h_fmllr_it$iter/.done ]; then
       echo "BNF decode in exp_BNF/sgmm7_mmi_b0.1/decode_dev2h_fmllr_it$iter is not done, skipping this step."
     fi
-    local/score_combine.sh --cmd "queue.pl -l mem_free=2.0G,ram_free=2.0G" \
+    local/score_combine.sh --cmd "queue.pl --mem 2G" \
       data/dev2h data/lang exp_BNF/sgmm7_mmi_b0.1/decode_dev2h_fmllr_it$iter:10 \
       exp/sgmm5_mmi_b0.1/decode_dev2h_fmllr_it$iter exp/tri5_nnet/decode_dev2h exp/combine_3/decode_dev2h_it$iter
     touch exp_BNF/sgmm7_mmi_b0.1/decode_dev2h_fmllr_it$iter/.done

egs/babel/s5/steps_BNF/pfile_burst.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2013  Karlsruhe Institute of Technology (Author: Jonas Gehring)
 # Apache 2.0.

egs/babel/s5/steps_BNF/pfile_rconcat.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2013  Karlsruhe Institute of Technology (Author: Jonas Gehring)
 # Apache 2.0.

egs/babel/s5b/conf/bnf/config_full.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #################################################
 ## PTDNN - Python Toolkit for Deep Neural Network
 ## Author: Yajie Miao

egs/babel/s5b/conf/bnf/config_limited.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #################################################
 ## PTDNN - Python Toolkit for Deep Neural Network
 ## Author: Yajie Miao

egs/babel/s5b/local/annotated_kwlist_to_KWs.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5b/local/apply_map_tab_preserving.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+use warnings; #sed replacement for -w perl parameter
 
 # Copyright 2012-2014  Johns Hopkins University (Author: Daniel Povey)
 # Apache 2.0.

egs/babel/s5b/local/augment_original_stm.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+use warnings; #sed replacement for -w perl parameter
 # Copyright 2012  Johns Hopkins University (Author: Jan Trmal)
 # Apache 2.0.
 

egs/babel/s5b/local/build_edit_distance_fst.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5b/local/count_to_logprob.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5b/local/cstr_ndx2flist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2010-2011 Microsoft Corporation
 

egs/babel/s5b/local/extract_oov_words.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2012  Johns Hopkins University (Author: Yenda Trmal)
 # Apache 2.0.
 

egs/babel/s5b/local/filter_keywords.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
 use warnings;

egs/babel/s5b/local/find_transcripts.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5b/local/flist2scp.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5b/local/gridsearch.pl

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 use warnings;
 use strict;

egs/babel/s5b/local/gridsearch2.pl

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 use warnings;
 use strict;

egs/babel/s5b/local/kwords2indices.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2012  Johns Hopkins University (Author: Yenda Trmal)
 # Apache 2.0.
 

egs/babel/s5b/local/kws_oracle_threshold.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5b/local/make_lexicon_fst_special.pl

@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+use warnings; #sed replacement for -w perl parameter
 # Copyright 2012  Johns Hopkins University (author: Daniel Povey)
 
 # makes lexicon FST -- special version only for use in keyword search

egs/babel/s5b/local/naive_comb.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 # Apache 2.0.

egs/babel/s5b/local/ndx2flist.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5b/local/normalize_transcript.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Copyright 2010-2011 Microsoft Corporation
 
 # Licensed under the Apache License, Version 2.0 (the "License");

egs/babel/s5b/local/prepare_acoustic_training_data.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use Getopt::Long;
 
 ########################################################################

egs/babel/s5b/local/prepare_lexicon.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use Getopt::Long;
 use Data::Dumper;
 

egs/babel/s5b/local/prepare_stm.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use Getopt::Long;
 use Encode;