diff options
author | Roman Grundkiewicz <rgrundki@exseed.ed.ac.uk> | 2018-06-21 11:26:05 +0300 |
---|---|---|
committer | Roman Grundkiewicz <rgrundki@exseed.ed.ac.uk> | 2018-06-21 11:26:05 +0300 |
commit | 318a585aa22fd66f1f3abf49c7b9a6db1b877d41 (patch) | |
tree | 9a683ee7c60ff0dc24389bff2594a3c11ef3cc49 /tests/training/restarting | |
parent | c7f0ec4519a44e8226cf4d96ad0c227a38c9b2db (diff) |
Move tests to subdirectory
Diffstat (limited to 'tests/training/restarting')
-rw-r--r-- | tests/training/restarting/.gitignore | 2 | ||||
-rw-r--r-- | tests/training/restarting/test_restarting_stalled_validators.sh | 67 | ||||
-rw-r--r-- | tests/training/restarting/test_restoring_validation.sh | 42 | ||||
-rw-r--r-- | tests/training/restarting/test_restoring_validation_lower_is_better.sh | 42 | ||||
-rw-r--r-- | tests/training/restarting/valid.expected | 10 | ||||
-rw-r--r-- | tests/training/restarting/valid_lowisbet.expected | 10 | ||||
-rwxr-xr-x | tests/training/restarting/valid_script_ab.sh | 15 | ||||
-rw-r--r-- | tests/training/restarting/valid_stalled.expected | 35 |
8 files changed, 0 insertions, 223 deletions
diff --git a/tests/training/restarting/.gitignore b/tests/training/restarting/.gitignore index 14ca611..d08a78e 100644 --- a/tests/training/restarting/.gitignore +++ b/tests/training/restarting/.gitignore @@ -1,7 +1,5 @@ valid valid_script*.temp -valid_lowisbet -valid_stalled sgd_2e train.* valid.* diff --git a/tests/training/restarting/test_restarting_stalled_validators.sh b/tests/training/restarting/test_restarting_stalled_validators.sh deleted file mode 100644 index 95cf5fc..0000000 --- a/tests/training/restarting/test_restarting_stalled_validators.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -x - -# Exit on error -set -e - -# Test code goes here -rm -rf valid_stalled valid_stalled_?.*log valid_script_?.temp -mkdir -p valid_stalled - -head -n 8 $MRT_DATA/europarl.de-en/toy.bpe.en > valid.mini.bpe.en -head -n 8 $MRT_DATA/europarl.de-en/toy.bpe.de > valid.mini.bpe.de - - -#$MRT_MARIAN/build/marian \ - #--no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none --quiet-translation \ - #--dim-emb 64 --dim-rnn 128 --mini-batch 16 --optimizer sgd \ - #-m valid_stalled_full/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ - #--disp-freq 10 --valid-freq 20 --after-batches 200 --early-stopping 5 \ - #--valid-metrics cross-entropy valid-script translation --valid-script-path ./valid_script_ab.sh \ - #--valid-sets valid.mini.bpe.{de,en} \ - #--overwrite --keep-best \ - #--log valid_stalled_full.log - -#cat valid_stalled_full.log | $MRT_TOOLS/strip-timestamps.sh \ - #| grep -P "\[valid\]|Saving model" | grep -v "cross-entropy" \ - #> valid_stalled.expected - - -$MRT_MARIAN/build/marian \ - --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none --quiet-translation \ - --dim-emb 64 --dim-rnn 128 --mini-batch 16 --optimizer sgd \ - -m valid_stalled/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ - --disp-freq 10 --valid-freq 20 --after-batches 100 --early-stopping 5 \ - --valid-metrics cross-entropy valid-script translation --valid-script-path ./valid_script_ab.sh \ - --valid-sets valid.mini.bpe.{de,en} \ - --overwrite --keep-best \ - --log valid_stalled_1.log - -test -e valid_stalled/model.npz -test -e valid_stalled/model.npz.yml -test -e valid_stalled_1.log - -cp valid_stalled/model.npz.progress.yml valid_stalled/model.npz.progress.yml.bac -cat valid_stalled_1.log | $MRT_TOOLS/strip-timestamps.sh \ - | grep -P "\[valid\]|Saving model" | grep -v "cross-entropy" \ - | head -n -1 > valid_stalled.out - - -$MRT_MARIAN/build/marian \ - --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none --quiet-translation \ - --dim-emb 64 --dim-rnn 128 --mini-batch 16 --optimizer sgd \ - -m valid_stalled/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{en,de} -v vocab.en.yml vocab.de.yml \ - --disp-freq 10 --valid-freq 20 --after-batches 200 --early-stopping 5 \ - --valid-metrics cross-entropy valid-script translation --valid-script-path ./valid_script_ab.sh \ - --valid-sets valid.mini.bpe.{de,en} \ - --overwrite --keep-best \ - --log valid_stalled_2.log - -test -e valid_stalled/model.npz -test -e valid_stalled_2.log - -cat valid_stalled_2.log | $MRT_TOOLS/strip-timestamps.sh \ - | grep -P "\[valid\]|Saving model" | grep -v "cross-entropy" >> valid_stalled.out -diff valid_stalled.out valid_stalled.expected > valid_stalled.diff - -# Exit with success code -exit 0 diff --git a/tests/training/restarting/test_restoring_validation.sh b/tests/training/restarting/test_restoring_validation.sh deleted file mode 100644 index 9a015cc..0000000 --- a/tests/training/restarting/test_restoring_validation.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -x - -# Exit on error -set -e - -# Test code goes here -rm -rf valid valid_?.log valid_script.temp -mkdir -p valid - -$MRT_MARIAN/build/marian \ - --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none \ - --dim-emb 128 --dim-rnn 256 --mini-batch 16 \ - -m valid/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 150 --early-stopping 5 \ - --valid-metrics valid-script cross-entropy --valid-script-path ./valid_script.sh \ - --valid-sets $MRT_DATA/europarl.de-en/toy.bpe.{en,de} \ - --valid-log valid_1.log - -test -e valid/model.npz -test -e valid/model.npz.yml -test -e valid_1.log - -cp valid/model.npz.progress.yml valid/model.npz.progress.yml.bac -cat valid_1.log | $MRT_TOOLS/strip-timestamps.sh | grep "valid-script" > valid.out - -$MRT_MARIAN/build/marian \ - --no-shuffle --seed 2222 --maxi-batch 1 --maxi-batch-sort none \ - --dim-emb 128 --dim-rnn 256 --mini-batch 16 \ - -m valid/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 300 --early-stopping 5 \ - --valid-metrics valid-script cross-entropy --valid-script-path ./valid_script.sh \ - --valid-sets $MRT_DATA/europarl.de-en/toy.bpe.{en,de} \ - --valid-log valid_2.log - -test -e valid/model.npz -test -e valid_2.log - -cat valid_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "valid-script" >> valid.out -diff valid.out valid.expected > valid.diff - -# Exit with success code -exit 0 diff --git a/tests/training/restarting/test_restoring_validation_lower_is_better.sh b/tests/training/restarting/test_restoring_validation_lower_is_better.sh deleted file mode 100644 index 03c8a79..0000000 --- a/tests/training/restarting/test_restoring_validation_lower_is_better.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -x - -# Exit on error -set -e - -# Test code goes here -rm -rf valid_lowisbet valid_lowisbet_?.log -mkdir -p valid_lowisbet - -# Files for the validation sets are swapped intentionally -$MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 --maxi-batch 1 --maxi-batch-sort none \ - --dim-emb 64 --dim-rnn 128 --mini-batch 32 \ - -m valid_lowisbet/model.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ - --disp-freq 10 --valid-freq 30 --after-batches 160 --early-stopping 2 \ - --valid-metrics cross-entropy --valid-sets $MRT_DATA/europarl.de-en/toy.bpe.{de,en} \ - --valid-log valid_lowisbet_1.log - -test -e valid_lowisbet/model.npz -test -e valid_lowisbet/model.npz.yml -test -e valid_lowisbet_1.log - -cp valid_lowisbet/model.npz.progress.yml valid_lowisbet/model.npz.progress.yml.bac -cat valid_lowisbet_1.log | $MRT_TOOLS/strip-timestamps.sh | grep "cross-entropy" > valid_lowisbet.out - -# Files for the validation sets are swapped intentionally -$MRT_MARIAN/build/marian \ - --no-shuffle --seed 1111 --maxi-batch 1 --maxi-batch-sort none \ - --dim-emb 64 --dim-rnn 128 --mini-batch 32 \ - -m valid_lowisbet/model.npz -t $MRT_DATA/train.max50.{en,de} -v vocab.en.yml vocab.de.yml \ - --disp-freq 10 --valid-freq 30 --after-batches 320 --early-stopping 2 \ - --valid-metrics cross-entropy --valid-sets $MRT_DATA/europarl.de-en/toy.bpe.{de,en} \ - --valid-log valid_lowisbet_2.log - -test -e valid_lowisbet/model.npz -test -e valid_lowisbet_2.log - -cat valid_lowisbet_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "cross-entropy" >> valid_lowisbet.out -$MRT_TOOLS/diff-floats.py -p 0.1 valid_lowisbet.out valid_lowisbet.expected > valid_lowisbet.diff - -# Exit with success code -exit 0 diff --git a/tests/training/restarting/valid.expected b/tests/training/restarting/valid.expected deleted file mode 100644 index 7210b29..0000000 --- a/tests/training/restarting/valid.expected +++ /dev/null @@ -1,10 +0,0 @@ -[valid] Ep. 1 : Up. 20 : valid-script : 222.4 : new best -[valid] Ep. 1 : Up. 40 : valid-script : 222.3 : stalled 1 times -[valid] Ep. 1 : Up. 60 : valid-script : 222.2 : stalled 2 times -[valid] Ep. 1 : Up. 80 : valid-script : 222.1 : stalled 3 times -[valid] Ep. 1 : Up. 100 : valid-script : 222.6 : new best -[valid] Ep. 1 : Up. 120 : valid-script : 222.5 : stalled 1 times -[valid] Ep. 1 : Up. 140 : valid-script : 222.4 : stalled 2 times -[valid] Ep. 1 : Up. 150 : valid-script : 222.3 : stalled 3 times -[valid] Ep. 1 : Up. 160 : valid-script : 222.2 : stalled 4 times -[valid] Ep. 1 : Up. 180 : valid-script : 222.1 : stalled 5 times diff --git a/tests/training/restarting/valid_lowisbet.expected b/tests/training/restarting/valid_lowisbet.expected deleted file mode 100644 index 8ff1d59..0000000 --- a/tests/training/restarting/valid_lowisbet.expected +++ /dev/null @@ -1,10 +0,0 @@ -[valid] Ep. 1 : Up. 30 : cross-entropy : 299.654 : new best -[valid] Ep. 2 : Up. 60 : cross-entropy : 298.676 : new best -[valid] Ep. 3 : Up. 90 : cross-entropy : 293.624 : new best -[valid] Ep. 4 : Up. 120 : cross-entropy : 292.256 : new best -[valid] Ep. 5 : Up. 150 : cross-entropy : 291.772 : new best -[valid] Ep. 5 : Up. 160 : cross-entropy : 291.715 : new best -[valid] Ep. 6 : Up. 180 : cross-entropy : 291.193 : new best -[valid] Ep. 7 : Up. 210 : cross-entropy : 290.962 : new best -[valid] Ep. 8 : Up. 240 : cross-entropy : 290.982 : stalled 1 times -[valid] Ep. 9 : Up. 270 : cross-entropy : 291.173 : stalled 2 times diff --git a/tests/training/restarting/valid_script_ab.sh b/tests/training/restarting/valid_script_ab.sh deleted file mode 100755 index 032a141..0000000 --- a/tests/training/restarting/valid_script_ab.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [[ -z $1 ]]; then - num=$(cat valid_script_a.temp 2>/dev/null || echo 2) - ((num=(num+1)%6)) - echo $num > valid_script_a.temp - ((num=6-num)) - echo 222.$num -else - num=$(cat valid_script_b.temp 2>/dev/null || echo 3) - ((num=(num+1)%9)) - echo $num > valid_script_b.temp - ((num=9-num)) - echo 333.$num -fi diff --git a/tests/training/restarting/valid_stalled.expected b/tests/training/restarting/valid_stalled.expected deleted file mode 100644 index ca195de..0000000 --- a/tests/training/restarting/valid_stalled.expected +++ /dev/null @@ -1,35 +0,0 @@ -Saving model to valid_stalled/model.npz.dev.npz -Saving model to valid_stalled/model.npz.best-valid-script.npz -[valid] Ep. 1 : Up. 20 : valid-script : 222.3 : new best -Saving model to valid_stalled/model.npz.best-translation.npz -[valid] Ep. 1 : Up. 20 : translation : 333.5 : new best -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 1 : Up. 40 : valid-script : 222.2 : stalled 1 times -[valid] Ep. 1 : Up. 40 : translation : 333.4 : stalled 1 times -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 1 : Up. 60 : valid-script : 222.1 : stalled 2 times -[valid] Ep. 1 : Up. 60 : translation : 333.3 : stalled 2 times -Saving model to valid_stalled/model.npz.dev.npz -Saving model to valid_stalled/model.npz.best-valid-script.npz -[valid] Ep. 1 : Up. 80 : valid-script : 222.6 : new best -[valid] Ep. 1 : Up. 80 : translation : 333.2 : stalled 3 times -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 1 : Up. 100 : valid-script : 222.5 : stalled 1 times -[valid] Ep. 1 : Up. 100 : translation : 333.1 : stalled 4 times -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 1 : Up. 120 : valid-script : 222.4 : stalled 2 times -Saving model to valid_stalled/model.npz.best-translation.npz -[valid] Ep. 1 : Up. 120 : translation : 333.9 : new best -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 1 : Up. 140 : valid-script : 222.3 : stalled 3 times -[valid] Ep. 1 : Up. 140 : translation : 333.8 : stalled 1 times -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 1 : Up. 160 : valid-script : 222.2 : stalled 4 times -[valid] Ep. 1 : Up. 160 : translation : 333.7 : stalled 2 times -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 2 : Up. 180 : valid-script : 222.1 : stalled 5 times -[valid] Ep. 2 : Up. 180 : translation : 333.6 : stalled 3 times -Saving model to valid_stalled/model.npz.dev.npz -[valid] Ep. 2 : Up. 200 : valid-script : 222.6 : stalled 6 times -[valid] Ep. 2 : Up. 200 : translation : 333.5 : stalled 4 times -Saving model to valid_stalled/model.npz |