diff options
| author | Roman Grundkiewicz <rogrundk@microsoft.com> | 2021-03-19 11:27:34 +0300 |
|---|---|---|
| committer | Roman Grundkiewicz <rogrundk@microsoft.com> | 2021-03-19 11:27:34 +0300 |
| commit | 326b9400e9b4dfa6bbf445e4cbbc83ea5145b6b7 (patch) | |
| tree | 2b27dd5c92d6595d05723d1b40a9871b200f5c8e /src | |
| parent | 272096c1d188dcd0ec33ba349bab5955c497876a (diff) | |
Merged PR 18232: Update VS CMake builds and scripts
This PR updates Windows build using Visual Studio CMake compilation with Ninja. It does not affect standard VS compilation or Windows builds on Azure/GitHub CI.
List of changes:
- Fixed syntax in the script installing dependencies via vcpkg.
- Removed installation of Protobuf (already included as a submodule) and Boost 1.72 (the previous solution no longer works with new vcpkg).
- Disabled compilation of marian-server in the default setting due to Boost issues.
- Disabled compilation of NCCL in the default setting due to an error (see comment in the code).
- Updated vs/README.
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rd_party/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index c1d7c52f..2bef3129 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -183,6 +183,10 @@ if(CUDA_FOUND) BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nccl CONFIGURE_COMMAND "" BUILD_COMMAND + # Note: $(MAKE) here causes CMake cache generation via Ninja failing (Windows build with + # CMake only) because Ninja complains about unescaped $ signs. This happens only if + # COMPILE_CUDA=on and because of that, USE_NCCL=off is used in CMakeSettings.json for now. + # @TODO: find proper escaping that works for MSVC builds. "\$(MAKE)" -f ${CMAKE_CURRENT_SOURCE_DIR}/nccl/Makefile src.build BUILDDIR=${CMAKE_BINARY_DIR}/local CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR} CUDA8_GENCODE=${GENCODE} CXX=${CMAKE_CXX_COMPILER} CXX_FLAGS=${NCCL_FLAGS} |