Merge branch 'master' into marian-integration

13 files changed, 3 insertions, 8 deletions

diff --git a/README.md b/README.md
index 874c3258..31ba30ca 100644
--- a/README.md
+++ b/README.md
@@ -142,11 +142,7 @@ The setting above uses 8 CPU threads and 4 GPU threads (2 GPUs x 2 threads). The
 ## Example usage
 
   * [Data and systems for our winning system in the WMT 2016 Shared Task on Automatic Post-Editing](https://github.com/emjotde/amunmt/wiki/AmuNMT-for-Automatic-Post-Editing)
+  
+## Acknowledgements
 
-<<<<<<< HEAD
-=======
-
-
-
-
->>>>>>> d33c4e0c5cab0f97c2e9061ccb0631d9381a5383
+The development of Amunmt received funding from the European Union's Horizon 2020 Research and Innovation Programme under grant agreements 688139 (SUMMA; 2016-2019) and 645487 (Modern MT; 2015-2017) and the Amazon Academic Research Awards program.
diff --git a/notebooks/bahdanau.ipynb b/contrib/notebooks/bahdanau.ipynb
index ed586740..ed586740 100644
--- a/notebooks/bahdanau.ipynb
+++ b/contrib/notebooks/bahdanau.ipynb
diff --git a/notebooks/dl4mt.ipynb b/contrib/notebooks/dl4mt.ipynb
index 3fef6ef5..3fef6ef5 100644
--- a/notebooks/dl4mt.ipynb
+++ b/contrib/notebooks/dl4mt.ipynb
diff --git a/paper/IEEEtran.bst b/contrib/paper/IEEEtran.bst
index b2c7edc3..b2c7edc3 100644
--- a/paper/IEEEtran.bst
+++ b/contrib/paper/IEEEtran.bst
diff --git a/paper/amunmt.tex b/contrib/paper/amunmt.tex
index 60246af0..60246af0 100644
--- a/paper/amunmt.tex
+++ b/contrib/paper/amunmt.tex
diff --git a/paper/amunmt_anon.tex b/contrib/paper/amunmt_anon.tex
index 0b2c4df2..0b2c4df2 100644
--- a/paper/amunmt_anon.tex
+++ b/contrib/paper/amunmt_anon.tex
diff --git a/paper/amunmt_arxiv.tex b/contrib/paper/amunmt_arxiv.tex
index b507a8da..b507a8da 100644
--- a/paper/amunmt_arxiv.tex
+++ b/contrib/paper/amunmt_arxiv.tex
diff --git a/paper/compare.dat b/contrib/paper/compare.dat
index 4a630ead..4a630ead 100644
--- a/paper/compare.dat
+++ b/contrib/paper/compare.dat
diff --git a/paper/compare2.dat b/contrib/paper/compare2.dat
index 50e09f83..50e09f83 100644
--- a/paper/compare2.dat
+++ b/contrib/paper/compare2.dat
diff --git a/paper/hiero.dat b/contrib/paper/hiero.dat
index d217e232..d217e232 100644
--- a/paper/hiero.dat
+++ b/contrib/paper/hiero.dat
diff --git a/paper/iwslt15.sty b/contrib/paper/iwslt15.sty
index c06e78e7..c06e78e7 100644
--- a/paper/iwslt15.sty
+++ b/contrib/paper/iwslt15.sty
diff --git a/paper/references.bib b/contrib/paper/references.bib
index aaf889e4..aaf889e4 100644
--- a/paper/references.bib
+++ b/contrib/paper/references.bib
diff --git a/src/python/amunmt.cpp b/src/python/amunmt.cpp
index 56aee827..572b98a8 100755
--- a/src/python/amunmt.cpp
+++ b/src/python/amunmt.cpp
@@ -22,7 +22,6 @@ God god_;
 
 void init(const std::string& options) {
   god_.Init(options);
-  size_t totalThreads = god_.Get<size_t>("gpu-threads") + god_.Get<size_t>("cpu-threads");
 }