Use clip-norm 0 in training/validation/

12 files changed, 31 insertions, 31 deletions

diff --git a/tests/training/validation/final_batch.expected b/tests/training/validation/final_batch.expected
index eac5cdc..2e0a8b3 100644
--- a/tests/training/validation/final_batch.expected
+++ b/tests/training/validation/final_batch.expected
@@ -1,3 +1,3 @@
-[valid] Ep. 1 : Up. 60 : cross-entropy : 240.376 : new best
-[valid] Ep. 1 : Up. 120 : cross-entropy : 240.348 : new best
-[valid] Ep. 1 : Up. 150 : cross-entropy : 240.332 : new best
+[valid] Ep. 1 : Up. 60 : cross-entropy : 198.667 : new best
+[valid] Ep. 1 : Up. 120 : cross-entropy : 186.536 : new best
+[valid] Ep. 1 : Up. 150 : cross-entropy : 181.413 : new best
diff --git a/tests/training/validation/final_epoch.expected b/tests/training/validation/final_epoch.expected
index ebcb25c..f96a0df 100644
--- a/tests/training/validation/final_epoch.expected
+++ b/tests/training/validation/final_epoch.expected
@@ -1,3 +1,3 @@
-[valid] Ep. 1 : Up. 40 : cross-entropy : 240.475 : new best
-[valid] Ep. 1 : Up. 80 : cross-entropy : 240.459 : new best
-[valid] Ep. 2 : Up. 81 : cross-entropy : 240.459 : new best
+[valid] Ep. 1 : Up. 40 : cross-entropy : 234.305 : new best
+[valid] Ep. 1 : Up. 80 : cross-entropy : 227.512 : new best
+[valid] Ep. 2 : Up. 81 : cross-entropy : 227.471 : new best
diff --git a/tests/training/validation/final_match.expected b/tests/training/validation/final_match.expected
index 87c9cc2..d685062 100644
--- a/tests/training/validation/final_match.expected
+++ b/tests/training/validation/final_match.expected
@@ -1,3 +1,3 @@
-[valid] Ep. 1 : Up. 60 : cross-entropy : 240.376 : new best
-[valid] Ep. 1 : Up. 120 : cross-entropy : 240.348 : new best
-[valid] Ep. 1 : Up. 180 : cross-entropy : 240.317 : new best
+[valid] Ep. 1 : Up. 60 : cross-entropy : 198.667 : new best
+[valid] Ep. 1 : Up. 120 : cross-entropy : 186.536 : new best
+[valid] Ep. 1 : Up. 180 : cross-entropy : 179.091 : new best
diff --git a/tests/training/validation/test_final_validation_after_batches.sh b/tests/training/validation/test_final_validation_after_batches.sh
index b4ccc3c..84a3dda 100644
--- a/tests/training/validation/test_final_validation_after_batches.sh
+++ b/tests/training/validation/test_final_validation_after_batches.sh
@@ -8,10 +8,10 @@ rm -rf final_batch final_batch.log vocab.*.yml
 mkdir -p final_batch
 
 $MRT_MARIAN/marian \
-    --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \
+    --no-shuffle --clip-norm 0 --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 \
+    --disp-freq 30 --valid-freq 60 --after 150u \
     --valid-metrics cross-entropy --valid-sets valid.bpe.{en,de} \
     --valid-log final_batch.log
 
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 fc676cf..dc64991 100644
--- a/tests/training/validation/test_final_validation_after_batches_match.sh
+++ b/tests/training/validation/test_final_validation_after_batches_match.sh
@@ -8,10 +8,10 @@ rm -rf final_match final_match.log vocab.*.yml
 mkdir -p final_match
 
 $MRT_MARIAN/marian \
-    --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \
+    --no-shuffle --clip-norm 0 --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 \
+    --disp-freq 30 --valid-freq 60 --after 180u \
     --valid-metrics cross-entropy --valid-sets valid.bpe.{en,de} \
     --valid-log final_match.log
 
diff --git a/tests/training/validation/test_final_validation_after_epochs.sh b/tests/training/validation/test_final_validation_after_epochs.sh
index e8e606f..e263259 100644
--- a/tests/training/validation/test_final_validation_after_epochs.sh
+++ b/tests/training/validation/test_final_validation_after_epochs.sh
@@ -11,10 +11,10 @@ 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/marian \
-    --no-shuffle --seed 1111 --optimizer sgd --dim-emb 64 --dim-rnn 128 \
+    --no-shuffle --clip-norm 0 --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 \
+    --mini-batch 32 --disp-freq 20 --valid-freq 40 --after 1e \
     --valid-metrics cross-entropy --valid-sets valid.bpe.{en,de} \
     --valid-log final_epoch.log
 
diff --git a/tests/training/validation/test_translation_metric_with_empty_lines.sh b/tests/training/validation/test_translation_metric_with_empty_lines.sh
index 95333c2..5ff7115 100644
--- a/tests/training/validation/test_translation_metric_with_empty_lines.sh
+++ b/tests/training/validation/test_translation_metric_with_empty_lines.sh
@@ -28,9 +28,9 @@ test -e trans_empty_lines/train.en || cat $MRT_DATA/train.max50.en | sed 's/@@ /
 
 # Train
 $MRT_MARIAN/marian \
-    --seed 2222 --no-shuffle --mini-batch 32 --maxi-batch 1 --optimizer sgd \
+    --seed 2222 --no-shuffle --clip-norm 0 --mini-batch 32 --maxi-batch 1 --optimizer sgd -l 0.00001 \
     -m trans_empty_lines/model.npz -t trans_empty_lines/train.{de,en} -v trans_empty_lines/vocab.{spm,spm} \
