marian-nmt/marian
1
1
Fork 0
mirror of https://github.com/marian-nmt/marian.git synced 2024-09-17 09:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix CUDA+MSVC incompatibility with Boost.Preprocessor

Browse Source
This commit is contained in:
Cédric Rousseau 2018-09-05 15:42:16 +02:00
parent 78dd2a2d59
commit 4fd2360918
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -40,6 +40,7 @@
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"algorithm": "cpp"
"algorithm": "cpp",
"iostream": "cpp"
}
}

6
CMakeLists.txt
View File

@ -74,6 +74,12 @@ if(CUDA_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCUDA_FOUND")
list(APPEND CUDA_NVCC_FLAGS -DCUDA_FOUND; )
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_PP_VARIADICS=0")
list(APPEND CUDA_NVCC_FLAGS -DBOOST_PP_VARIADICS=0; )
endif()
else(CUDA_FOUND)
message(WARNING "Cannot find CUDA compiling CPU version only")
endif(CUDA_FOUND)

10
vs/README.md
View File

@ -72,5 +72,13 @@ This part gives more information on the changes done.
There was preprocessor instructions (`#ifdef ... #else ... #endif`) in the middle of a call of a macro function (`CUDNN_CALL`), which is not allowed with MS compiler.
7. __Fix mismatched class/struct forward declarations__
[Github Link](https://github.com/cedrou/marian-dev/commit/fbb221e995685f9181d00a0861c6eb97d60bcffa)
Microsoft's C++ name mangling makes a distinction between `class` and `struct` objects, so definitions and forward declaration must match.
See [this pdf](https://www.agner.org/optimize/calling_conventions.pdf), page 27, for more information.
See [this pdf](https://www.agner.org/optimize/calling_conventions.pdf), page 27, for more information.
8. __Fix unresolved external due to a removed #include directive__
[Github Link](https://github.com/cedrou/marian-dev/commit/78dd2a2d599fa07cfad35c90464aed5018097eba)
An `#include` directive was specifically removed for MSVC compiler.
9. __Fix CUDA+MSVC incompatibility with Boost.Preprocessor__
The toolchain nvcc+msvc is not correctly handled in Boost.Preprocessor module. See [this issue](https://github.com/boostorg/preprocessor/issues/15). In the meantime, the recommended workaround is to disable Variadic Macro support in Boost.