Merge remote-tracking branch 'isi-nlp/master'

# Conflicts:
#	.gitignore
#	executable/ZOPH_RNN_XING
#	src/decoder_model_wrapper.h
#	src/decoder_model_wrapper.hpp
#	src/ensemble_factory.hpp

Author: shixing

.gitignore

@@ -5,3 +5,5 @@
 *[#]
 
 *pyc
+.history
+

README_XING.md

@@ -15,10 +15,10 @@ All the following papers are based on this code:
 The source code is provided in `src/` directory. You can compile the code into a standalone executable by:
 
 ```
-bash script/compile.xing.sh
+bash scripts/compile.xing.sh
 ```
 
-The executable `ZOPH_RNN_XING` will appear in the root folder. An pre-compiled executable `ZOPH_RNN_XING` is in folder `executable\`.
+The executable `ZOPH_RNN_XING` will appear in the root folder. A pre-compiled executable `ZOPH_RNN_XING` is in folder `executable\`.
 
 You should set the 7 environment variables and have the required libraries mentioned in `README.md` before compilation.
 Two additional requirements:

executable/ZOPH_RNN_XING

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7528806c908a31c36956112822036ee93322e4c8581e2b3218bb2f4cc76bb444
-size 126230008
+oid sha256:9331caaa8c6bf6ac7eb07a2d59e0706ad70f610ead632953de49015229cb0b57
+size 269

scripts/compile.xing.sh

@@ -23,7 +23,7 @@ PATH_TO_CUDNN_V4_64=${PATH_TO_CUDNN_V4_64:-"/home/nlg-05/zoph/cudnn_v4/lib64/"}
 PATH_TO_EIGEN=${PATH_TO_EIGEN:-"/home/nlg-05/zoph/eigen/"}
 PATH_TO_CUDNN_INCLUDE=${PATH_TO_CUDNN_INCLUDE:-"/home/nlg-05/zoph/cudnn_v4/include/"}
 
-#complie
+#compile
 
 #-DTIMER_DEBUG
 nvcc -DCUDNN_STATIC -O3 -arch=sm_35 \

scripts/translate/f2e_decode.sh

@@ -1,9 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #PBS -q isi
 #PBS -l walltime=1:00:00
 #PBS -l gpus=2
 
-ROOT=../../ # change your ROOT to some absolute path
+SCRIPTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+ROOT=$SCRIPTDIR/../../
 
 EXEC=$ROOT/executable/ZOPH_RNN_XING
 
@@ -33,7 +34,7 @@ FR_TRN=$data_folder/train_french.txt.tok.lc.10k
 # output
 
 output_folder=$ROOT/scripts/translate/Fre_Eng_lc_d_att/decode
-mkdir $output_folder
+mkdir -p $output_folder
 
 id=FE
 LOG=$output_folder/${id}.log
@@ -45,7 +46,7 @@ BLEU=$output_folder/${id}.bleu
 
 cd $output_folder
 
-$EXEC --decode-main-data-files $SRC_TST -b 12 -L 100 -k 1 $fe_nn_attention $OUTPUT  > $LOG
+$EXEC --decode-main-data-files $SRC_TST -b 12 -L 100 -k 1 $fe_nn_attention $OUTPUT --logfile $LOG
 
 # calculate BLEU
 

scripts/translate/f2e_train.sh

@@ -1,12 +1,17 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #PBS -q isi80
 #PBS -l walltime=300:00:00
 #PBS -l gpus=4
 
-ROOT=../../ # change your ROOT to some absolute path
+SCRIPTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+ROOT=$SCRIPTDIR/../../
 
 EXEC=$ROOT/executable/ZOPH_RNN_XING
 
+echo "$EXEC -h";
+
+$EXEC -h
+
 # script
 
 PY_FORMAT=$ROOT/scripts/bleu_format_valid.py
@@ -15,8 +20,9 @@ PERL_BLEU=$ROOT/scripts/multi-bleu.perl
 # model
 
 model_dir=$ROOT/scripts/translate/Fre_Eng_lc_d_att/
-mkdir $model_dir
+mkdir -p $model_dir
 fe_nn_attention=$model_dir/best.nn
+model=$model_dir/model.nn
 
 # data
 
@@ -32,7 +38,7 @@ EN_TRN=$data_folder/train_english.txt.tok.lc.10k
 FR_TRN=$data_folder/train_french.txt.tok.lc.10k
 
 # train
+LOG=$model_dir/train.log
 
-cd $model_dir
 
-$EXEC --logfile HPC_OUTPUT_NEW.txt -B best.nn --screen-print-rate 300 -N 2 -M 0 1 2 --attention-model true --feed-input true -H 1000 -a $FR_DEV $EN_DEV -t $FR_TRN $EN_TRN model.nn -v 200000 -V 40000 -L 100 -n 8 -A 1 --fixed-halve-lr 6 -l 0.35 -d 0.8 -m 128 -w 5
+$EXEC --logfile $LOG -B $fe_nn_attention --screen-print-rate 300 -N 2 -M 0 1 2 --attention-model true --feed-input true -H 1000 -a $FR_DEV $EN_DEV -t $FR_TRN $EN_TRN $model -v 200000 -V 40000 -L 100 -n 8 -A 1 --fixed-halve-lr 6 -l 0.35 -d 0.8 -m 128 -w 5