Update tests after changes in batch sorting

7 files changed, 69 insertions, 71 deletions

diff --git a/tests/training/basic/test_toy_vocab.sh b/tests/training/basic/test_toy_vocab.sh
index 3f72c63..12b5031 100644
--- a/tests/training/basic/test_toy_vocab.sh
+++ b/tests/training/basic/test_toy_vocab.sh
@@ -8,11 +8,9 @@ mkdir -p toy
 rm -f toy/* toy.log
 
 $MRT_MARIAN/build/marian \
-    -m toy/model.npz \
-    -t $MRT_DATA/europarl.de-en/toy.bpe.en $MRT_DATA/europarl.de-en/toy.bpe.de \
-    -v toy/vocab.en.yml toy/vocab.de.yml \
-    --log toy.log --disp-freq 5 -e 5 \
-    --seed 1111
+    --seed 1111 \
+    -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
 
 test -e toy/vocab.en.yml
 test -e toy/vocab.de.yml
@@ -21,7 +19,7 @@ test -e toy/model.npz.yml
 test -e toy/model.npz.amun.yml
 
 cat toy.log | $MRT_TOOLS/extract-costs.sh > toy.out
-$MRT_TOOLS/diff-floats.py toy.out toy.expected -p 0.9 > toy.diff
+$MRT_TOOLS/diff-floats.py toy.out toy.expected -p 0.99 -n 5 > toy.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/training/basic/toy.expected b/tests/training/basic/toy.expected
index b1685a7..c88c2a7 100644
--- a/tests/training/basic/toy.expected
+++ b/tests/training/basic/toy.expected
@@ -1,44 +1,44 @@
-208.59
-180.91
-212.17
-232.04
-167.60
-207.34
-185.34
-198.69
-165.93
-183.52
-132.58
-251.89
-202.57
-119.99
-114.06
-129.41
-173.56
-142.11
-180.13
-98.25
-125.42
-144.35
-223.07
-257.24
-174.56
-105.38
-118.51
-184.63
-133.60
-139.50
-126.58
-224.24
-158.11
-208.56
-142.50
-181.21
-192.02
-196.95
-135.11
-131.35
-168.91
-98.56
-138.61
-215.51
+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
diff --git a/tests/training/batches/dynamic.expected b/tests/training/batches/dynamic.expected
index c08e576..73fc6fe 100644
--- a/tests/training/batches/dynamic.expected
+++ b/tests/training/batches/dynamic.expected
@@ -1,5 +1,5 @@
-220
-237
+222
+235
 230
 229
 231
diff --git a/tests/training/valid/final_batch.expected b/tests/training/valid/final_batch.expected
index 3849c28..3ae8f53 100644
--- a/tests/training/valid/final_batch.expected
+++ b/tests/training/valid/final_batch.expected
@@ -1,3 +1,3 @@
-[valid] 60 : cross-entropy : 161.56 : new best
-[valid] 120 : cross-entropy : 149.974 : new best
-[valid] 150 : cross-entropy : 148.977 : new best
+[valid] 60 : cross-entropy : 161.588 : new best
+[valid] 120 : cross-entropy : 150.248 : new best
+[valid] 150 : cross-entropy : 149.088 : new best
diff --git a/tests/training/valid/final_epoch.expected b/tests/training/valid/final_epoch.expected
index f666c8e..f1a44a7 100644
--- a/tests/training/valid/final_epoch.expected
+++ b/tests/training/valid/final_epoch.expected
@@ -1,3 +1,3 @@
-[valid] 40 : cross-entropy : 179.973 : new best
-[valid] 80 : cross-entropy : 154.704 : new best
-[valid] 81 : cross-entropy : 154.563 : new best
+[valid] 40 : cross-entropy : 179.636 : new best
+[valid] 80 : cross-entropy : 154.569 : new best
+[valid] 81 : cross-entropy : 154.429 : new best
diff --git a/tests/training/valid/final_match.expected b/tests/training/valid/final_match.expected
index 6c31288..d24131b 100644
--- a/tests/training/valid/final_match.expected
+++ b/tests/training/valid/final_match.expected
@@ -1,3 +1,3 @@
-[valid] 60 : cross-entropy : 161.559 : new best
-[valid] 120 : cross-entropy : 149.974 : new best
-[valid] 180 : cross-entropy : 148.967 : new best
+[valid] 60 : cross-entropy : 161.587 : new best
+[valid] 120 : cross-entropy : 150.248 : new best
+[valid] 180 : cross-entropy : 148.775 : new best
diff --git a/tests/training/weights/maxibatch.expected b/tests/training/weights/maxibatch.expected
index d195827..d191734 100644
--- a/tests/training/weights/maxibatch.expected
+++ b/tests/training/weights/maxibatch.expected
@@ -1,10 +1,10 @@
-6915.06
-5113.08
-3434.51
-2349.80
-1471.84
-3602.55
-3667.30
-2832.99
-2116.09
-1487.49
+6916.29
+5106.83
+3438.09
+2349.86
+1473.54
+3595.42
+3671.98
+2831.25
+2118.49
+1484.09