[build] Remove /torch/lib/THD/cmake in favor of /cmake (#7159)
* Remove /torch/lib/THD/cmake in favor of /cmake
* path fix
* Explicitly marking gloo to use cuda
* Fix gloo path in THD
diff --git a/torch/lib/THD/CMakeLists.txt b/torch/lib/THD/CMakeLists.txt
index a5536ce..93cdd01 100644
--- a/torch/lib/THD/CMakeLists.txt
+++ b/torch/lib/THD/CMakeLists.txt
@@ -1,5 +1,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+# TODO(jiayq): once we have unified CMake entry, remove this module path.
+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/Modules ${CMAKE_MODULE_PATH})
+SET(Gloo_USE_CUDA TRUE)
################################################################################
# Helper functions
@@ -168,7 +170,8 @@
IF(GLOO_FOUND)
INCLUDE_DIRECTORIES(${GLOO_INCLUDE_DIR})
- FILE(APPEND "${CMAKE_INSTALL_PREFIX}/THD_deps.txt" "${GLOO_LIBRARIES};")
+ FILE(APPEND "${CMAKE_INSTALL_PREFIX}/THD_deps.txt" "${Gloo_LIBRARY};")
+ FILE(APPEND "${CMAKE_INSTALL_PREFIX}/THD_deps.txt" "${Gloo_NATIVE_LIBRARY};")
ENDIF()
# Test executables
diff --git a/torch/lib/THD/cmake/FindGloo.cmake b/torch/lib/THD/cmake/FindGloo.cmake
deleted file mode 100644
index 0af0011..0000000
--- a/torch/lib/THD/cmake/FindGloo.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-IF(NOT GLOO_FOUND)
-
-include(FindPackageHandleStandardArgs)
-
-SET(GLOO_LIBRARIES)
-SET(GLOO_INCLUDE_DIR)
-
-FIND_LIBRARY(GLOO_HOST_LIBRARIES gloo)
-FIND_LIBRARY(GLOO_CUDA_LIBRARIES gloo_cuda)
-FIND_PATH(GLOO_INCLUDE_DIR gloo)
-SET(GLOO_LIBRARIES ${GLOO_HOST_LIBRARIES} ${GLOO_CUDA_LIBRARIES})
-
-IF (GLOO_LIBRARIES)
- SET(GLOO_FOUND TRUE)
-ELSE (GLOO_LIBRARIES)
- SET(GLOO_FOUND FALSE)
-ENDIF (GLOO_LIBRARIES)
-
-MESSAGE(STATUS "Found Gloo: ${GLOO_FOUND}")
-
-ENDIF(NOT GLOO_FOUND)
-
diff --git a/torch/lib/THD/cmake/FindNCCL.cmake b/torch/lib/THD/cmake/FindNCCL.cmake
deleted file mode 100644
index eee0dc1..0000000
--- a/torch/lib/THD/cmake/FindNCCL.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Try to find NCCL
-#
-# The following variables are optionally searched for defaults
-# NCCL_ROOT_DIR: Base directory where all NCCL components are found
-#
-# The following are set after configuration is done:
-# NCCL_FOUND
-# NCCL_INCLUDE_DIRS
-# NCCL_LIBRARIES
-
-set (NCCL_ROOT_DIR $ENV{NCCL_ROOT_DIR})
-
-find_path (NCCL_INCLUDE_DIR
- NAMES nccl.h
- HINTS
- ${NCCL_ROOT_DIR}
- ${NCCL_ROOT_DIR}/include)
-
-IF ($ENV{USE_STATIC_NCCL})
- MESSAGE(STATUS "USE_STATIC_NCCL detected. Linking against static NCCL library")
- SET(NCCL_LIBNAME "libnccl_static.a")
-ELSE()
- SET(NCCL_LIBNAME "nccl")
-ENDIF()
-
-find_library (NCCL_LIBRARY
- NAMES ${NCCL_LIBNAME}
- HINTS
- ${NCCL_ROOT_DIR}
- ${NCCL_ROOT_DIR}/lib
- ${NCCL_ROOT_DIR}/lib/x86_64-linux-gnu
- ${NCCL_ROOT_DIR}/lib64)
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (NCCL DEFAULT_MSG NCCL_INCLUDE_DIR NCCL_LIBRARY)
-
-if (NCCL_FOUND)
- set (NCCL_HEADER_FILE "${NCCL_INCLUDE_DIR}/nccl.h")
- message (STATUS "Determining NCCL version from the header file: ${NCCL_HEADER_FILE}")
- file (STRINGS ${NCCL_HEADER_FILE} NCCL_MAJOR_VERSION_DEFINED
- REGEX "^[ \t]*#define[ \t]+NCCL_MAJOR[ \t]+[0-9]+.*$" LIMIT_COUNT 1)
- if (NCCL_MAJOR_VERSION_DEFINED)
- string (REGEX REPLACE "^[ \t]*#define[ \t]+NCCL_MAJOR[ \t]+" ""
- NCCL_MAJOR_VERSION ${NCCL_MAJOR_VERSION_DEFINED})
- message (STATUS "NCCL_MAJOR_VERSION: ${NCCL_MAJOR_VERSION}")
- endif ()
- set (NCCL_INCLUDE_DIRS ${NCCL_INCLUDE_DIR})
- set (NCCL_LIBRARIES ${NCCL_LIBRARY})
- message (STATUS "Found NCCL (include: ${NCCL_INCLUDE_DIRS}, library: ${NCCL_LIBRARIES})")
- mark_as_advanced (NCCL_ROOT_DIR NCCL_INCLUDE_DIRS NCCL_LIBRARIES)
-endif ()
