[Ready for Review] Better fix for NCCL + sccache (pytorch#8829)

* Better fix for NCCL + sccache * Try to set NUM_JOBS to 1 * Try to fix third_party/nccl/CMakeLists.txt as well * Pass NUM_JOBS to nccl/CMakeLists.txt
kimdwkimdw · Jun 25, 2018 · e31ab99 · e31ab99
1 parent 50410c9
commit e31ab99
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/third_party/nccl/CMakeLists.txt b/third_party/nccl/CMakeLists.txt
@@ -14,7 +14,7 @@ message(STATUS "Set NVCC_GENCODE for building NCCL: ${NVCC_GENCODE}")
 ADD_CUSTOM_COMMAND(
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib/libnccl.so
-   COMMAND env CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR} NVCC=${CUDA_NVCC_EXECUTABLE} BUILDDIR=${CMAKE_CURRENT_BINARY_DIR} NVCC_GENCODE="${NVCC_GENCODE}" make -j `getconf _NPROCESSORS_ONLN`
+   COMMAND env CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR} NVCC=${CUDA_NVCC_EXECUTABLE} BUILDDIR=${CMAKE_CURRENT_BINARY_DIR} NVCC_GENCODE="${NVCC_GENCODE}" make -j${NUM_JOBS}
 )
 
 ADD_CUSTOM_TARGET(nccl ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lib/libnccl.so)

diff --git a/tools/build_pytorch_libs.sh b/tools/build_pytorch_libs.sh
@@ -202,11 +202,6 @@ function path_remove {
 }
 
 function build_nccl() {
-  # FIXME: sccache doesn't work when building NCCL
-  path_remove /opt/cache/bin
-  export CUDA_NVCC_EXECUTABLE_SAVED=$CUDA_NVCC_EXECUTABLE
-  export CUDA_NVCC_EXECUTABLE=$(which nvcc)
-
   mkdir -p build/nccl
   pushd build/nccl
   ${CMAKE_VERSION} ../../nccl -DCMAKE_MODULE_PATH="$BASE_DIR/cmake/Modules_CUDA_fix" \
@@ -216,20 +211,15 @@ function build_nccl() {
               -DCMAKE_C_FLAGS="$C_FLAGS $USER_CFLAGS" \
               -DCMAKE_CXX_FLAGS="$C_FLAGS $CPP_FLAGS $USER_CFLAGS" \
               -DCMAKE_SHARED_LINKER_FLAGS="$USER_LDFLAGS" \
-              -DCMAKE_UTILS_PATH="$BASE_DIR/cmake/public/utils.cmake"
-  ${CMAKE_INSTALL}
+              -DCMAKE_UTILS_PATH="$BASE_DIR/cmake/public/utils.cmake" \
+              -DNUM_JOBS="$NUM_JOBS"
+  ${CMAKE_INSTALL} -j"$NUM_JOBS"
   mkdir -p ${INSTALL_DIR}/lib
   cp "lib/libnccl.so.1" "${INSTALL_DIR}/lib/libnccl.so.1"
   if [ ! -f "${INSTALL_DIR}/lib/libnccl.so" ]; then
     ln -s "${INSTALL_DIR}/lib/libnccl.so.1" "${INSTALL_DIR}/lib/libnccl.so"
   fi
   popd
-
-  # FIXME: sccache doesn't work when building NCCL
-  if [ -n "$CUDA_NVCC_EXECUTABLE_SAVED" ]; then
-    export CUDA_NVCC_EXECUTABLE=$CUDA_NVCC_EXECUTABLE_SAVED
-  fi
-  export PATH=/opt/cache/bin:$PATH
 }
 
 # purposefully not using build() because we need Caffe2 to build the same