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

Revert "Merge pull request #599 from marian-nmt/nccl-unused-function"

Browse Source 
This reverts commit 63272d1bc4, reversing
changes made to 64a67d5fc8.
This commit is contained in:
Marcin Junczys-Dowmunt 2020-02-15 13:47:18 -08:00
parent 63272d1bc4
commit 24df8f1cb8
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/3rd_party/CMakeLists.txt vendored
View File

@ -86,12 +86,6 @@ if(CUDA_FOUND)
if(COMPILE_CUDA_SM70)
set(GENCODE "${GENCODE} -gencode=arch=compute_70,code=sm_70")
endif(COMPILE_CUDA_SM70)
# clang generates a lot of unused function warnings for NCCL
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(NCCL_CXXFLAGS "-Wno-unused-function")
else()
set(NCCL_CXXFLAGS "")
endif()
# install nccl in ${CMAKE_BINARY_DIR}/local similar to /usr/local linux installation
ExternalProject_Add(nccl_install
@ -101,7 +95,7 @@ if(CUDA_FOUND)
BUILD_COMMAND
$(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} CXXFLAGS=${NCCL_CXXFLAGS}
CUDA8_GENCODE=${GENCODE} CXX=${CMAKE_CXX_COMPILER}
INSTALL_COMMAND "")
set_target_properties(nccl PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/local/lib/libnccl_static.a)