Move tests to subdirectory

42 files changed, 23 insertions, 2 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/restoring-corpus/.gitignore b/tests/training/restoring/corpus/.gitignore
index c4aac13..c4aac13 100644
--- a/tests/training/restoring-corpus/.gitignore
+++ b/tests/training/restoring/corpus/.gitignore
diff --git a/tests/training/restoring-corpus/setup.sh b/tests/training/restoring/corpus/setup.sh
index 92aadd2..92aadd2 100644
--- a/tests/training/restoring-corpus/setup.sh
+++ b/tests/training/restoring/corpus/setup.sh
diff --git a/tests/training/restoring-corpus/test_corpus_restoration.sh b/tests/training/restoring/corpus/test_corpus_restoration.sh
index 046e002..046e002 100644
--- a/tests/training/restoring-corpus/test_corpus_restoration.sh
+++ b/tests/training/restoring/corpus/test_corpus_restoration.sh
diff --git a/tests/training/restoring-corpus/test_corpus_restoration_maxi_batch.sh b/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh
index 0d3e54f..0d3e54f 100644
--- a/tests/training/restoring-corpus/test_corpus_restoration_maxi_batch.sh
+++ b/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh
diff --git a/tests/training/restoring-corpus/test_corpus_restoration_mini_batch_fit.sh b/tests/training/restoring/corpus/test_corpus_restoration_mini_batch_fit.sh
index 7f2818f..7f2818f 100644
--- a/tests/training/restoring-corpus/test_corpus_restoration_mini_batch_fit.sh
+++ b/tests/training/restoring/corpus/test_corpus_restoration_mini_batch_fit.sh
diff --git a/tests/training/restoring-corpus/test_corpus_restoration_no_shuffle.sh b/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh
index 0d8c32e..0d8c32e 100644
--- a/tests/training/restoring-corpus/test_corpus_restoration_no_shuffle.sh
+++ b/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh
diff --git a/tests/training/restoring-corpus/test_corpus_restoration_one_epoch.sh b/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh
index 1006398..1006398 100644
--- a/tests/training/restoring-corpus/test_corpus_restoration_one_epoch.sh
+++ b/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh
diff --git a/tests/training/restoring-corpus/test_sqlite_restoration.sh b/tests/training/restoring/corpus/test_sqlite_restoration.sh
index 127f6f4..127f6f4 100644
--- a/tests/training/restoring-corpus/test_sqlite_restoration.sh
+++ b/tests/training/restoring/corpus/test_sqlite_restoration.sh
diff --git a/tests/training/restoring-corpus/test_sqlite_restoration_maxi_batch.sh b/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh
index 9d41c01..9d41c01 100644
--- a/tests/training/restoring-corpus/test_sqlite_restoration_maxi_batch.sh
+++ b/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh
diff --git a/tests/training/restoring-optimizer/.gitignore b/tests/training/restoring/optimizer/.gitignore
index d05ee89..d05ee89 100644
--- a/tests/training/restoring-optimizer/.gitignore
+++ b/tests/training/restoring/optimizer/.gitignore
diff --git a/tests/training/restoring-optimizer/adagrad.costs.expected b/tests/training/restoring/optimizer/adagrad.costs.expected
index 130e694..130e694 100644
--- a/tests/training/restoring-optimizer/adagrad.costs.expected
+++ b/tests/training/restoring/optimizer/adagrad.costs.expected
diff --git a/tests/training/restoring-optimizer/adagrad.gt.expected b/tests/training/restoring/optimizer/adagrad.gt.expected
index 5d10e6c..5d10e6c 100644
--- a/tests/training/restoring-optimizer/adagrad.gt.expected
+++ b/tests/training/restoring/optimizer/adagrad.gt.expected
diff --git a/tests/training/restoring-optimizer/adagrad.keys.expected b/tests/training/restoring/optimizer/adagrad.keys.expected
index 2899089..2899089 100644
--- a/tests/training/restoring-optimizer/adagrad.keys.expected
+++ b/tests/training/restoring/optimizer/adagrad.keys.expected
diff --git a/tests/training/restoring-optimizer/adam.costs.expected b/tests/training/restoring/optimizer/adam.costs.expected
index 20cf3c5..20cf3c5 100644
--- a/tests/training/restoring-optimizer/adam.costs.expected
+++ b/tests/training/restoring/optimizer/adam.costs.expected
diff --git a/tests/training/restoring-optimizer/adam.keys.expected b/tests/training/restoring/optimizer/adam.keys.expected
index b315eed..b315eed 100644
--- a/tests/training/restoring-optimizer/adam.keys.expected
+++ b/tests/training/restoring/optimizer/adam.keys.expected
diff --git a/tests/training/restoring-optimizer/adam.mt.expected b/tests/training/restoring/optimizer/adam.mt.expected
index 1594e99..1594e99 100644
--- a/tests/training/restoring-optimizer/adam.mt.expected
+++ b/tests/training/restoring/optimizer/adam.mt.expected
diff --git a/tests/training/restoring-optimizer/adam.vt.expected b/tests/training/restoring/optimizer/adam.vt.expected
index 1de36c5..1de36c5 100644
--- a/tests/training/restoring-optimizer/adam.vt.expected
+++ b/tests/training/restoring/optimizer/adam.vt.expected
diff --git a/tests/training/restoring-optimizer/adam_async.costs.expected b/tests/training/restoring/optimizer/adam_async.costs.expected
index c9555e5..c9555e5 100644
--- a/tests/training/restoring-optimizer/adam_async.costs.expected
+++ b/tests/training/restoring/optimizer/adam_async.costs.expected
diff --git a/tests/training/restoring-optimizer/adam_async.mt.expected b/tests/training/restoring/optimizer/adam_async.mt.expected
index 17642ad..17642ad 100644
--- a/tests/training/restoring-optimizer/adam_async.mt.expected
+++ b/tests/training/restoring/optimizer/adam_async.mt.expected
diff --git a/tests/training/restoring-optimizer/adam_async.vt.expected b/tests/training/restoring/optimizer/adam_async.vt.expected
index 9abd4e1..9abd4e1 100644
--- a/tests/training/restoring-optimizer/adam_async.vt.expected
+++ b/tests/training/restoring/optimizer/adam_async.vt.expected
diff --git a/tests/training/restoring-optimizer/adam_load.expected b/tests/training/restoring/optimizer/adam_load.expected
index 2869b49..2869b49 100644
--- a/tests/training/restoring-optimizer/adam_load.expected
+++ b/tests/training/restoring/optimizer/adam_load.expected
diff --git a/tests/training/restoring-optimizer/adam_sync.costs.expected b/tests/training/restoring/optimizer/adam_sync.costs.expected
index f01a299..f01a299 100644
--- a/tests/training/restoring-optimizer/adam_sync.costs.expected
+++ b/tests/training/restoring/optimizer/adam_sync.costs.expected
diff --git a/tests/training/restoring-optimizer/adam_sync.mt.expected b/tests/training/restoring/optimizer/adam_sync.mt.expected
index 9d51448..9d51448 100644
--- a/tests/training/restoring-optimizer/adam_sync.mt.expected
+++ b/tests/training/restoring/optimizer/adam_sync.mt.expected
diff --git a/tests/training/restoring-optimizer/adam_sync.vt.expected b/tests/training/restoring/optimizer/adam_sync.vt.expected
index 1285390..1285390 100644
--- a/tests/training/restoring-optimizer/adam_sync.vt.expected
+++ b/tests/training/restoring/optimizer/adam_sync.vt.expected
diff --git a/tests/training/restoring-optimizer/setup.sh b/tests/training/restoring/optimizer/setup.sh
index 92aadd2..92aadd2 100644
--- a/tests/training/restoring-optimizer/setup.sh
+++ b/tests/training/restoring/optimizer/setup.sh
diff --git a/tests/training/restoring-optimizer/test_adagrad_params.sh b/tests/training/restoring/optimizer/test_adagrad_params.sh
index b027760..b027760 100644
--- a/tests/training/restoring-optimizer/test_adagrad_params.sh
+++ b/tests/training/restoring/optimizer/test_adagrad_params.sh
diff --git a/tests/training/restoring-optimizer/test_adam_params.sh b/tests/training/restoring/optimizer/test_adam_params.sh
index 7ef39a2..7ef39a2 100644
--- a/tests/training/restoring-optimizer/test_adam_params.sh
+++ b/tests/training/restoring/optimizer/test_adam_params.sh
diff --git a/tests/training/restoring-optimizer/test_adam_params_async.sh b/tests/training/restoring/optimizer/test_adam_params_async.sh
index 0863d32..0863d32 100644
--- a/tests/training/restoring-optimizer/test_adam_params_async.sh
+++ b/tests/training/restoring/optimizer/test_adam_params_async.sh
diff --git a/tests/training/restoring-optimizer/test_adam_params_sync.sh b/tests/training/restoring/optimizer/test_adam_params_sync.sh
index 82a0366..82a0366 100644
--- a/tests/training/restoring-optimizer/test_adam_params_sync.sh
+++ b/tests/training/restoring/optimizer/test_adam_params_sync.sh
diff --git a/tests/training/restoring-optimizer/test_exponential_smoothing.sh b/tests/training/restoring/optimizer/test_exponential_smoothing.sh
index 62f7a7c..62f7a7c 100644
--- a/tests/training/restoring-optimizer/test_exponential_smoothing.sh
+++ b/tests/training/restoring/optimizer/test_exponential_smoothing.sh
diff --git a/tests/training/restoring-optimizer/test_loading_adam_params.sh b/tests/training/restoring/optimizer/test_loading_adam_params.sh
index 0a4b2b5..0a4b2b5 100644
--- a/tests/training/restoring-optimizer/test_loading_adam_params.sh
+++ b/tests/training/restoring/optimizer/test_loading_adam_params.sh
diff --git a/tests/training/restoring/validation/.gitignore b/tests/training/restoring/validation/.gitignore
new file mode 100644
index 0000000..8e0cc12
--- /dev/null
+++ b/tests/training/restoring/validation/.gitignore
@@ -0,0 +1,6 @@
+valid
+valid_script*.temp
+valid_lowisbet
+valid_stalled
+train.*
+valid.*
diff --git a/tests/training/restoring/validation/setup.sh b/tests/training/restoring/validation/setup.sh
new file mode 100644
index 0000000..92aadd2
--- /dev/null
+++ b/tests/training/restoring/validation/setup.sh
@@ -0,0 +1,10 @@
+test -f $MRT_DATA/europarl.de-en/corpus.bpe.en || exit 1
+test -f $MRT_DATA/europarl.de-en/corpus.bpe.de || exit 1
+
+test -e $MRT_DATA/train.max50.en
+test -e $MRT_DATA/train.max50.de
+
+test -e vocab.de.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-en/corpus.bpe.de > vocab.de.yml
+test -e vocab.en.yml || $MRT_MARIAN/build/marian-vocab < $MRT_DATA/europarl.de-en/corpus.bpe.en > vocab.en.yml
+test -e vocab.de.yml
+test -e vocab.en.yml
diff --git a/tests/training/restarting/test_restarting_stalled_validators.sh b/tests/training/restoring/validation/test_restarting_stalled_validators.sh
index 95cf5fc..95cf5fc 100644
--- a/tests/training/restarting/test_restarting_stalled_validators.sh
+++ b/tests/training/restoring/validation/test_restarting_stalled_validators.sh
diff --git a/tests/training/restarting/test_restoring_validation.sh b/tests/training/restoring/validation/test_restoring_validation.sh
index 9a015cc..9a015cc 100644
--- a/tests/training/restarting/test_restoring_validation.sh
+++ b/tests/training/restoring/validation/test_restoring_validation.sh
diff --git a/tests/training/restarting/test_restoring_validation_lower_is_better.sh b/tests/training/restoring/validation/test_restoring_validation_lower_is_better.sh
index 03c8a79..03c8a79 100644
--- a/tests/training/restarting/test_restoring_validation_lower_is_better.sh
+++ b/tests/training/restoring/validation/test_restoring_validation_lower_is_better.sh
diff --git a/tests/training/restarting/valid.expected b/tests/training/restoring/validation/valid.expected
index 7210b29..7210b29 100644
--- a/tests/training/restarting/valid.expected
+++ b/tests/training/restoring/validation/valid.expected
diff --git a/tests/training/restarting/valid_lowisbet.expected b/tests/training/restoring/validation/valid_lowisbet.expected
index 8ff1d59..8ff1d59 100644
--- a/tests/training/restarting/valid_lowisbet.expected
+++ b/tests/training/restoring/validation/valid_lowisbet.expected
diff --git a/tests/training/restoring/validation/valid_script.sh b/tests/training/restoring/validation/valid_script.sh
new file mode 100755
index 0000000..ac1152b
--- /dev/null
+++ b/tests/training/restoring/validation/valid_script.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+num=$(cat valid_script.temp 2>/dev/null || echo 1)
+((num=(num+1)%6))
+echo $num > valid_script.temp
+((num=6-num))
+echo 222.$num
diff --git a/tests/training/restarting/valid_script_ab.sh b/tests/training/restoring/validation/valid_script_ab.sh
index 032a141..032a141 100755
--- a/tests/training/restarting/valid_script_ab.sh
+++ b/tests/training/restoring/validation/valid_script_ab.sh
diff --git a/tests/training/restarting/valid_stalled.expected b/tests/training/restoring/validation/valid_stalled.expected
index ca195de..ca195de 100644
--- a/tests/training/restarting/valid_stalled.expected
+++ b/tests/training/restoring/validation/valid_stalled.expected