Speed up basic tests

8 files changed, 63 insertions, 66 deletions

diff --git a/tests/training/basics/test_sqlite.sh b/tests/training/basics/test_sqlite.sh
index 1136cdc..90b2ae3 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 \
+    --seed 1111 --no-shuffle --dim-emb 64 --dim-rnn 128 -o sgd \
     -m sqlite/model.nosqlite.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} \
     -v sqlite/vocab.{en,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 \
+    --seed 1111 --no-shuffle --dim-emb 64 --dim-rnn 128 -o sgd \
     -m sqlite/model.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} --sqlite \
     -v sqlite/vocab.{en,de}.yml \
diff --git a/tests/training/basics/test_sqlite_random_seed.sh b/tests/training/basics/test_sqlite_random_seed.sh
index 8baa3e9..05bcfe4 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 \
+    --seed 3333 --dim-emb 64 --dim-rnn 128 -o sgd \
     -m sqlite_seed/model1.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} --sqlite \
     -v sqlite_seed/vocab.{en,de}.yml \
@@ -19,7 +19,7 @@ test -e sqlite_seed/model1.npz
 test -e sqlite_seed_1.log
 
 $MRT_MARIAN/build/marian \
-    --seed 3333 \
+    --seed 3333 --dim-emb 64 --dim-rnn 128 -o sgd \
     -m sqlite_seed/model2.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} --sqlite \
     -v sqlite_seed/vocab.{en,de}.yml \
