frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

CMake support for Gloo dependency

Browse Source 
Summary:
This also requires a change to cmake/External/nccl.cmake to use the
static NCCL binary instead of the shared object. When the Caffe2/Gloo
build uses the bundled NCCL version it should be packaged up in the
resulting libraries and not cause another runtime dependency on a
library that has to be installed separately.
Closes https://github.com/caffe2/caffe2/pull/218

Differential Revision: D4769926

Pulled By: pietern

fbshipit-source-id: 5c85559992c200d874f4218724823815ffb5adb5
This commit is contained in:
Pieter Noordhuis
2017-03-24 08:19:13 -07:00
committed by Facebook Github Bot
parent 97a6400f03
commit d5880b128e
7 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmake/Dependencies.cmake
View File

@ -292,3 +292,30 @@ if(USE_CNMEM)
add_definitions(-DCAFFE2_USE_CNMEM)
endif()
endif()
if(USE_GLOO)
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
message(WARNING "Gloo can only be used on Linux.")
set(USE_GLOO OFF)
else()
set(GLOO_INSTALL OFF CACHE BOOL "" FORCE)
set(GLOO_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE)
# Temporarily override variables to avoid building Gloo tests/benchmarks
set(__BUILD_TEST ${BUILD_TEST})
set(__BUILD_BENCHMARK ${BUILD_BENCHMARK})
set(BUILD_TEST OFF)
set(BUILD_BENCHMARK OFF)
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/gloo)
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/gloo)
set(BUILD_TEST ${__BUILD_TEST})
set(BUILD_BENCHMARK ${__BUILD_BENCHMARK})
# Pick the right dependency depending on USE_CUDA
if(NOT USE_CUDA)
list(APPEND Caffe2_DEPENDENCY_LIBS gloo)
else()
list(APPEND Caffe2_DEPENDENCY_LIBS gloo_cuda)
endif()
endif()
endif()

2
cmake/External/nccl.cmake vendored
View File

@ -28,7 +28,7 @@ if (NOT __NCCL_INCLUDED)
set(NCCL_FOUND TRUE)
set(NCCL_INCLUDE_DIRS ${nccl_PREFIX}/build/include)
set(NCCL_LIBRARIES ${nccl_PREFIX}/build/lib/libnccl.so)
set(NCCL_LIBRARIES ${nccl_PREFIX}/build/lib/libnccl_static.a)
set(NCCL_LIBRARY_DIRS ${nccl_PREFIX}/build/lib)
set(NCCL_EXTERNAL TRUE)

2
cmake/Summary.cmake
View File

@ -1,4 +1,3 @@
# Prints accumulated Caffe2 configuration summary
function (Caffe2_print_configuration_summary)
@ -76,5 +75,6 @@ function (Caffe2_print_configuration_summary)
message(STATUS " USE_NNPACK : ${USE_NNPACK}")
message(STATUS " USE_OPENMP : ${USE_OPENMP}")
message(STATUS " USE_REDIS : ${USE_REDIS}")
message(STATUS " USE_GLOO : ${USE_GLOO}")
endfunction()