Merge branch 'marian-integration' of http://github.com/amunmt/amunmt into marian-integration

This commit is contained in:
Ulrich Germann 2017-03-22 01:24:03 +00:00
commit 86e323305d
2 changed files with 10 additions and 1 deletions

View File

@ -33,6 +33,15 @@ The CPU-only version will automatically be compiled if CUDA cannot be detected b
* CMake 3.5.1
* The CPU version should be a lot more forgiving concerning GCC/G++ or Boost versions.
## Git repository set-up (branch marian-integration only)
Branch _marian-integration_ now contains marian as a sub-module.
After the initial clone or checkout of this branch, run the following command
```bash
git submodule update --init --recursive
```
If you want git to always update the submodules at git checkout, git pull, git merge, etc. (it won't by default, wich often causes confusion), copy the script ```git-hooks/post-rewrite``` into ```./git/hooks``` and make it executable.
## Compilation
The project is a standard Cmake out-of-source build:

2
marian

@ -1 +1 @@
Subproject commit 097a40a8404f6061545c76db846e1d6bf1c35ed3
Subproject commit 9fc7df1576bc869a6dc6a5e795e71bbec77cb29a