-    --disp-freq 20 --valid-freq 60 --after-batches 60 \
+    --disp-freq 10 --valid-freq 30 --after 30u \
     --valid-metrics cross-entropy translation --valid-translation-output trans_empty_lines.out \
     --valid-sets trans_empty_lines.de trans_empty_lines.en \
     --valid-log trans_empty_lines.log
diff --git a/tests/training/validation/test_translation_script.sh b/tests/training/validation/test_translation_script.sh
index 2bf8648..11d0883 100644
--- a/tests/training/validation/test_translation_script.sh
+++ b/tests/training/validation/test_translation_script.sh
@@ -14,11 +14,11 @@ rm -rf trans trans.log trans_script.temp
 mkdir -p trans
 
 $MRT_MARIAN/marian \
-    --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 --maxi-batch 1 --mini-batch 16 \
+    --seed 2222 --no-shuffle --clip-norm 0 --dim-emb 128 --dim-rnn 256 --maxi-batch 1 --mini-batch 16 \
     -m trans/model.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} -v vocab.50k.en.yml vocab.50k.de.yml \
     --dim-vocabs 50000 50000 \
-    --disp-freq 30 --valid-freq 60 --after-batches 150 \
+    --disp-freq 30 --valid-freq 60 --after 150u \
     --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/validation/test_valid_script.sh b/tests/training/validation/test_valid_script.sh
index 53cfba5..7cd60e9 100644
--- a/tests/training/validation/test_valid_script.sh
+++ b/tests/training/validation/test_valid_script.sh
@@ -14,7 +14,7 @@ rm -rf valid valid.log valid_script.temp
 mkdir -p valid
 
 $MRT_MARIAN/marian \
-    --seed 2222 --no-shuffle --dim-emb 128 --dim-rnn 256 --maxi-batch 1 --mini-batch 16 \
+    --seed 2222 --no-shuffle --clip-norm 0 --dim-emb 128 --dim-rnn 256 --maxi-batch 1 --mini-batch 16 \
     -m valid/model.npz -t $MRT_DATA/europarl.de-en/corpus.bpe.{en,de} \
     -v vocab.50k.en.yml vocab.50k.de.yml --dim-vocabs 50000 50000 \
     --disp-freq 5 --valid-freq 15 --after-batches 75 \
diff --git a/tests/training/validation/trans.expected b/tests/training/validation/trans.expected
index 68987df..875a980 100644
--- a/tests/training/validation/trans.expected
+++ b/tests/training/validation/trans.expected
@@ -1,4 +1,4 @@
-[valid] Ep. 1 : Up. 60 : cross-entropy : 218.835 : new best
+[valid] Ep. 1 : Up. 60 : cross-entropy : 215.525 : new best
 [valid] Ep. 1 : Up. 60 : translation : 1 : new best
-[valid] Ep. 1 : Up. 120 : cross-entropy : 187.91 : new best
+[valid] Ep. 1 : Up. 120 : cross-entropy : 186.551 : new best
 [valid] Ep. 1 : Up. 120 : translation : 2 : new best
diff --git a/tests/training/validation/trans_empty_lines.expected b/tests/training/validation/trans_empty_lines.expected
index 45ae20b..46a9bae 100644
--- a/tests/training/validation/trans_empty_lines.expected
+++ b/tests/training/validation/trans_empty_lines.expected
@@ -1,9 +1,9 @@
-That concludes the agenda, ladies and gentlemen.
-The Minutes of this sitting will be submitted to plenary at the beginning of the next part-session.
-Mr Manders has the floor for a point of order.
-Mr President, I would like to take this opportunity to wish you, the Bureau and all Members well for the new year.
+, ladies and gentlemen , Parliament has completed the agenda .
+The Minutes of this sitting will be submitted to plenary at the beginning of the next part-session .
+Mr Manders has the floor for a point of order .
+Mr President , I would like to take this opportunity to wish you , the Bureau and all Members well for the new year .
 
-I would even like to allow me to name the Commission and the Council, even if they are not present.
+I would even allow me to name the Commission and the Council , even if they are not present .
 
 
 I declare the session of the European Parliament adjourned.
diff --git a/tests/training/validation/valid.expected b/tests/training/validation/valid.expected
index 66764ec..48227e6 100644
--- a/tests/training/validation/valid.expected
+++ b/tests/training/validation/valid.expected
@@ -1,10 +1,10 @@
 [valid] Ep. 1 : Up. 15 : cross-entropy : 307.647 : new best
 [valid] Ep. 1 : Up. 15 : valid-script : 1 : new best
-[valid] Ep. 1 : Up. 30 : cross-entropy : 305.551 : new best
+[valid] Ep. 1 : Up. 30 : cross-entropy : 305.336 : new best
 [valid] Ep. 1 : Up. 30 : valid-script : 2 : new best
-[valid] Ep. 1 : Up. 45 : cross-entropy : 299.442 : new best
+[valid] Ep. 1 : Up. 45 : cross-entropy : 297.463 : new best
 [valid] Ep. 1 : Up. 45 : valid-script : 3 : new best
-[valid] Ep. 1 : Up. 60 : cross-entropy : 281.549 : new best
+[valid] Ep. 1 : Up. 60 : cross-entropy : 277.038 : new best
 [valid] Ep. 1 : Up. 60 : valid-script : 4 : new best
-[valid] Ep. 1 : Up. 75 : cross-entropy : 268.403 : new best
+[valid] Ep. 1 : Up. 75 : cross-entropy : 265.286 : new best
 [valid] Ep. 1 : Up. 75 : valid-script : 5 : new best