From 24df8f1cb8c366aa9d846ceba69e27a456c0002d Mon Sep 17 00:00:00 2001 From: Marcin Junczys-Dowmunt Date: Sat, 15 Feb 2020 13:47:18 -0800 Subject: [PATCH] Revert "Merge pull request #599 from marian-nmt/nccl-unused-function" This reverts commit 63272d1bc4275c3ea7282ac0d02caa995dd63b9e, reversing changes made to 64a67d5fc8f4e760f05a68b1db23df30dafd08fd. --- src/3rd_party/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index 1952dd755..e100a6198 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -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)