[scripts] Change hostname -d to hostname -f for mac compatibility.
authorDaniel Povey <dpovey@gmail.com>
Wed, 27 Sep 2017 00:21:29 +0000 (20:21 -0400)
committerDaniel Povey <dpovey@gmail.com>
Wed, 27 Sep 2017 00:21:29 +0000 (20:21 -0400)
12 files changed:
egs/ami/s5/cmd.sh
egs/ami/s5b/cmd.sh
egs/an4/s5/cmd.sh
egs/cifar/v1/cmd.sh
egs/fame/s5/cmd.sh [changed from symlink to file mode: 0755]
egs/fame/v1/cmd.sh
egs/fame/v2/cmd.sh
egs/lre07/v2/cmd.sh
egs/rm/s5/cmd.sh
egs/swbd/s5c/cmd.sh
egs/timit/s5/cmd.sh
egs/wsj/s5/cmd.sh

index a5d83c58e2f01f947d6d90d4685d3abbaf80fdf3..844a1af96288a36ca245ed637f2205645c0d56e6 100644 (file)
@@ -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"
index cca558c710a182ab93e4936c8fc5ca7de6c45d47..b004c5569dfe6639a87a889b2a2e0b473b09698b 100644 (file)
@@ -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"
index 96c6c2a4303c52263d76ae16d47af262443c7ff2..ed6991ae7ad4430d19099ede316c59a11bfb47c1 100644 (file)
@@ -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"
index a14090a74a184c604bc5434f8f0a0a9d4f4c6af7..ad3b7921dabb74e1416f73776f35a6a9bb48b44c 100644 (file)
@@ -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"
deleted file mode 120000 (symlink)
index 19f7e836644205d52ae44dbae5b7069eacfd72c8..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-../../wsj/s5/cmd.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..179307556d565cba33ec1085f8ea5926e7e93353
--- /dev/null
@@ -0,0 +1,23 @@
+# 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
index 23721d04c56eab055647a611f2ddae93c4c26628..179307556d565cba33ec1085f8ea5926e7e93353 100644 (file)
@@ -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"
index 23721d04c56eab055647a611f2ddae93c4c26628..179307556d565cba33ec1085f8ea5926e7e93353 100644 (file)
@@ -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"
index 81a76a12a6d2e9624352e84362cb6ca52a5db8e7..c5a7c9295bc13d68c40bef3063682c0ad6d94230 100644 (file)
@@ -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"
index 96c6c2a4303c52263d76ae16d47af262443c7ff2..ed6991ae7ad4430d19099ede316c59a11bfb47c1 100644 (file)
@@ -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"
index abead5a05721499f8577a12d742e6f0e0cc45e1a..fc5d4aa9e1cda3dd65950a8d8b5291d7a0241338 100644 (file)
@@ -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"
index 046eb7db250074ae5d20f6160132c0f3486b7087..6c6dc88ce1a85986401d8aa411c420c10c0ee38b 100644 (file)
@@ -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"
index 23721d04c56eab055647a611f2ddae93c4c26628..179307556d565cba33ec1085f8ea5926e7e93353 100644 (file)
@@ -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"