Skip to content

build rccl module only when USE_RCCL is ON #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

build rccl module only when USE_RCCL is ON #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16aad4d
fix ROCM_PATH check in cmake
minsii Apr 14, 2022
ac6d1b8
build rccl module only when USE_RCCL is ON
minsii Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cmake/Modules/Findrccl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
# The path hints include CUDA_TOOLKIT_ROOT_DIR seeing as some folks
# install RCCL in the same location as the CUDA toolkit.
# See https://github.com/caffe2/caffe2/issues/1601

if($ENV{ROCM_PATH})
if(DEFINED ENV{ROCM_PATH})
set(RCCL_ROOT_DIR $ENV{ROCM_PATH} CACHE PATH "Folder contains AMD RCCL")
else()
set(RCCL_ROOT_DIR "/opt/rocm")
Expand All @@ -26,7 +25,7 @@ find_path(RCCL_INCLUDE_DIR
${RCCL_INCLUDE_DIR}
${RCCL_ROOT_DIR}/include)

if ($ENV{USE_STATIC_RCCL})
if (DEFINED ENV{USE_STATIC_RCCL})
message(STATUS "USE_STATIC_RCCL detected. Linking against static RCCL library")
set(RCCL_LIBNAME "librccl_static.a")
else()
Expand Down
2 changes: 0 additions & 2 deletions gloo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,10 @@ if(USE_ROCM)
file(GLOB GLOO_HIP_SRCS
"${HIPIFY_OUTPUT_DIR}/hip*.cc"
"${HIPIFY_OUTPUT_DIR}/hip*.hip"
"${HIPIFY_OUTPUT_DIR}/nccl/nccl.hip"
)

file(GLOB GLOO_HIP_HDRS
"${HIPIFY_OUTPUT_DIR}/hip*.h"
"${HIPIFY_OUTPUT_DIR}/nccl/nccl.h"
)
endif()

Expand Down
41 changes: 29 additions & 12 deletions gloo/nccl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
set(GLOO_NCCL_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/nccl.cu"
)

set(GLOO_NCCL_HDRS
"${CMAKE_CURRENT_SOURCE_DIR}/nccl.h"
)

list(APPEND GLOO_CUDA_SRCS ${GLOO_NCCL_SRCS})
list(APPEND GLOO_CUDA_HDRS ${GLOO_NCCL_HDRS})
set(GLOO_CUDA_SRCS ${GLOO_CUDA_SRCS} PARENT_SCOPE)
set(GLOO_CUDA_HDRS ${GLOO_CUDA_HDRS} PARENT_SCOPE)
if(USE_CUDA)
set(GLOO_NCCL_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/nccl.cu"
)

set(GLOO_NCCL_HDRS
"${CMAKE_CURRENT_SOURCE_DIR}/nccl.h"
)

list(APPEND GLOO_CUDA_SRCS ${GLOO_NCCL_SRCS})
list(APPEND GLOO_CUDA_HDRS ${GLOO_NCCL_HDRS})
set(GLOO_CUDA_SRCS ${GLOO_CUDA_SRCS} PARENT_SCOPE)
set(GLOO_CUDA_HDRS ${GLOO_CUDA_HDRS} PARENT_SCOPE)
endif()

if(USE_ROCM)
set(GLOO_NCCL_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/nccl.hip"
)

set(GLOO_NCCL_HDRS
"${CMAKE_CURRENT_SOURCE_DIR}/nccl.h"
)

list(APPEND GLOO_HIP_SRCS ${GLOO_NCCL_SRCS})
list(APPEND GLOO_HIP_HDRS ${GLOO_NCCL_HDRS})
set(GLOO_HIP_SRCS ${GLOO_HIP_SRCS} PARENT_SCOPE)
set(GLOO_HIP_HDRS ${GLOO_HIP_HDRS} PARENT_SCOPE)
endif()