diff options
| author | Tomasz Dwojak <t.dwojak@amu.edu.pl> | 2017-12-14 16:40:25 +0300 |
|---|---|---|
| committer | Tomasz Dwojak <t.dwojak@amu.edu.pl> | 2017-12-14 16:40:25 +0300 |
| commit | c982e61af967a3f725f70e49e0c0d2a5804fbdd2 (patch) | |
| tree | 1e4edba6864396c083bbff6690ef69ccadcce0ab | |
| parent | 15a88e1b082f2d9aa4f782b4e1a8cb008ccca89c (diff) | |
Use RUN_MARIAN variables in multi-domain testsoptirun
| -rwxr-xr-x | run_mrt.sh | 1 | ||||
| -rw-r--r-- | tests/_multi-domain/setup.sh | 2 | ||||
| -rw-r--r-- | tests/_multi-domain/test_bleu_and_costs.sh | 4 | ||||
| -rw-r--r-- | tests/models/wmt17-ende/test_translation_b6n.sh | 2 | ||||
| -rw-r--r-- | tests/models/wmt17-ende/test_translation_b6n_batch32.sh | 2 |
5 files changed, 6 insertions, 5 deletions
@@ -20,6 +20,7 @@ echo "RUN_PREFIX: $RUN_PREFIX" export MRT_RUN_MARIAN="$RUN_PREFIX $MRT_MARIAN/build/marian" export MRT_RUN_MARIAN_DECODER="$RUN_PREFIX $MRT_MARIAN/build/marian-decoder" export MRT_RUN_MARIAN_SCORER="$MRT_MARIAN/build/marian-scorer" +export MRT_RUN_MARIAN_MULTI_DOMAIN="$MRT_MARIAN/build/marian-multi-domain" # Check if Marian is compiled with CUDNN export MRT_MARIAN_USE_CUDNN=$(cmake -L $MRT_MARIAN/build 2> /dev/null | grep -P "USE_CUDNN:BOOL=(ON|on|1)") diff --git a/tests/_multi-domain/setup.sh b/tests/_multi-domain/setup.sh index a06d1d5..a853df5 100644 --- a/tests/_multi-domain/setup.sh +++ b/tests/_multi-domain/setup.sh @@ -1,2 +1,2 @@ -test -e $MRT_MARIAN/build/marian-multi-domain || exit 1 +test -e $MRT_RUN_MARIAN_MULTI_DOMAIN || exit 1 test -f $MRT_MODELS/wmt16_systems/en-de/model.npz || exit 1 diff --git a/tests/_multi-domain/test_bleu_and_costs.sh b/tests/_multi-domain/test_bleu_and_costs.sh index 8712783..36db357 100644 --- a/tests/_multi-domain/test_bleu_and_costs.sh +++ b/tests/_multi-domain/test_bleu_and_costs.sh @@ -6,14 +6,14 @@ set -e # Test code goes here rm -f domain.log -#$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < ubuntu.in > trans.out +#$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < ubuntu.in > trans.out #diff trans.out trans.expected > trans.diff #$MRT_TOOLS/moses-scripts/scripts/generic/multi-bleu.perl -lc ubuntu.ref < trans.out > trans.bleu #diff trans.bleu trans.bleu.expected > trans.bleu.diff # Run multi-domain -$MRT_MARIAN/build/marian-multi-domain \ +$MRT_RUN_MARIAN_MULTI_DOMAIN \ -m $MRT_MODELS/wmt16_systems/en-de/model.npz \ -v $MRT_MODELS/wmt16_systems/en-de/vocab.en.json -v $MRT_MODELS/wmt16_systems/en-de/vocab.de.json \ --dim-vocabs 85000 85000 --dim-emb 500 \ diff --git a/tests/models/wmt17-ende/test_translation_b6n.sh b/tests/models/wmt17-ende/test_translation_b6n.sh index 91620ca..125e6a2 100644 --- a/tests/models/wmt17-ende/test_translation_b6n.sh +++ b/tests/models/wmt17-ende/test_translation_b6n.sh @@ -6,7 +6,7 @@ set -e rm -f marian.b6n.out # Run Marian -$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt17_systems/marian.en-de.yml -b 6 -n 1.0 < text.b6n.in > marian.b6n.out +$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt17_systems/marian.en-de.yml -b 6 -n 1.0 < text.b6n.in > marian.b6n.out # Compare with Marian and Nematus diff marian.b6n.out marian.b6n.expected > marian.b6n.diff diff --git a/tests/models/wmt17-ende/test_translation_b6n_batch32.sh b/tests/models/wmt17-ende/test_translation_b6n_batch32.sh index 934e42c..6c6de3d 100644 --- a/tests/models/wmt17-ende/test_translation_b6n_batch32.sh +++ b/tests/models/wmt17-ende/test_translation_b6n_batch32.sh @@ -7,7 +7,7 @@ set -e rm -f marian.batch32.out # Run Marian -$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt17_systems/marian.en-de.yml -b 6 -n 1.0 \ +$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt17_systems/marian.en-de.yml -b 6 -n 1.0 \ --mini-batch 32 --maxi-batch 10 --maxi-batch-sort src -w 2500 \ < text.b6n.in > marian.batch32.out |