Skip to content

Commit

Permalink
[scripts] Change hostname -d to hostname -f for mac compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
danpovey committed Sep 27, 2017
1 parent b5d7d41 commit b0cc157
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 12 deletions.
2 changes: 1 addition & 1 deletion egs/ami/s5/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/ami/s5b/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/an4/s5/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/cifar/v1/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion egs/fame/s5/cmd.sh

This file was deleted.

23 changes: 23 additions & 0 deletions egs/fame/s5/cmd.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion egs/fame/v1/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/fame/v2/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/lre07/v2/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/rm/s5/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/swbd/s5c/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/timit/s5/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion egs/wsj/s5/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b0cc157

Please sign in to comment.