Change paths to marian

16 files changed, 19 insertions, 16 deletions

diff --git a/run_mrt.sh b/run_mrt.sh
index ca874bc..fc969b4 100755
--- a/run_mrt.sh
+++ b/run_mrt.sh
@@ -10,6 +10,9 @@ export MRT_TOOLS=$MRT_ROOT/tools
 export MRT_MARIAN=${MARIAN:-$MRT_TOOLS/marian}
 export MRT_MODELS=$MRT_ROOT/models
 export MRT_DATA=$MRT_ROOT/data
+export MRT_RUN_MARIAN=$MRT_MARIAN/build/marian
+export MRT_RUN_MARIAN_DECODER=$MRT_MARIAN/build/marian-decoder
+export MRT_RUN_MARIAN_SCORER=$MRT_MARIAN/build/marian-scorer
 
 # 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/decoder/wmt16/test_ende.sh b/tests/decoder/wmt16/test_ende.sh
index 22707bc..bde1ae8 100644
--- a/tests/decoder/wmt16/test_ende.sh
+++ b/tests/decoder/wmt16/test_ende.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Test code goes here
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < text.in > text.out
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < text.in > text.out
 diff text.out text.expected > text.diff
 
 # Exit with success code
diff --git a/tests/decoder/wmt16/test_ende_logs.sh b/tests/decoder/wmt16/test_ende_logs.sh
index 13e5689..65b5ada 100644
--- a/tests/decoder/wmt16/test_ende_logs.sh
+++ b/tests/decoder/wmt16/test_ende_logs.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Test code goes here
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < text.in 2> logs.raw
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < text.in 2> logs.raw
 cat logs.raw | grep "] Best translation" | sed -r "s/.*Best translation [0-9]+ : (.*)/\1/" > logs.out
 diff logs.out text.expected > logs.diff
 
diff --git a/tests/decoder/wmt16/test_nbest.sh b/tests/decoder/wmt16/test_nbest.sh
index 7d75ac3..1fcac1a 100644
--- a/tests/decoder/wmt16/test_nbest.sh
+++ b/tests/decoder/wmt16/test_nbest.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Test code goes here
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -b 5 --n-best < text.in > nbest.out
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -b 5 --n-best < text.in > nbest.out
 $MRT_TOOLS/diff-floats.py nbest.out nbest.expected > nbest.diff
 
 # Exit with success code
diff --git a/tests/decoder/wmt17/test_ende.sh b/tests/decoder/wmt17/test_ende.sh
index d9d61c2..d4e4ea3 100644
--- a/tests/decoder/wmt17/test_ende.sh
+++ b/tests/decoder/wmt17/test_ende.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Test code goes here
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt17_systems/marian.en-de.yml < text.in | tail -n 99 > text.out
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt17_systems/marian.en-de.yml < text.in | tail -n 99 > text.out
 diff text.out text.expected > text.diff
 
 # Exit with success code
diff --git a/tests/decoder/wmt17/test_nbest.sh b/tests/decoder/wmt17/test_nbest.sh
index 43f111a..01bf2da 100644
--- a/tests/decoder/wmt17/test_nbest.sh
+++ b/tests/decoder/wmt17/test_nbest.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Test code goes here
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt17_systems/marian.en-de.yml \
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt17_systems/marian.en-de.yml \
   -b 5 --n-best --normalize < text.in | tail -n +6 > nbest.out
 
 # Compare n-best lists
diff --git a/tests/models/wmt16-ende/test_translation_b6n.sh b/tests/models/wmt16-ende/test_translation_b6n.sh
index c013c34..e8e488b 100644
--- a/tests/models/wmt16-ende/test_translation_b6n.sh
+++ b/tests/models/wmt16-ende/test_translation_b6n.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Run Marian
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -b 6 -n 1.0 < text.b6n.in > marian.b6n.out
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_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/wmt16-ende/test_translation_b6n_batch32.sh b/tests/models/wmt16-ende/test_translation_b6n_batch32.sh
index 98ad724..9c4c769 100644
--- a/tests/models/wmt16-ende/test_translation_b6n_batch32.sh
+++ b/tests/models/wmt16-ende/test_translation_b6n_batch32.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Run Marian
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -b 6 -n 1.0 \
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_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
 
diff --git a/tests/models/wmt16-ende/test_translation_b6n_batch64.sh b/tests/models/wmt16-ende/test_translation_b6n_batch64.sh
index 9f33abf..ab71305 100644
--- a/tests/models/wmt16-ende/test_translation_b6n_batch64.sh
+++ b/tests/models/wmt16-ende/test_translation_b6n_batch64.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Run Marian
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -b 6 -n 1.0 \
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -b 6 -n 1.0 \
     --mini-batch 64 --maxi-batch 10 --maxi-batch-sort src -w 2500 \
     < text.b6n.in > marian.batch64.out
 