diff --git a/tests/training/basics/test_toy_vocab.sh b/tests/training/basics/test_toy_vocab.sh
index 12b5031..c9e4f6a 100644
--- a/tests/training/basics/test_toy_vocab.sh
+++ b/tests/training/basics/test_toy_vocab.sh
@@ -8,7 +8,7 @@ mkdir -p toy
 rm -f toy/* toy.log
 
 $MRT_MARIAN/build/marian \
-    --seed 1111 \
+    --seed 1111 --dim-emb 256 --dim-rnn 512 \
     -m toy/model.npz -t $MRT_DATA/europarl.de-en/toy.bpe.{de,en} -v toy/vocab.{en,de}.yml \
     --log toy.log --disp-freq 5 -e 5
 
diff --git a/tests/training/basics/test_translation_script.sh b/tests/training/basics/test_translation_script.sh
index 124b1a9..ef07430 100644
--- a/tests/training/basics/test_translation_script.sh
+++ b/tests/training/basics/test_translation_script.sh
@@ -8,13 +8,12 @@ rm -rf trans trans.log trans_script.temp
 mkdir -p trans
 
 $MRT_MARIAN/build/marian \
-    --no-shuffle \
+    --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 \
     -m trans/model.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.en $MRT_DATA/europarl.de-en/corpus.bpe.de \
     -v vocab.en.yml vocab.de.yml \
     --dim-vocabs 50000 50000 \
     --disp-freq 30 --valid-freq 60 --after-batches 150 \
-    --seed 2222 \
     --valid-metrics cross-entropy translation --valid-script-path ./trans_script.sh \
     --valid-sets trans.bpe.en trans.bpe.de \
     --valid-log trans.log
diff --git a/tests/training/basics/test_valid_script.sh b/tests/training/basics/test_valid_script.sh
index ff3492d..969cdde 100644
--- a/tests/training/basics/test_valid_script.sh
+++ b/tests/training/basics/test_valid_script.sh
@@ -8,15 +8,13 @@ rm -rf valid valid.log valid_script.temp
 mkdir -p valid
 
 $MRT_MARIAN/build/marian \
-    --no-shuffle \
-    -m valid/model.npz \
-    -t $MRT_DATA/europarl.de-en/corpus.bpe.en $MRT_DATA/europarl.de-en/corpus.bpe.de \
-    -v vocab.en.yml vocab.de.yml \
-    --dim-vocabs 50000 50000 \
+    --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 \
+    -m valid/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} \
+    -v vocab.{en,de}.yml --dim-vocabs 50000 50000 \
     --disp-freq 10 --valid-freq 30 --after-batches 150 \
-    --seed 2222 \
-    --valid-metrics cross-entropy valid-script --valid-script-path ./valid_script.sh \
-    --valid-sets $MRT_DATA/europarl.de-en/toy.bpe.en $MRT_DATA/europarl.de-en/toy.bpe.de \
+    --valid-metrics cross-entropy valid-script \
+    --valid-script-path ./valid_script.sh \
+    --valid-sets $MRT_DATA/europarl.de-en/toy.bpe.{en,de} \
     --valid-log valid.log
 
 test -e vocab.en.yml
diff --git a/tests/training/basics/toy.expected b/tests/training/basics/toy.expected
index c88c2a7..74b9335 100644
--- a/tests/training/basics/toy.expected
+++ b/tests/training/basics/toy.expected
@@ -1,44 +1,44 @@
-207.97
-179.22
-211.98
-231.46
-165.49
-197.43
-176.17
-185.81
-156.88
-173.24
-128.23
-235.95
-193.03
-116.90
-110.55
-123.30
-165.79
-134.97
-172.30
-96.99
-122.29
-137.60
-209.24
-241.79
-166.88
-101.22
-114.51
-174.66
-127.41
-137.65
-122.72
-212.46
-147.40
-197.77
-134.97
-172.85
-179.87
-185.95
-128.56
-125.14
-162.05
-95.36
-132.79
-205.98
+208.03
+179.47
+212.83
+237.49
+186.96
+234.88
+209.33
+215.29
+180.76
+198.65
+146.06
+263.98
+213.56
+128.12
+119.03
+131.72
+174.51
+141.27
+178.35
+99.92
+124.80
+139.98
+211.95
+243.47
+168.08
+101.91
+115.40
+175.46
+128.13
+138.20
+123.40
+213.24
+148.44
+198.29
+135.94
+173.55
+181.04
+187.22
+129.47
+126.52
+162.25
+95.56
+133.94
+206.48
diff --git a/tests/training/basics/trans.expected b/tests/training/basics/trans.expected
index aa55dc6..6024593 100644
--- a/tests/training/basics/trans.expected
+++ b/tests/training/basics/trans.expected
@@ -1,4 +1,4 @@
-[valid] 60 : cross-entropy : 161.994 : new best
+[valid] 60 : cross-entropy : 213.1 : new best
 [valid] 60 : translation : 1 : new best
-[valid] 120 : cross-entropy : 150.881 : new best
+[valid] 120 : cross-entropy : 188.014 : new best
 [valid] 120 : translation : 2 : new best
diff --git a/tests/training/basics/valid.expected b/tests/training/basics/valid.expected
index 0b5b0d7..ad9f2e7 100644
--- a/tests/training/basics/valid.expected
+++ b/tests/training/basics/valid.expected
@@ -1,10 +1,10 @@
-[valid] 30 : cross-entropy : 250.641 : new best
+[valid] 30 : cross-entropy : 306.882 : new best
 [valid] 30 : valid-script : 1 : new best
-[valid] 60 : cross-entropy : 211.923 : new best
+[valid] 60 : cross-entropy : 274.157 : new best
 [valid] 60 : valid-script : 2 : new best
-[valid] 90 : cross-entropy : 202.078 : new best
+[valid] 90 : cross-entropy : 256.025 : new best
 [valid] 90 : valid-script : 3 : new best
-[valid] 120 : cross-entropy : 202.574 : stalled 1 times
+[valid] 120 : cross-entropy : 244.47 : new best
 [valid] 120 : valid-script : 4 : new best
-[valid] 150 : cross-entropy : 201.238 : new best
+[valid] 150 : cross-entropy : 234.053 : new best
 [valid] 150 : valid-script : 5 : new best