diff options
author | Roman Grundkiewicz <rgrundki@exseed.ed.ac.uk> | 2018-10-15 16:19:57 +0300 |
---|---|---|
committer | Roman Grundkiewicz <rgrundki@exseed.ed.ac.uk> | 2018-10-15 16:19:57 +0300 |
commit | 7f6d63739280a9dc5c160be7dc9e4f8de2b442fd (patch) | |
tree | 3b6753819ecad563072ddd7ce98a06157338c648 /tests/training | |
parent | 2102120ddb5a0edf68751716bd8222e70356f3f1 (diff) |
Expand -o to --optimizer
Diffstat (limited to 'tests/training')
39 files changed, 47 insertions, 47 deletions
diff --git a/tests/training/basics/test_sqlite.sh b/tests/training/basics/test_sqlite.sh index 360d206..c2e0302 100644 --- a/tests/training/basics/test_sqlite.sh +++ b/tests/training/basics/test_sqlite.sh @@ -8,7 +8,7 @@ rm -rf sqlite *sqlite.log mkdir -p sqlite $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --dim-emb 64 --dim-rnn 128 -o sgd \ + --seed 1111 --no-shuffle --dim-emb 64 --dim-rnn 128 --optimizer sgd \ -m sqlite/model.nosqlite.npz \ -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} \ -v sqlite/vocab.en.yml sqlite/vocab.de.yml \ @@ -21,7 +21,7 @@ test -e nosqlite.log $MRT_TOOLS/extract-costs.sh < nosqlite.log > nosqlite.out $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --dim-emb 64 --dim-rnn 128 -o sgd \ + --seed 1111 --no-shuffle --dim-emb 64 --dim-rnn 128 --optimizer sgd \ -m sqlite/model.npz \ -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} --sqlite \ -v sqlite/vocab.en.yml sqlite/vocab.de.yml \ diff --git a/tests/training/basics/test_sqlite_random_seed.sh b/tests/training/basics/test_sqlite_random_seed.sh index 02f9068..6c80ec9 100644 --- a/tests/training/basics/test_sqlite_random_seed.sh +++ b/tests/training/basics/test_sqlite_random_seed.sh @@ -8,7 +8,7 @@ rm -rf sqlite_seed sqlite_seed_?.log mkdir -p sqlite_seed $MRT_MARIAN/build/marian \ - --seed 3333 --dim-emb 64 --dim-rnn 128 -o sgd \ + --seed 3333 --dim-emb 64 --dim-rnn 128 --optimizer sgd \ -m sqlite_seed/model1.npz \ -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} --sqlite \ -v sqlite_seed/vocab.en.yml sqlite_seed/vocab.de.yml \ @@ -19,7 +19,7 @@ test -e sqlite_seed/model1.npz test -e sqlite_seed_1.log $MRT_MARIAN/build/marian \ - --seed 3333 --dim-emb 64 --dim-rnn 128 -o sgd \ + --seed 3333 --dim-emb 64 --dim-rnn 128 --optimizer sgd \ -m sqlite_seed/model2.npz \ -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} --sqlite \ -v sqlite_seed/vocab.en.yml sqlite_seed/vocab.de.yml \ diff --git a/tests/training/data-weighting/test_maxi_batches_with_sentence_weights.sh b/tests/training/data-weighting/test_maxi_batches_with_sentence_weights.sh index 9abd743..0c39b5e 100644 --- a/tests/training/data-weighting/test_maxi_batches_with_sentence_weights.sh +++ b/tests/training/data-weighting/test_maxi_batches_with_sentence_weights.sh @@ -11,7 +11,7 @@ test -e vocab.de.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-e test -e vocab.en.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-en/corpus.bpe.en > vocab.en.yml $MRT_MARIAN/build/marian \ - --seed 3333 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 3333 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m maxibatch/model.npz -t train.1k.{de,en} -v vocab.{de,en}.yml \ --log maxibatch.log --disp-freq 10 --after-batches 100 --mini-batch 16 --cost-type ce-sum \ --data-weighting train.1k.inc.txt --data-weighting-type sentence diff --git a/tests/training/data-weighting/test_maxi_batches_with_word_weights.sh b/tests/training/data-weighting/test_maxi_batches_with_word_weights.sh index 4982d19..2228796 100644 --- a/tests/training/data-weighting/test_maxi_batches_with_word_weights.sh +++ b/tests/training/data-weighting/test_maxi_batches_with_word_weights.sh @@ -11,7 +11,7 @@ test -e vocab.de.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-e test -e vocab.en.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-en/corpus.bpe.en > vocab.en.yml $MRT_MARIAN/build/marian \ - --seed 6666 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 6666 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m word_maxibatch/model.npz -t train.1k.{de,en} -v vocab.{de,en}.yml \ --log word_maxibatch.log --disp-freq 10 --after-batches 100 --mini-batch 16 \ --data-weighting train.1k.wordinc.txt --data-weighting-type word diff --git a/tests/training/data-weighting/test_sentence_weighting_sqlite.sh b/tests/training/data-weighting/test_sentence_weighting_sqlite.sh index 93f9bee..7323c2d 100644 --- a/tests/training/data-weighting/test_sentence_weighting_sqlite.sh +++ b/tests/training/data-weighting/test_sentence_weighting_sqlite.sh @@ -8,7 +8,7 @@ rm -rf sqlite sqlite.log mkdir -p sqlite $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --maxi-batch 1 --maxi-batch-sort none --max-length 100 --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 1111 --no-shuffle --maxi-batch 1 --maxi-batch-sort none --max-length 100 --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m sqlite/model.npz -t train.1k.{de,en} -v vocab.{de,en}.yml \ --log sqlite.log --disp-freq 1 --after-batches 100 --mini-batch 1 \ --data-weighting train.1k.weights.txt --data-weighting-type sentence --sqlite sqlite/corpus.sqlite3 diff --git a/tests/training/data-weighting/test_sentence_weighting_with_ones.sh b/tests/training/data-weighting/test_sentence_weighting_with_ones.sh index 7063c80..caeba16 100644 --- a/tests/training/data-weighting/test_sentence_weighting_with_ones.sh +++ b/tests/training/data-weighting/test_sentence_weighting_with_ones.sh @@ -11,7 +11,7 @@ test -e vocab.de.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-e test -e vocab.en.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-en/corpus.bpe.en > vocab.en.yml $MRT_MARIAN/build/marian \ - --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m noweights/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v vocab.{de,en}.yml \ --log noweights.log --disp-freq 5 -e 2 @@ -22,7 +22,7 @@ cat noweights.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed -r 's/ T cat $MRT_DATA/europarl.de-en/toy.bpe.en | sed -r 's/.*/1/g' > ones.weights.txt $MRT_MARIAN/build/marian \ - --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m ones/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v vocab.{de,en}.yml \ --log ones.log --disp-freq 5 -e 2 \ --data-weighting ones.weights.txt diff --git a/tests/training/data-weighting/test_sentence_weights_x3.sh b/tests/training/data-weighting/test_sentence_weights_x3.sh index 893e5ab..11cec28 100644 --- a/tests/training/data-weighting/test_sentence_weights_x3.sh +++ b/tests/training/data-weighting/test_sentence_weights_x3.sh @@ -11,7 +11,7 @@ test -e vocab.de.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-e test -e vocab.en.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-en/corpus.bpe.en > vocab.en.yml $MRT_MARIAN/build/marian \ - --seed 2222 --no-shuffle --maxi-batch 1 --maxi-batch-sort none --max-length 100 --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 2222 --no-shuffle --maxi-batch 1 --maxi-batch-sort none --max-length 100 --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m x3copied/model.npz -t train.x3.{de,en} -v vocab.{de,en}.yml \ --log x3copied.log --disp-freq 1 --after-batches 100 --mini-batch 4 --cost-type ce-sum @@ -20,7 +20,7 @@ test -e x3copied.log cat x3copied.log | grep 'Cost ' | sed -r 's/.*Cost (.*) : Time.*/\1/' > x3copied.out $MRT_MARIAN/build/marian \ - --seed 2222 --no-shuffle --maxi-batch 1 --maxi-batch-sort none --max-length 100 --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 2222 --no-shuffle --maxi-batch 1 --maxi-batch-sort none --max-length 100 --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m x3weights/model.npz -t train.1k.{de,en} -v vocab.{de,en}.yml \ --log x3weights.log --disp-freq 1 --after-batches 100 --mini-batch 2 --cost-type ce-sum \ --data-weighting train.1k.weights.txt --data-weighting-type sentence diff --git a/tests/training/data-weighting/test_word_weighting_sqlite.sh b/tests/training/data-weighting/test_word_weighting_sqlite.sh index 2421f5e..33c276e 100644 --- a/tests/training/data-weighting/test_word_weighting_sqlite.sh +++ b/tests/training/data-weighting/test_word_weighting_sqlite.sh @@ -10,7 +10,7 @@ mkdir -p sqlite_word cat $MRT_DATA/europarl.de-en/toy.bpe.en | sed -r 's/[^ ]+/2/g' > sqlite_word.weights.txt $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m sqlite_word/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v vocab.{de,en}.yml \ --log sqlite_word.log --disp-freq 5 -e 2 --mini-batch-fit -w 500 \ --data-weighting sqlite_word.weights.txt --data-weighting-type word --sqlite sqlite_word/corpus.sqlite3 diff --git a/tests/training/data-weighting/test_word_weighting_with_ones.sh b/tests/training/data-weighting/test_word_weighting_with_ones.sh index 082032e..8ba31a8 100644 --- a/tests/training/data-weighting/test_word_weighting_with_ones.sh +++ b/tests/training/data-weighting/test_word_weighting_with_ones.sh @@ -8,7 +8,7 @@ rm -rf word_noweights* word_ones* mkdir -p word_noweights word_ones $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m word_noweights/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v vocab.{de,en}.yml \ --log word_noweights.log --disp-freq 5 -e 2 @@ -19,7 +19,7 @@ cat word_noweights.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed -r cat $MRT_DATA/europarl.de-en/toy.bpe.en | sed -r 's/[^ ]+/1/g' > word_ones.weights.txt $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m word_ones/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v vocab.{de,en}.yml \ --log word_ones.log --disp-freq 5 -e 2 \ --data-weighting word_ones.weights.txt --data-weighting-type word diff --git a/tests/training/data-weighting/test_word_weighting_with_twos.sh b/tests/training/data-weighting/test_word_weighting_with_twos.sh index 0bfcc4c..4706cae 100644 --- a/tests/training/data-weighting/test_word_weighting_with_twos.sh +++ b/tests/training/data-weighting/test_word_weighting_with_twos.sh @@ -10,7 +10,7 @@ mkdir -p word_twos cat $MRT_DATA/europarl.de-en/toy.bpe.en | sed -r 's/[^ ]+/2/g' > word_twos.weights.txt $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m word_twos/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v vocab.{de,en}.yml \ --log word_twos.log --disp-freq 5 -e 2 \ --data-weighting word_twos.weights.txt --data-weighting-type word @@ -28,7 +28,7 @@ echo "data-weighting: word_twos.weights.txt" > word_twos.config.yml echo "data-weighting-type: word" >> word_twos.config.yml $MRT_MARIAN/build/marian \ - --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 -o sgd \ + --seed 1111 --no-shuffle --dim-emb 128 --dim-rnn 256 --optimizer sgd \ -m word_twos_cfg/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v vocab.{de,en}.yml \ --log word_twos_cfg.log --disp-freq 5 -e 2 \ -c word_twos.config.yml diff --git a/tests/training/exp-smoothing/test_expsmooth.sh b/tests/training/exp-smoothing/test_expsmooth.sh index fe1a447..ea564d9 100644 --- a/tests/training/exp-smoothing/test_expsmooth.sh +++ b/tests/training/exp-smoothing/test_expsmooth.sh @@ -8,7 +8,7 @@ rm -rf expsmooth expsmooth*.log mkdir -p expsmooth -opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32" +opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32" # No exponential smoothing $MRT_MARIAN/build/marian \ diff --git a/tests/training/exp-smoothing/test_expsmooth_sync.sh b/tests/training/exp-smoothing/test_expsmooth_sync.sh index 133dad4..6da4d86 100644 --- a/tests/training/exp-smoothing/test_expsmooth_sync.sh +++ b/tests/training/exp-smoothing/test_expsmooth_sync.sh @@ -13,7 +13,7 @@ rm -rf expsmooth_sync expsmooth_sync*.log mkdir -p expsmooth_sync -opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --devices 0 1 --sync-sgd" +opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --devices 0 1 --sync-sgd" # No exponential smoothing $MRT_MARIAN/build/marian \ diff --git a/tests/training/model-types/test_transformer.sh b/tests/training/model-types/test_transformer.sh index ce550dd..1536b1f 100644 --- a/tests/training/model-types/test_transformer.sh +++ b/tests/training/model-types/test_transformer.sh @@ -7,7 +7,7 @@ set -e rm -rf transformer transformer*.log mkdir -p transformer -opts="--no-shuffle --seed 1111 --mini-batch 32 --maxi-batch 1 --maxi-batch-sort none -o sgd --dim-emb 64 --dim-rnn 128" +opts="--no-shuffle --seed 1111 --mini-batch 32 --maxi-batch 1 --maxi-batch-sort none --optimizer sgd --dim-emb 64 --dim-rnn 128" $MRT_MARIAN/build/marian \ -m transformer/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/multi-gpu/test_sync_sgd.sh b/tests/training/multi-gpu/test_sync_sgd.sh index cba15a2..f869887 100644 --- a/tests/training/multi-gpu/test_sync_sgd.sh +++ b/tests/training/multi-gpu/test_sync_sgd.sh @@ -15,7 +15,7 @@ mkdir -p sync_sgd $MRT_MARIAN/build/marian \ --no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none \ --dim-rnn 64 --dim-emb 32 --learn-rate 0.1 \ - --devices 0 1 --sync-sgd -o sgd \ + --devices 0 1 --sync-sgd --optimizer sgd \ -m sync_sgd/model.full.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ --disp-freq 10 --after-batches 100 \ --log sync_sgd.log diff --git a/tests/training/restarting/_test_adam_for_two_epochs.sh b/tests/training/restarting/_test_adam_for_two_epochs.sh index dbd534d..a48f707 100644 --- a/tests/training/restarting/_test_adam_for_two_epochs.sh +++ b/tests/training/restarting/_test_adam_for_two_epochs.sh @@ -7,7 +7,7 @@ set -e rm -rf adam_2e adam_1st_epoch.log adam_2nd_epoch.log adam_two_epochs.log mkdir -p adam_2e -extra_opts="--no-shuffle --seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 --dim-emb 64 --dim-rnn 128 --disp-freq 4 --save-freq 32 -l 0.1 -o adam" +extra_opts="--no-shuffle --seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 --dim-emb 64 --dim-rnn 128 --disp-freq 4 --save-freq 32 -l 0.1 --optimizer adam" ## Uncomment to update the test diff --git a/tests/training/restarting/test_sgd_for_two_epochs.sh b/tests/training/restarting/test_sgd_for_two_epochs.sh index 6fb400e..38ba8da 100644 --- a/tests/training/restarting/test_sgd_for_two_epochs.sh +++ b/tests/training/restarting/test_sgd_for_two_epochs.sh @@ -7,7 +7,7 @@ set -e rm -rf sgd_2e sgd_1st_epoch.log sgd_2nd_epoch.log mkdir -p sgd_2e -extra_opts="--no-shuffle --seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 -o sgd" +extra_opts="--no-shuffle --seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 --optimizer sgd" #$MRT_MARIAN/build/marian \ #-m sgd_2e/model_2e.npz -t train.max50.{en,de} -v vocab.{en,de}.yml \ diff --git a/tests/training/restoring/corpus/test_corpus_restoration.sh b/tests/training/restoring/corpus/test_corpus_restoration.sh index 046e002..a948246 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration.sh @@ -10,7 +10,7 @@ mkdir -p corpus test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" +extra_opts="--seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" $MRT_MARIAN/build/marian \ -m corpus/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh b/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh index 0d3e54f..25543b4 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh @@ -10,7 +10,7 @@ mkdir -p corpus_maxi test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 1111 --maxi-batch 20 --mini-batch 32 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" +extra_opts="--seed 1111 --maxi-batch 20 --mini-batch 32 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" $MRT_MARIAN/build/marian \ -m corpus_maxi/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/corpus/test_corpus_restoration_mini_batch_fit.sh b/tests/training/restoring/corpus/test_corpus_restoration_mini_batch_fit.sh index 7f2818f..222d384 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_mini_batch_fit.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_mini_batch_fit.sh @@ -10,7 +10,7 @@ mkdir -p corpus_fit test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 5555 --maxi-batch 8 --maxi-batch-sort src --mini-batch 32 --mini-batch-fit -w 100 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" +extra_opts="--seed 5555 --maxi-batch 8 --maxi-batch-sort src --mini-batch 32 --mini-batch-fit -w 100 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" $MRT_MARIAN/build/marian \ -m corpus_fit/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh b/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh index 0d8c32e..c031177 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh @@ -10,7 +10,7 @@ mkdir -p corpus_noshuf test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 1234 --no-shuffle --maxi-batch 8 --maxi-batch-sort src --mini-batch 32 --mini-batch-fit -w 100 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" +extra_opts="--seed 1234 --no-shuffle --maxi-batch 8 --maxi-batch-sort src --mini-batch 32 --mini-batch-fit -w 100 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" $MRT_MARIAN/build/marian \ -m corpus_noshuf/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh b/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh index 1006398..345c7af 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh @@ -10,7 +10,7 @@ mkdir -p corpus_one test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 9999 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" +extra_opts="--seed 9999 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" $MRT_MARIAN/build/marian \ -m corpus_one/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh b/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh index 4a2e7e5..20fc510 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh @@ -10,7 +10,7 @@ mkdir -p corpus_s2s test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4 --type s2s" +extra_opts="--seed 1111 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4 --type s2s" $MRT_MARIAN/build/marian \ -m corpus_s2s/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/corpus/test_sqlite_restoration.sh b/tests/training/restoring/corpus/test_sqlite_restoration.sh index 127f6f4..1a22193 100644 --- a/tests/training/restoring/corpus/test_sqlite_restoration.sh +++ b/tests/training/restoring/corpus/test_sqlite_restoration.sh @@ -10,7 +10,7 @@ mkdir -p sqlite test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 3333 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" +extra_opts="--seed 3333 --maxi-batch 1 --maxi-batch-sort none --mini-batch 32 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" $MRT_MARIAN/build/marian \ -m sqlite/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh b/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh index 9d41c01..def06d7 100644 --- a/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh +++ b/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh @@ -10,7 +10,7 @@ mkdir -p sqlite_maxi test -e vocab.de.yml test -e vocab.en.yml -extra_opts="--seed 4444 --maxi-batch 20 --mini-batch 32 -o sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" +extra_opts="--seed 4444 --maxi-batch 20 --mini-batch 32 --optimizer sgd --dim-emb 128 --dim-rnn 256 --disp-freq 4" $MRT_MARIAN/build/marian \ -m sqlite_maxi/model_full.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ diff --git a/tests/training/restoring/exp-smoothing/_test_expsmooth_async_runs.sh b/tests/training/restoring/exp-smoothing/_test_expsmooth_async_runs.sh index fa9104f..be1355b 100644 --- a/tests/training/restoring/exp-smoothing/_test_expsmooth_async_runs.sh +++ b/tests/training/restoring/exp-smoothing/_test_expsmooth_async_runs.sh @@ -13,7 +13,7 @@ rm -rf expsmooth_async expsmooth_async_*.log expsmooth_async.*out expsmooth_asyn mkdir -p expsmooth_async -opts="--no-shuffle --seed 777 --mini-batch 1 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --devices 0 1" +opts="--no-shuffle --seed 777 --mini-batch 1 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --devices 0 1" opt_disp=1 opt_valid=7 diff --git a/tests/training/restoring/exp-smoothing/test_expsmooth.sh b/tests/training/restoring/exp-smoothing/test_expsmooth.sh index 0ebff37..a54a685 100644 --- a/tests/training/restoring/exp-smoothing/test_expsmooth.sh +++ b/tests/training/restoring/exp-smoothing/test_expsmooth.sh @@ -13,7 +13,7 @@ rm -rf expsmooth expsmooth_*.log mkdir -p expsmooth -opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32" +opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32" opt_disp=20 opt_valid=20 diff --git a/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh b/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh index 59a6145..e48c86a 100644 --- a/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh +++ b/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh @@ -13,7 +13,7 @@ rm -rf expsmooth_s2s expsmooth_s2s_*.log mkdir -p expsmooth_s2s -opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --type s2s" +opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --type s2s" opt_disp=20 opt_valid=20 diff --git a/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh b/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh index b01f72a..82e270a 100644 --- a/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh +++ b/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh @@ -13,7 +13,7 @@ rm -rf expsmooth_sync expsmooth_sync_*.log mkdir -p expsmooth_sync -opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --devices 0 1 --sync-sgd" +opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.5 --valid-sets valid.bpe.en valid.bpe.de --valid-metrics cross-entropy --valid-mini-batch 32 --devices 0 1 --sync-sgd" opt_disp=20 opt_valid=20 diff --git a/tests/training/restoring/multi-gpu/test_async.sh b/tests/training/restoring/multi-gpu/test_async.sh index 1f0f622..8d6fcef 100644 --- a/tests/training/restoring/multi-gpu/test_async.sh +++ b/tests/training/restoring/multi-gpu/test_async.sh @@ -12,7 +12,7 @@ fi rm -rf async async_*.log async.*out async.*expected mkdir -p async -opts="--no-shuffle --seed 777 --mini-batch 1 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.1 --devices 0 1" +opts="--no-shuffle --seed 777 --mini-batch 1 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.1 --devices 0 1" opt_disp=1 opt_save=8 diff --git a/tests/training/restoring/multi-gpu/test_sync.sh b/tests/training/restoring/multi-gpu/test_sync.sh index 68fc913..ac62f07 100644 --- a/tests/training/restoring/multi-gpu/test_sync.sh +++ b/tests/training/restoring/multi-gpu/test_sync.sh @@ -12,7 +12,7 @@ fi rm -rf sync sync_*.log mkdir -p sync -opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 -o sgd --learn-rate 0.1 --devices 0 1 --sync-sgd" +opts="--no-shuffle --seed 777 --mini-batch 4 --maxi-batch 1 --maxi-batch-sort none --dim-rnn 64 --dim-emb 32 --optimizer sgd --learn-rate 0.1 --devices 0 1 --sync-sgd" $MRT_MARIAN/build/marian \ diff --git a/tests/training/restoring/optimizer/test_adagrad_params.sh b/tests/training/restoring/optimizer/test_adagrad_params.sh index b027760..a02e665 100644 --- a/tests/training/restoring/optimizer/test_adagrad_params.sh +++ b/tests/training/restoring/optimizer/test_adagrad_params.sh @@ -10,7 +10,7 @@ mkdir -p adagrad $MRT_MARIAN/build/marian \ --no-shuffle --seed 7777 --maxi-batch 1 --maxi-batch-sort none --dim-emb 128 --dim-rnn 256 \ -m adagrad/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ - --disp-freq 10 --after-batches 100 --save-freq 60 -o adagrad\ + --disp-freq 10 --after-batches 100 --save-freq 60 --optimizer adagrad \ --log adagrad.log test -e adagrad/model.npz diff --git a/tests/training/restoring/validation/test_adding_validator_after_restart.sh b/tests/training/restoring/validation/test_adding_validator_after_restart.sh index 1d28eec..1637982 100644 --- a/tests/training/restoring/validation/test_adding_validator_after_restart.sh +++ b/tests/training/restoring/validation/test_adding_validator_after_restart.sh @@ -8,7 +8,7 @@ rm -rf valid_add valid_add_?.log mkdir -p valid_add #$MRT_MARIAN/build/marian \ - #--no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none -o sgd \ + #--no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none --optimizer sgd \ #--dim-emb 128 --dim-rnn 256 --mini-batch 16 \ #-m valid_add/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ #--disp-freq 10 --valid-freq 20 --after-batches 200 --early-stopping 5 \ @@ -21,7 +21,7 @@ mkdir -p valid_add $MRT_MARIAN/build/marian \ - --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none -o sgd \ + --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none --optimizer sgd \ --dim-emb 128 --dim-rnn 256 --mini-batch 16 \ -m valid_add/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ --disp-freq 10 --valid-freq 20 --after-batches 100 --early-stopping 5 \ @@ -37,7 +37,7 @@ cp valid_add/model.npz.progress.yml valid_add/model.npz.progress.yml.bac cat valid_add_1.log | $MRT_TOOLS/strip-timestamps.sh > valid_add.out $MRT_MARIAN/build/marian \ - --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none -o sgd \ + --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none --optimizer sgd \ --dim-emb 128 --dim-rnn 256 --mini-batch 16 \ -m valid_add/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ --disp-freq 10 --valid-freq 20 --after-batches 200 --early-stopping 5 \ diff --git a/tests/training/validation/test_empty_valid_set_lm.sh b/tests/training/validation/test_empty_valid_set_lm.sh index ae65a6a..c96b717 100644 --- a/tests/training/validation/test_empty_valid_set_lm.sh +++ b/tests/training/validation/test_empty_valid_set_lm.sh @@ -10,7 +10,7 @@ mkdir -p empty_valid_lm touch empty_valid.en $MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 -o sgd --dim-emb 64 --dim-rnn 128 \ + --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \ --model empty_valid_lm/model.npz --type lm \ -t $MRT_DATA/europarl.de-en/corpus.bpe.en -v vocab.en.yml \ --disp-freq 2 --valid-freq 4 --after-batches 20 \ diff --git a/tests/training/validation/test_empty_valid_set_source.sh b/tests/training/validation/test_empty_valid_set_source.sh index 1ca258a..e4ad04d 100644 --- a/tests/training/validation/test_empty_valid_set_source.sh +++ b/tests/training/validation/test_empty_valid_set_source.sh @@ -10,7 +10,7 @@ mkdir -p empty_src touch empty_valid.en $MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 -o sgd --dim-emb 64 --dim-rnn 128 \ + --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \ --model empty_src/model.npz \ -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ --disp-freq 2 --valid-freq 4 --after-batches 20 \ diff --git a/tests/training/validation/test_empty_valid_set_target.sh b/tests/training/validation/test_empty_valid_set_target.sh index 0768e4a..403fb46 100644 --- a/tests/training/validation/test_empty_valid_set_target.sh +++ b/tests/training/validation/test_empty_valid_set_target.sh @@ -10,7 +10,7 @@ mkdir -p empty_trg touch empty_valid.de $MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 -o sgd --dim-emb 64 --dim-rnn 128 \ + --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \ --model empty_trg/model.npz \ -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ --disp-freq 2 --valid-freq 4 --after-batches 20 \ diff --git a/tests/training/validation/test_empty_valid_sets.sh b/tests/training/validation/test_empty_valid_sets.sh index 1e8d2f3..af6ff7f 100644 --- a/tests/training/validation/test_empty_valid_sets.sh +++ b/tests/training/validation/test_empty_valid_sets.sh @@ -11,7 +11,7 @@ touch empty_valid.en touch empty_valid.de $MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 -o sgd --dim-emb 64 --dim-rnn 128 \ + --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \ --model empty_validsets/model.npz \ -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ --disp-freq 2 --valid-freq 4 --after-batches 20 \ diff --git a/tests/training/validation/test_final_validation_after_batches.sh b/tests/training/validation/test_final_validation_after_batches.sh index 804d451..26860a9 100644 --- a/tests/training/validation/test_final_validation_after_batches.sh +++ b/tests/training/validation/test_final_validation_after_batches.sh @@ -8,7 +8,7 @@ rm -rf final_batch final_batch.log vocab.*.yml mkdir -p final_batch $MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 -o sgd --dim-emb 64 --dim-rnn 128 \ + --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \ -m final_batch/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} \ -v vocab.en.yml vocab.de.yml --dim-vocabs 50000 50000 \ --disp-freq 30 --valid-freq 60 --after-batches 150 \ diff --git a/tests/training/validation/test_final_validation_after_batches_match.sh b/tests/training/validation/test_final_validation_after_batches_match.sh index c22b0a7..955fc95 100644 --- a/tests/training/validation/test_final_validation_after_batches_match.sh +++ b/tests/training/validation/test_final_validation_after_batches_match.sh @@ -8,7 +8,7 @@ rm -rf final_match final_match.log vocab.*.yml mkdir -p final_match $MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 -o sgd --dim-emb 64 --dim-rnn 128 \ + --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \ -m final_match/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} \ -v vocab.en.yml vocab.de.yml --dim-vocabs 50000 50000 \ --disp-freq 30 --valid-freq 60 --after-batches 180 \ diff --git a/tests/training/validation/test_final_validation_after_epochs.sh b/tests/training/validation/test_final_validation_after_epochs.sh index ba9c288..de2fc4c 100644 --- a/tests/training/validation/test_final_validation_after_epochs.sh +++ b/tests/training/validation/test_final_validation_after_epochs.sh @@ -11,7 +11,7 @@ test -e train.bpe.en || head -n 3000 $MRT_DATA/europarl.de-en/corpus.bpe.en > tr test -e train.bpe.de || head -n 3000 $MRT_DATA/europarl.de-en/corpus.bpe.de > train.bpe.de $MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 -o sgd --dim-emb 64 --dim-rnn 128 \ + --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \ -m final_epoch/model.npz -t train.bpe.{en,de} \ -v vocab.small.en.yml vocab.small.de.yml --dim-vocabs 50000 50000 \ --mini-batch 32 --disp-freq 20 --valid-freq 40 --after-epochs 1 \ |