diff options
| author | Hieu Hoang <hieuhoang@gmail.com> | 2017-11-24 19:29:28 +0300 |
|---|---|---|
| committer | Hieu Hoang <hieuhoang@gmail.com> | 2017-11-24 19:29:28 +0300 |
| commit | e7ae2bee9098f25a0dcf7891c95026f08de3e930 (patch) | |
| tree | e33b7fcf4887152cb114c1ffec08b970c0347c39 | |
| parent | 89ce664765575d816cb3d885def125fe0ea57ee2 (diff) | |
turn marian compilation back onno_thrust
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| m--------- | src/marian | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c54dbef7..3369f9cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,8 @@ include_directories(${amunmt_SOURCE_DIR}) option(CPU "Select to compile with CPU support" ON) option(CUDA "Select to compile CUDA support by default if available" ON) option(FPGA "Select to compile with FPGA support" OFF) -option(MARIAN "Select to compile with Marian library" OFF) -option(MARIAN_LIBRARY_ONLY "Automatically set when building amunmt. Don't touch this." OFF) +option(MARIAN "Select to compile with Marian library" ON) +option(MARIAN_LIBRARY_ONLY "Automatically set when building amunmt. Don't touch this." ON) if(CPU) add_definitions(-DHAS_CPU) diff --git a/src/marian b/src/marian -Subproject 18aca9170051d86ca6119c9ff04c41915a304ba +Subproject c50994d8f3643ce7bea2171445a533b8ac0efd6 |