diff options
author | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2017-03-23 21:25:16 +0300 |
---|---|---|
committer | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2017-03-23 21:25:16 +0300 |
commit | 7114b22d9d48380ba01008a0b1c6827a57cc259d (patch) | |
tree | 6b39f73f6547c5e3501573ba6711d082ac22f11c | |
parent | c73e09a31b481837aed2443835cfccf0975893ea (diff) | |
parent | 73268536ba37ab9d525b3e4fa2977f7a3d6d1a55 (diff) |
Merge branch 'master' into marian-integration
-rw-r--r-- | README.md | 10 | ||||
-rw-r--r-- | contrib/notebooks/bahdanau.ipynb (renamed from notebooks/bahdanau.ipynb) | 0 | ||||
-rw-r--r-- | contrib/notebooks/dl4mt.ipynb (renamed from notebooks/dl4mt.ipynb) | 0 | ||||
-rw-r--r-- | contrib/paper/IEEEtran.bst (renamed from paper/IEEEtran.bst) | 0 | ||||
-rw-r--r-- | contrib/paper/amunmt.tex (renamed from paper/amunmt.tex) | 0 | ||||
-rw-r--r-- | contrib/paper/amunmt_anon.tex (renamed from paper/amunmt_anon.tex) | 0 | ||||
-rw-r--r-- | contrib/paper/amunmt_arxiv.tex (renamed from paper/amunmt_arxiv.tex) | 0 | ||||
-rw-r--r-- | contrib/paper/compare.dat (renamed from paper/compare.dat) | 0 | ||||
-rw-r--r-- | contrib/paper/compare2.dat (renamed from paper/compare2.dat) | 0 | ||||
-rw-r--r-- | contrib/paper/hiero.dat (renamed from paper/hiero.dat) | 0 | ||||
-rw-r--r-- | contrib/paper/iwslt15.sty (renamed from paper/iwslt15.sty) | 0 | ||||
-rw-r--r-- | contrib/paper/references.bib (renamed from paper/references.bib) | 0 | ||||
-rwxr-xr-x | src/python/amunmt.cpp | 1 |
13 files changed, 3 insertions, 8 deletions
@@ -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"); } |