Skip to content

Commit

Permalink
Revert "Merge pull request #599 from marian-nmt/nccl-unused-function"
Browse files Browse the repository at this point in the history
This reverts commit 63272d1, reversing
changes made to 64a67d5.
  • Loading branch information
emjotde committed Feb 15, 2020
1 parent 63272d1 commit 24df8f1
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/3rd_party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 24df8f1

Please sign in to comment.