diff --git a/tests/scorer/scores/test_compare_with_decoder_scores.sh b/tests/scorer/scores/test_compare_with_decoder_scores.sh
index df6283c..a2e74d1 100644
--- a/tests/scorer/scores/test_compare_with_decoder_scores.sh
+++ b/tests/scorer/scores/test_compare_with_decoder_scores.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Translate with s2s
-$MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml \
+$MRT_RUN_MARIAN_DECODER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml \
   -b 12 --n-best < text.in > nbest.out
 
 # Compare translations
@@ -16,7 +16,7 @@ cat text.in | perl -ne 'for$i(1..12){print}' > compare.src
 cat nbest.out | sed 's/ ||| /\t/g' | cut -f2 > compare.trg
 
 # Run rescorer
-$MRT_MARIAN/build/marian-scorer -c $MRT_MODELS/wmt16_systems/marian.en-de.yml \
+$MRT_RUN_MARIAN_SCORER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml \
   -m $MRT_MODELS/wmt16_systems/en-de/model.npz \
   -t $(pwd)/compare.src $(pwd)/compare.trg > compare.scorer.out
 
diff --git a/tests/scorer/scores/test_scores.sh b/tests/scorer/scores/test_scores.sh
index b026509..af90541 100644
--- a/tests/scorer/scores/test_scores.sh
+++ b/tests/scorer/scores/test_scores.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Run scorer
-$MRT_MARIAN/build/marian-scorer -c $MRT_MODELS/wmt16_systems/marian.en-de.yml \
+$MRT_RUN_MARIAN_SCORER -c $MRT_MODELS/wmt16_systems/marian.en-de.yml \
   -m $MRT_MODELS/wmt16_systems/en-de/model.npz \
   -t $(pwd)/scores.src.in $(pwd)/scores.trg.in > scores.out
 
diff --git a/tests/training/basic/test_toy_vocab.sh b/tests/training/basic/test_toy_vocab.sh
index be4e7ce..8d53e4c 100644
--- a/tests/training/basic/test_toy_vocab.sh
+++ b/tests/training/basic/test_toy_vocab.sh
@@ -7,7 +7,7 @@ set -e
 mkdir -p toy
 rm -f toy/* toy.log
 
-$MRT_MARIAN/build/marian \
+$MRT_RUN_MARIAN \
     -m toy/model.npz \
     -t $MRT_DATA/europarl.de-en/toy.bpe.en $MRT_DATA/europarl.de-en/toy.bpe.de \
     -v toy/vocab.en.yml toy/vocab.de.yml \
diff --git a/tests/training/basic/test_translation_script.sh b/tests/training/basic/test_translation_script.sh
index 1249e25..d3257d3 100644
--- a/tests/training/basic/test_translation_script.sh
+++ b/tests/training/basic/test_translation_script.sh
@@ -7,7 +7,7 @@ set -e
 rm -rf trans trans.log trans_script.temp
 mkdir -p trans
 
-$MRT_MARIAN/build/marian \
+$MRT_RUN_MARIAN \
     --no-shuffle \
     -m trans/model.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.en $MRT_DATA/europarl.de-en/corpus.bpe.de \
diff --git a/tests/training/basic/test_valid_script.sh b/tests/training/basic/test_valid_script.sh
index ff3492d..a96b1b4 100644
--- a/tests/training/basic/test_valid_script.sh
+++ b/tests/training/basic/test_valid_script.sh
@@ -7,7 +7,7 @@ set -e
 rm -rf valid valid.log valid_script.temp
 mkdir -p valid
 
-$MRT_MARIAN/build/marian \
+$MRT_RUN_MARIAN \
     --no-shuffle \
     -m valid/model.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.en $MRT_DATA/europarl.de-en/corpus.bpe.de \
diff --git a/tests/training/batches/test_mini_batch_fit.sh b/tests/training/batches/test_mini_batch_fit.sh
index 6096bd5..01316e2 100644
--- a/tests/training/batches/test_mini_batch_fit.sh
+++ b/tests/training/batches/test_mini_batch_fit.sh
@@ -7,7 +7,7 @@ set -e
 rm -rf dynamic dynamic.log
 mkdir -p dynamic
 
-$MRT_MARIAN/build/marian \
+$MRT_RUN_MARIAN \
     --no-shuffle \
     -m dynamic/model.npz \
     -t $MRT_DATA/europarl.de-en/corpus.bpe.en $MRT_DATA/europarl.de-en/corpus.bpe.de \
diff --git a/tests/training/multi-gpu/test_async_sgd.sh b/tests/training/multi-gpu/test_async_sgd.sh
index 62c55ee..e2e5722 100644
--- a/tests/training/multi-gpu/test_async_sgd.sh
+++ b/tests/training/multi-gpu/test_async_sgd.sh
@@ -12,7 +12,7 @@ fi
 rm -rf async_sgd async_sgd.log
 mkdir -p async_sgd
 
-$MRT_MARIAN/build/marian \
+$MRT_RUN_MARIAN \
     --no-shuffle --seed 1111 \
     --devices 0 1 \
     -m async_sgd/model.npz \