diff options
author | Frank Seide <fseide@microsoft.com> | 2019-05-15 21:39:22 +0300 |
---|---|---|
committer | Frank Seide <fseide@microsoft.com> | 2019-05-15 21:39:22 +0300 |
commit | 41f3c2df46e946081a078a6bd90091b9c2515511 (patch) | |
tree | 72b0fbdc88ed820afa208ad6c5d648a6fb15663b | |
parent | 142eadddbe04493c1024b42586030b72e9cb7ea2 (diff) |
bug fix: should not accidentally use python2; log messages cleanup
-rwxr-xr-x | run_mrt.sh | 6 | ||||
-rw-r--r-- | tests/training/models/amun/test_amun_has_decoder_c_tt.sh | 2 | ||||
-rw-r--r-- | tests/training/restoring/optimizer/test_adagrad_params.sh | 4 | ||||
-rw-r--r-- | tests/training/restoring/optimizer/test_adam_params.sh | 6 |
4 files changed, 9 insertions, 9 deletions
@@ -36,16 +36,16 @@ if [[ ! -e $MRT_MARIAN/marian-decoder ]]; then MRT_MARIAN="$MRT_MARIAN/build" fi -log "Using Marian: $MRT_MARIAN" - # Check if required tools are present in marian directory for cmd in marian marian-decoder marian-scorer marian-server marian-vocab; do if [ ! -e $MRT_MARIAN/$cmd ]; then - echo "Error: '$cmd' is not installed in '$MRT_MARIAN', you need to compile the toolkit first" + echo "Error: '$MRT_MARIAN/$cmd' not found. Do you need to compile the toolkit first?" exit 1 fi done +log "Using Marian binary: $MRT_MARIAN/marian" + # Get CMake settings cd $MRT_MARIAN cmake -L 2> /dev/null > $MRT_ROOT/cmake.log diff --git a/tests/training/models/amun/test_amun_has_decoder_c_tt.sh b/tests/training/models/amun/test_amun_has_decoder_c_tt.sh index 8aa4f3d..b52dccc 100644 --- a/tests/training/models/amun/test_amun_has_decoder_c_tt.sh +++ b/tests/training/models/amun/test_amun_has_decoder_c_tt.sh @@ -15,7 +15,7 @@ $MRT_MARIAN/marian \ test -e decoder_c_tt/model.npz -python $MRT_MARIAN/../scripts/contrib/model_info.py -m decoder_c_tt/model.npz > decoder_c_tt.out +$MRT_MARIAN/../scripts/contrib/model_info.py -m decoder_c_tt/model.npz > decoder_c_tt.out grep -q "decoder_c_tt" decoder_c_tt.out # Exit with success code diff --git a/tests/training/restoring/optimizer/test_adagrad_params.sh b/tests/training/restoring/optimizer/test_adagrad_params.sh index 333cc24..746fa56 100644 --- a/tests/training/restoring/optimizer/test_adagrad_params.sh +++ b/tests/training/restoring/optimizer/test_adagrad_params.sh @@ -20,10 +20,10 @@ 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 -o adagrad.costs.diff -python $MRT_MARIAN/../scripts/contrib/model_info.py -m adagrad/model.npz.optimizer.npz > adagrad.keys.out +$MRT_MARIAN/../scripts/contrib/model_info.py -m adagrad/model.npz.optimizer.npz > adagrad.keys.out $MRT_TOOLS/diff.sh 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_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 -o adagrad.gt.diff # Exit with success code diff --git a/tests/training/restoring/optimizer/test_adam_params.sh b/tests/training/restoring/optimizer/test_adam_params.sh index 65c8321..413ac7d 100644 --- a/tests/training/restoring/optimizer/test_adam_params.sh +++ b/tests/training/restoring/optimizer/test_adam_params.sh @@ -20,12 +20,12 @@ 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 -o adam.costs.diff -python $MRT_MARIAN/../scripts/contrib/model_info.py -m adam/model.npz.optimizer.npz > adam.keys.out +$MRT_MARIAN/../scripts/contrib/model_info.py -m adam/model.npz.optimizer.npz > adam.keys.out $MRT_TOOLS/diff.sh 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_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 -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_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 -o adam.vt.diff # Exit with success code |