diff options
| author | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2018-12-13 00:45:57 +0300 |
|---|---|---|
| committer | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2018-12-13 00:45:57 +0300 |
| commit | 28629ea516bd34752f1b88d90f7f65a6f4f6083b (patch) | |
| tree | 329893e230e8cccc386e0cf7e3962c533b59d056 | |
| parent | 0ae07c5323e5fdba9efa2ae8faaeff9fb170f195 (diff) | |
switch CUDA back on
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | vs/CreateVSProjects.bat | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b77bde27..28e648aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,12 +43,18 @@ if(MSVC) # C4324: 'marian::cpu::int16::`anonymous-namespace'::ScatterPut': structure was padded due to alignment specifier set(DISABLE_GLOBALLY "/wd\"4310\" /wd\"4324\"") - set(INTRINSICS "/arch:AVX512") + set(INTRINSICS "/arch:AVX") + + # Or maybe use these? + # set(INTRINSICS "/arch:AVX2") + # set(INTRINSICS "/arch:AVX512") set(CMAKE_CXX_FLAGS "/EHsc /DWIN32 /D_WINDOWS /DUNICODE /D_UNICODE /D_CRT_NONSTDC_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS ${DISABLE_GLOBALLY}") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /MT /O2 ${INTRINSICS} /Zi /MP /GL /DNDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} /MTd /Od /Ob0 ${INTRINSICS} /RTC1 /Zi /D_DEBUG") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /LTCG:incremental /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT") + + # ignores warning LNK4049: locally defined symbol free imported - this comes from zlib + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /LTCG:incremental /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /ignore:4049") set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG:incremental") find_library(SHLWAPI Shlwapi.lib) diff --git a/vs/CreateVSProjects.bat b/vs/CreateVSProjects.bat index 9ed6540f..fa67a451 100644 --- a/vs/CreateVSProjects.bat +++ b/vs/CreateVSProjects.bat @@ -53,11 +53,11 @@ set CMAKE_OPT=%CMAKE_OPT% -D USE_CUDNN:BOOL=FALSE :: ----- Enable certain options -----
set CMAKE_OPT=%CMAKE_OPT% -D COMPILE_SERVER:BOOL=TRUE
set CMAKE_OPT=%CMAKE_OPT% -D COMPILE_CPU:BOOL=TRUE
-set CMAKE_OPT=%CMAKE_OPT% -D COMPILE_CUDA:BOOL=FALSE
+set CMAKE_OPT=%CMAKE_OPT% -D COMPILE_CUDA:BOOL=TRUE
+set CMAKE_OPT=%CMAKE_OPT% -D USE_SENTENCEPIECE:BOOL=ON
:: ----- Not supported on Windows yet -----
set CMAKE_OPT=%CMAKE_OPT% -D USE_NCCL:BOOL=FALSE
-set CMAKE_OPT=%CMAKE_OPT% -D USE_SENTENCEPIECE:BOOL=ON
echo.
|