[scripts] Change hostname -d to hostname -f for mac compatibility.

12 files changed, 34 insertions, 12 deletions

diff --git a/egs/ami/s5/cmd.sh b/egs/ami/s5/cmd.sh
index a5d83c58e..844a1af96 100644
--- a/egs/ami/s5/cmd.sh
+++ b/egs/ami/s5/cmd.sh
@@ -29,7 +29,7 @@ export tfrnnlm_cmd="queue.pl -l hostname=b*"  # this is specific to the CLSP gri
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1 --mem 20G"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/ami/s5b/cmd.sh b/egs/ami/s5b/cmd.sh
index cca558c71..b004c5569 100644
--- a/egs/ami/s5b/cmd.sh
+++ b/egs/ami/s5b/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd="queue.pl --mem 2G"
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1 --mem 20G"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/an4/s5/cmd.sh b/egs/an4/s5/cmd.sh
index 96c6c2a43..ed6991ae7 100644
--- a/egs/an4/s5/cmd.sh
+++ b/egs/an4/s5/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd=queue.pl
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/cifar/v1/cmd.sh b/egs/cifar/v1/cmd.sh
index a14090a74..ad3b7921d 100644
--- a/egs/cifar/v1/cmd.sh
+++ b/egs/cifar/v1/cmd.sh
@@ -18,7 +18,7 @@ export cuda_cmd="queue.pl --gpu 1"
 
 # the rest of this file is present for historical reasons.  it's better to
 # create and edit conf/queue.conf for cluster-specific configuration.
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   # BUT cluster:
   queue="all.q@@blade,all.q@@speech"
   storage="matylda5"
diff --git a/egs/fame/s5/cmd.sh b/egs/fame/s5/cmd.sh
index 19f7e8366..179307556 120000..100755
--- a/egs/fame/s5/cmd.sh
+++ b/egs/fame/s5/cmd.sh
@@ -1 +1,23 @@
-../../wsj/s5/cmd.sh
\ No newline at end of file
+# you can change cmd.sh depending on what type of queue you are using.
+# If you have no queueing system and want to run on a local machine, you
+# can change all instances 'queue.pl' to run.pl (but be careful and run
+# commands one by one: most recipes will exhaust the memory on your
+# machine).  queue.pl works with GridEngine (qsub).  slurm.pl works
+# with slurm.  Different queues are configured differently, with different
+# queue names and different ways of specifying things like memory;
+# to account for these differences you can create and edit the file
+# conf/queue.conf to match your queue's configuration.  Search for
+# conf/queue.conf in http://kaldi-asr.org/doc/queue.html for more information,
+# or search for the string 'default_config' in utils/queue.pl or utils/slurm.pl.
+
+export train_cmd=queue.pl
+export decode_cmd="queue.pl --mem 2G"
+# the use of cuda_cmd is deprecated, used only in 'nnet1',
+export cuda_cmd="queue.pl --gpu 1"
+
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
+  queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
+  export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
+  export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
+  export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
+fi
diff --git a/egs/fame/v1/cmd.sh b/egs/fame/v1/cmd.sh
index 23721d04c..179307556 100644
--- a/egs/fame/v1/cmd.sh
+++ b/egs/fame/v1/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd="queue.pl --mem 2G"
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/fame/v2/cmd.sh b/egs/fame/v2/cmd.sh
index 23721d04c..179307556 100644
--- a/egs/fame/v2/cmd.sh
+++ b/egs/fame/v2/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd="queue.pl --mem 2G"
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/lre07/v2/cmd.sh b/egs/lre07/v2/cmd.sh
index 81a76a12a..c5a7c9295 100644
--- a/egs/lre07/v2/cmd.sh
+++ b/egs/lre07/v2/cmd.sh
@@ -26,7 +26,7 @@ export cuda_cmd="queue.pl --gpu 1 --mem 20G"
 #export highmem_cmd="queue.pl -P inf_hcrc_cstr_nst -l h_rt=05:00:00 -pe memory-2G 4"
 #export scoring_cmd="queue.pl -P inf_hcrc_cstr_nst  -l h_rt=00:20:00"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
     # BUT cluster:
     queue="all.q@@blade,all.q@@speech"
     storage="matylda5"
diff --git a/egs/rm/s5/cmd.sh b/egs/rm/s5/cmd.sh
index 96c6c2a43..ed6991ae7 100644
--- a/egs/rm/s5/cmd.sh
+++ b/egs/rm/s5/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd=queue.pl
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/swbd/s5c/cmd.sh b/egs/swbd/s5c/cmd.sh
index abead5a05..fc5d4aa9e 100644
--- a/egs/swbd/s5c/cmd.sh
+++ b/egs/swbd/s5c/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd="queue.pl --mem 4G"
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/timit/s5/cmd.sh b/egs/timit/s5/cmd.sh
index 046eb7db2..6c6dc88ce 100644
--- a/egs/timit/s5/cmd.sh
+++ b/egs/timit/s5/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd="queue.pl --mem 4G"
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
diff --git a/egs/wsj/s5/cmd.sh b/egs/wsj/s5/cmd.sh
index 23721d04c..179307556 100644
--- a/egs/wsj/s5/cmd.sh
+++ b/egs/wsj/s5/cmd.sh
@@ -15,7 +15,7 @@ export decode_cmd="queue.pl --mem 2G"
 # the use of cuda_cmd is deprecated, used only in 'nnet1',
 export cuda_cmd="queue.pl --gpu 1"
 
-if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
+if [[ "$(hostname -f)" == "*.fit.vutbr.cz" ]]; then
   queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
   export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
   export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"