diff options
Diffstat (limited to 'tests/training/restoring')
20 files changed, 30 insertions, 30 deletions
diff --git a/tests/training/restoring/corpus/test_corpus_restoration.sh b/tests/training/restoring/corpus/test_corpus_restoration.sh index 9b39e32..8b3f625 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration.sh @@ -44,7 +44,7 @@ test -e corpus_2.log cat corpus_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > corpus_2.out cat corpus_1.out corpus_2.out > corpus.out -$MRT_TOOLS/diff-nums.py corpus.out corpus.expected -p 0.1 > corpus.diff +$MRT_TOOLS/diff-nums.py corpus.out corpus.expected -p 0.1 -o corpus.diff # Exit with success code exit 0 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 b26f437..fe5ff6e 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_maxi_batch.sh @@ -46,7 +46,7 @@ test -e corpus_maxi_2.log cat corpus_maxi_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > corpus_maxi_2.out cat corpus_maxi_1.out corpus_maxi_2.out > corpus_maxi.out -$MRT_TOOLS/diff-nums.py corpus_maxi.out corpus_maxi.expected -p 0.1 > corpus_maxi.diff +$MRT_TOOLS/diff-nums.py corpus_maxi.out corpus_maxi.expected -p 0.1 -o corpus_maxi.diff # Exit with success code exit 0 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 85f0746..2b2ade7 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 @@ -45,7 +45,7 @@ test -e corpus_fit_2.log cat corpus_fit_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > corpus_fit_2.out cat corpus_fit_1.out corpus_fit_2.out > corpus_fit.out -$MRT_TOOLS/diff-nums.py corpus_fit.out corpus_fit.expected -p 0.1 > corpus_fit.diff +$MRT_TOOLS/diff-nums.py corpus_fit.out corpus_fit.expected -p 0.1 -o corpus_fit.diff # Exit with success code exit 0 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 04f0e66..3a25ca1 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_no_shuffle.sh @@ -45,7 +45,7 @@ test -e corpus_noshuf_2.log cat corpus_noshuf_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > corpus_noshuf_2.out cat corpus_noshuf_1.out corpus_noshuf_2.out > corpus_noshuf.out -$MRT_TOOLS/diff-nums.py corpus_noshuf.out corpus_noshuf.expected -p 0.1 > corpus_noshuf.diff +$MRT_TOOLS/diff-nums.py corpus_noshuf.out corpus_noshuf.expected -p 0.1 -o corpus_noshuf.diff # Exit with success code exit 0 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 d17fa96..affc5d7 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_one_epoch.sh @@ -44,7 +44,7 @@ test -e corpus_one_2.log cat corpus_one_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > corpus_one_2.out cat corpus_one_1.out corpus_one_2.out > corpus_one.out -$MRT_TOOLS/diff-nums.py corpus_one.out corpus_one.expected -p 0.1 > corpus_one.diff +$MRT_TOOLS/diff-nums.py corpus_one.out corpus_one.expected -p 0.1 -o corpus_one.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh b/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh index 2b811b8..606acbb 100644 --- a/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh +++ b/tests/training/restoring/corpus/test_corpus_restoration_s2s.sh @@ -44,7 +44,7 @@ test -e corpus_s2s_2.log cat corpus_s2s_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > corpus_s2s_2.out cat corpus_s2s_1.out corpus_s2s_2.out > corpus_s2s.out -$MRT_TOOLS/diff-nums.py corpus_s2s.out corpus_s2s.expected -p 0.1 > corpus_s2s.diff +$MRT_TOOLS/diff-nums.py corpus_s2s.out corpus_s2s.expected -p 0.1 -o corpus_s2s.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/corpus/test_sqlite_restoration.sh b/tests/training/restoring/corpus/test_sqlite_restoration.sh index 735f780..0dcbdf8 100644 --- a/tests/training/restoring/corpus/test_sqlite_restoration.sh +++ b/tests/training/restoring/corpus/test_sqlite_restoration.sh @@ -44,7 +44,7 @@ test -e sqlite_2.log cat sqlite_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > sqlite_2.out cat sqlite_1.out sqlite_2.out > sqlite.out -$MRT_TOOLS/diff-nums.py sqlite.out sqlite.expected -p 0.1 > sqlite.diff +$MRT_TOOLS/diff-nums.py sqlite.out sqlite.expected -p 0.1 -o sqlite.diff # Exit with success code exit 0 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 f31b64d..09770d1 100644 --- a/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh +++ b/tests/training/restoring/corpus/test_sqlite_restoration_maxi_batch.sh @@ -44,7 +44,7 @@ test -e sqlite_maxi_2.log cat sqlite_maxi_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' > sqlite_maxi_2.out cat sqlite_maxi_1.out sqlite_maxi_2.out > sqlite_maxi.out -$MRT_TOOLS/diff-nums.py sqlite_maxi.out sqlite_maxi.expected -p 0.1 > sqlite_maxi.diff +$MRT_TOOLS/diff-nums.py sqlite_maxi.out sqlite_maxi.expected -p 0.1 -o sqlite_maxi.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/exp-smoothing/test_expsmooth.sh b/tests/training/restoring/exp-smoothing/test_expsmooth.sh index 31e0f7b..624329f 100644 --- a/tests/training/restoring/exp-smoothing/test_expsmooth.sh +++ b/tests/training/restoring/exp-smoothing/test_expsmooth.sh @@ -77,8 +77,8 @@ cat expsmooth_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | grep 'vali # Results -$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth.out expsmooth.expected > expsmooth.diff -$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth.valid.out expsmooth.valid.expected > expsmooth.valid.diff +$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth.out expsmooth.expected -o expsmooth.diff +$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth.valid.out expsmooth.valid.expected -o expsmooth.valid.diff # Exit with success code diff --git a/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh b/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh index e56bb9a..3a74557 100644 --- a/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh +++ b/tests/training/restoring/exp-smoothing/test_expsmooth_s2s.sh @@ -77,8 +77,8 @@ cat expsmooth_s2s_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | grep ' # Results -$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_s2s.out expsmooth_s2s.expected > expsmooth_s2s.diff -$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_s2s.valid.out expsmooth_s2s.valid.expected > expsmooth_s2s.valid.diff +$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_s2s.out expsmooth_s2s.expected -o expsmooth_s2s.diff +$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_s2s.valid.out expsmooth_s2s.valid.expected -o expsmooth_s2s.valid.diff # Exit with success code diff --git a/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh b/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh index da4425e..20aadcf 100644 --- a/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh +++ b/tests/training/restoring/exp-smoothing/test_expsmooth_sync.sh @@ -77,8 +77,8 @@ cat expsmooth_sync_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | grep # Results -$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_sync.out expsmooth_sync.expected > expsmooth_sync.diff -$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_sync.valid.out expsmooth_sync.valid.expected > expsmooth_sync.valid.diff +$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_sync.out expsmooth_sync.expected -o expsmooth_sync.diff +$MRT_TOOLS/diff-nums.py -p 0.01 expsmooth_sync.valid.out expsmooth_sync.valid.expected -o expsmooth_sync.valid.diff # Exit with success code diff --git a/tests/training/restoring/multi-gpu/test_async.sh b/tests/training/restoring/multi-gpu/test_async.sh index 157b9e7..0c3fcca 100644 --- a/tests/training/restoring/multi-gpu/test_async.sh +++ b/tests/training/restoring/multi-gpu/test_async.sh @@ -54,7 +54,7 @@ cat async.unsorted.expected | head -n -4 | sort -n > async.expected cat async.unsorted.out | head -n -4 | sort -n > async.out # async is undeterministic, so the conditions are weak -$MRT_TOOLS/diff-nums.py -p 1.0 -n 2 async.out async.expected > async.diff +$MRT_TOOLS/diff-nums.py -p 1.0 -n 2 async.out async.expected -o async.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/multi-gpu/test_sync.sh b/tests/training/restoring/multi-gpu/test_sync.sh index 8687990..78190f6 100644 --- a/tests/training/restoring/multi-gpu/test_sync.sh +++ b/tests/training/restoring/multi-gpu/test_sync.sh @@ -47,7 +47,7 @@ test -e sync_2.log cat sync_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : Time.*//' >> sync.out -$MRT_TOOLS/diff-nums.py -p 0.08 sync.out sync.expected > sync.diff +$MRT_TOOLS/diff-nums.py -p 0.08 sync.out sync.expected -o sync.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/optimizer/test_adagrad_params.sh b/tests/training/restoring/optimizer/test_adagrad_params.sh index e0e1b50..49fa78a 100644 --- a/tests/training/restoring/optimizer/test_adagrad_params.sh +++ b/tests/training/restoring/optimizer/test_adagrad_params.sh @@ -18,13 +18,13 @@ test -e adagrad/model.npz.optimizer.npz test -e adagrad.log $MRT_TOOLS/extract-costs.sh < adagrad.log > adagrad.costs.out -$MRT_TOOLS/diff-nums.py adagrad.costs.out adagrad.costs.expected -p 0.2 > adagrad.costs.diff +$MRT_TOOLS/diff-nums.py adagrad.costs.out adagrad.costs.expected -p 0.2 -o adagrad.costs.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adagrad/model.npz.optimizer.npz > adagrad.keys.out diff adagrad.keys.out adagrad.keys.expected > adagrad.keys.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adagrad/model.npz.optimizer.npz -k "adagrad_gt" > adagrad.gt.out -$MRT_TOOLS/diff-nums.py --numpy -p 0.0001 adagrad.gt.out adagrad.gt.expected > adagrad.gt.diff +$MRT_TOOLS/diff-nums.py --numpy -p 0.0001 adagrad.gt.out adagrad.gt.expected -o adagrad.gt.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/optimizer/test_adam_params.sh b/tests/training/restoring/optimizer/test_adam_params.sh index ad77374..c1522d3 100644 --- a/tests/training/restoring/optimizer/test_adam_params.sh +++ b/tests/training/restoring/optimizer/test_adam_params.sh @@ -18,15 +18,15 @@ test -e adam/model.npz.optimizer.npz test -e adam.log $MRT_TOOLS/extract-costs.sh < adam.log > adam.costs.out -$MRT_TOOLS/diff-nums.py adam.costs.out adam.costs.expected -p 0.2 > adam.costs.diff +$MRT_TOOLS/diff-nums.py adam.costs.out adam.costs.expected -p 0.2 -o adam.costs.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adam/model.npz.optimizer.npz > adam.keys.out diff adam.keys.out adam.keys.expected > adam.keys.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adam/model.npz.optimizer.npz -k "adam_mt" > adam.mt.out -$MRT_TOOLS/diff-nums.py --numpy -p 0.0001 adam.mt.out adam.mt.expected > adam.mt.diff +$MRT_TOOLS/diff-nums.py --numpy -p 0.0001 adam.mt.out adam.mt.expected -o adam.mt.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adam/model.npz.optimizer.npz -k "adam_vt" > adam.vt.out -$MRT_TOOLS/diff-nums.py --numpy -p 0.000005 adam.vt.out adam.vt.expected > adam.vt.diff +$MRT_TOOLS/diff-nums.py --numpy -p 0.000005 adam.vt.out adam.vt.expected -o adam.vt.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/optimizer/test_adam_params_async.sh b/tests/training/restoring/optimizer/test_adam_params_async.sh index a842050..c9b1271 100644 --- a/tests/training/restoring/optimizer/test_adam_params_async.sh +++ b/tests/training/restoring/optimizer/test_adam_params_async.sh @@ -23,7 +23,7 @@ test -e adam_async/model.npz.optimizer.npz test -e adam_async.log $MRT_TOOLS/extract-costs.sh < adam_async.log > adam_async.costs.out -$MRT_TOOLS/diff-nums.py adam_async.costs.out adam_async.costs.expected -p 10.00 -n 2 > adam_async.costs.diff +$MRT_TOOLS/diff-nums.py adam_async.costs.out adam_async.costs.expected -p 10.00 -n 2 -o adam_async.costs.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_async/model.npz.optimizer.npz > adam_async.keys.out diff adam_async.keys.out adam.keys.expected > adam_async.keys.diff @@ -31,8 +31,8 @@ diff adam_async.keys.out adam.keys.expected > adam_async.keys.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_async/model.npz.optimizer.npz -k "adam_mt" > adam_async.mt.out python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_async/model.npz.optimizer.npz -k "adam_vt" > adam_async.vt.out -$MRT_TOOLS/diff-nums.py --numpy -a -p 0.02 adam_async.mt.out adam_async.mt.expected > adam_async.mt.diff -$MRT_TOOLS/diff-nums.py --numpy -p 0.001 adam_async.vt.out adam_async.vt.expected > adam_async.vt.diff +$MRT_TOOLS/diff-nums.py --numpy -a -p 0.02 adam_async.mt.out adam_async.mt.expected -o adam_async.mt.diff +$MRT_TOOLS/diff-nums.py --numpy -p 0.001 adam_async.vt.out adam_async.vt.expected -o adam_async.vt.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/optimizer/test_adam_params_sync.sh b/tests/training/restoring/optimizer/test_adam_params_sync.sh index 5fe2581..56e231c 100644 --- a/tests/training/restoring/optimizer/test_adam_params_sync.sh +++ b/tests/training/restoring/optimizer/test_adam_params_sync.sh @@ -23,7 +23,7 @@ test -e adam_sync/model.npz.optimizer.npz test -e adam_sync.log $MRT_TOOLS/extract-costs.sh < adam_sync.log > adam_sync.costs.out -$MRT_TOOLS/diff-nums.py adam_sync.costs.out adam_sync.costs.expected -p 3.00 -n 2 > adam_sync.costs.diff +$MRT_TOOLS/diff-nums.py adam_sync.costs.out adam_sync.costs.expected -p 3.00 -n 2 -o adam_sync.costs.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_sync/model.npz.optimizer.npz > adam_sync.keys.out diff adam_sync.keys.out adam.keys.expected > adam_sync.keys.diff @@ -31,8 +31,8 @@ diff adam_sync.keys.out adam.keys.expected > adam_sync.keys.diff python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_sync/model.npz.optimizer.npz -k "adam_mt" > adam_sync.mt.out python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_sync/model.npz.optimizer.npz -k "adam_vt" > adam_sync.vt.out -$MRT_TOOLS/diff-nums.py --numpy -p 0.002 adam_sync.mt.out adam_sync.mt.expected > adam_sync.mt.diff -$MRT_TOOLS/diff-nums.py --numpy -p 0.0002 adam_sync.vt.out adam_sync.vt.expected > adam_sync.vt.diff +$MRT_TOOLS/diff-nums.py --numpy -p 0.002 adam_sync.mt.out adam_sync.mt.expected -o adam_sync.mt.diff +$MRT_TOOLS/diff-nums.py --numpy -p 0.0002 adam_sync.vt.out adam_sync.vt.expected -o adam_sync.vt.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/optimizer/test_loading_adam_params.sh b/tests/training/restoring/optimizer/test_loading_adam_params.sh index 4d11c77..88ddf64 100644 --- a/tests/training/restoring/optimizer/test_loading_adam_params.sh +++ b/tests/training/restoring/optimizer/test_loading_adam_params.sh @@ -33,7 +33,7 @@ cat adam_load_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "Ep\. " | sed 's/ : # The allowed tolerance needs to be radiculously high as restarting the # training is very instable on different GPU devices -$MRT_TOOLS/diff-nums.py -p 15.0 -n 1 adam_load.out adam_load.expected > adam_load.diff +$MRT_TOOLS/diff-nums.py -p 15.0 -n 1 adam_load.out adam_load.expected -o adam_load.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/validation/test_adding_validator_after_restart.sh b/tests/training/restoring/validation/test_adding_validator_after_restart.sh index 1a70eba..9a93a6b 100644 --- a/tests/training/restoring/validation/test_adding_validator_after_restart.sh +++ b/tests/training/restoring/validation/test_adding_validator_after_restart.sh @@ -50,7 +50,7 @@ test -e valid_add/model.npz test -e valid_add_2.log cat valid_add_2.log | $MRT_TOOLS/strip-timestamps.sh >> valid_add.out -$MRT_TOOLS/diff-nums.py -p 0.003 valid_add.out valid_add.expected > valid_add.diff +$MRT_TOOLS/diff-nums.py -p 0.003 valid_add.out valid_add.expected -o valid_add.diff # Exit with success code exit 0 diff --git a/tests/training/restoring/validation/test_restoring_validation_lower_is_better.sh b/tests/training/restoring/validation/test_restoring_validation_lower_is_better.sh index ede179d..4a6c4a9 100644 --- a/tests/training/restoring/validation/test_restoring_validation_lower_is_better.sh +++ b/tests/training/restoring/validation/test_restoring_validation_lower_is_better.sh @@ -36,7 +36,7 @@ test -e valid_lowisbet/model.npz test -e valid_lowisbet_2.log cat valid_lowisbet_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "cross-entropy" >> valid_lowisbet.out -$MRT_TOOLS/diff-nums.py -p 0.1 valid_lowisbet.out valid_lowisbet.expected > valid_lowisbet.diff +$MRT_TOOLS/diff-nums.py -p 0.1 valid_lowisbet.out valid_lowisbet.expected -o valid_lowisbet.diff # Exit with success code exit 0 |