diff options
-rw-r--r-- | tests/interface/config/.gitignore | 4 | ||||
-rw-r--r-- | tests/interface/config/dump_alias.expected | 8 | ||||
-rw-r--r-- | tests/interface/config/dump_explain.expected | 16 | ||||
-rw-r--r-- | tests/interface/config/test_alias_best_deep.sh | 3 | ||||
-rw-r--r-- | tests/interface/config/test_dump_config_explain.sh | 18 | ||||
-rw-r--r-- | tests/interface/config/test_dump_config_minimal_alias.sh | 18 |
6 files changed, 62 insertions, 5 deletions
diff --git a/tests/interface/config/.gitignore b/tests/interface/config/.gitignore index 9e59180..79da7c9 100644 --- a/tests/interface/config/.gitignore +++ b/tests/interface/config/.gitignore @@ -1,8 +1,6 @@ load_config -dump_config.yml -dump_minimal.yml -dump_relpaths.yml +dump_*.yml overwrite diff --git a/tests/interface/config/dump_alias.expected b/tests/interface/config/dump_alias.expected new file mode 100644 index 0000000..7800d22 --- /dev/null +++ b/tests/interface/config/dump_alias.expected @@ -0,0 +1,8 @@ +# Model options +type: s2s +dim-emb: 16 +dim-rnn: 32 +best-deep: true +# Training options +after-batches: 2 +mini-batch: 8 diff --git a/tests/interface/config/dump_explain.expected b/tests/interface/config/dump_explain.expected new file mode 100644 index 0000000..7437365 --- /dev/null +++ b/tests/interface/config/dump_explain.expected @@ -0,0 +1,16 @@ +# Model options +type: s2s +dim-emb: 16 +dim-rnn: 32 +enc-type: alternating +enc-cell-depth: 2 +enc-depth: 4 +dec-cell-base-depth: 4 +dec-cell-high-depth: 2 +dec-depth: 4 +skip: true +layer-normalization: true +tied-embeddings: true +# Training options +after-batches: 2 +mini-batch: 8 diff --git a/tests/interface/config/test_alias_best_deep.sh b/tests/interface/config/test_alias_best_deep.sh index 24ba88e..bc6848a 100644 --- a/tests/interface/config/test_alias_best_deep.sh +++ b/tests/interface/config/test_alias_best_deep.sh @@ -6,7 +6,6 @@ set -e rm -rf bestdeep bestdeep.log mkdir -p bestdeep - # Test $MRT_MARIAN/marian -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -m bestdeep/model.npz -v vocab.de.yml vocab.en.yml \ --type s2s --dim-emb 32 --dim-rnn 16 --mini-batch 1 --after-batches 1 --no-shuffle \ @@ -14,7 +13,7 @@ $MRT_MARIAN/marian -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -m bestdeep/model test -e bestdeep.log -grep -q "best-deep: true" bestdeep.log +#grep -q "best-deep: true" bestdeep.log grep -q "layer-normalization: true" bestdeep.log grep -q "tied-embeddings: true" bestdeep.log grep -q "enc-depth: 4" bestdeep.log diff --git a/tests/interface/config/test_dump_config_explain.sh b/tests/interface/config/test_dump_config_explain.sh new file mode 100644 index 0000000..2f81245 --- /dev/null +++ b/tests/interface/config/test_dump_config_explain.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Exit on error +set -e + +rm -f dump_explain.{yml,out} + +# Run with no config file +$MRT_MARIAN/marian --best-deep --type s2s --mini-batch 8 --dim-rnn 32 --dim-emb 16 --after-batches 2 --dump-config explain > dump_explain.yml + +# Remove first line and paths to train sets and vocabs +cat dump_explain.yml | tail -n +2 | grep -v ' - ' > dump_explain.out + +# Compare +$MRT_TOOLS/diff.sh dump_explain.out dump_explain.expected > dump_explain.diff + +# Exit with success code +exit 0 diff --git a/tests/interface/config/test_dump_config_minimal_alias.sh b/tests/interface/config/test_dump_config_minimal_alias.sh new file mode 100644 index 0000000..a47982e --- /dev/null +++ b/tests/interface/config/test_dump_config_minimal_alias.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Exit on error +set -e + +rm -f dump_alias.{yml,out} + +# Run with no config file +$MRT_MARIAN/marian --best-deep --type s2s --mini-batch 8 --dim-rnn 32 --dim-emb 16 --after-batches 2 --dump-config minimal > dump_alias.yml + +# Remove first line and paths to train sets and vocabs +cat dump_alias.yml | tail -n +2 | grep -v ' - ' > dump_alias.out + +# Compare +$MRT_TOOLS/diff.sh dump_alias.out dump_alias.expected > dump_alias.diff + +# Exit with success code +exit 0 |