Skip to content

Commit bb74f8e

Browse files
authored
ci: fix nccl related build error (#497)
issue: 'nccl.__file__' returns None in new version.
1 parent da969c3 commit bb74f8e

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

cmake/FindNCCL.cmake

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,6 @@ find_path(NCCL_INCLUDE_DIR
2828
)
2929
mark_as_advanced(NCCL_INCLUDE_DIR)
3030

31-
if (USE_STATIC_NCCL)
32-
MESSAGE(STATUS "USE_STATIC_NCCL is set. Linking with static NCCL library.")
33-
SET(NCCL_LIBNAME "nccl_static")
34-
if (NCCL_VERSION) # Prefer the versioned library if a specific NCCL version is specified
35-
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a.${NCCL_VERSION}" ${CMAKE_FIND_LIBRARY_SUFFIXES})
36-
endif()
37-
else()
38-
SET(NCCL_LIBNAME "nccl")
39-
if (NCCL_VERSION) # Prefer the versioned library if a specific NCCL version is specified
40-
set(CMAKE_FIND_LIBRARY_SUFFIXES ".so.${NCCL_VERSION}" ${CMAKE_FIND_LIBRARY_SUFFIXES})
41-
endif()
42-
endif()
43-
4431
# Read version from header
4532
if(EXISTS "${NCCL_INCLUDE_DIR}/nccl.h")
4633
file(READ ${NCCL_INCLUDE_DIR}/nccl.h NCCL_HEADER_CONTENTS)
@@ -67,7 +54,7 @@ if(NCCL_HEADER_CONTENTS)
6754
endif()
6855

6956
find_library(NCCL_LIBRARY
70-
NAMES ${NCCL_LIBNAME}
57+
NAMES nccl
7158
HINTS
7259
$ENV{NCCL_ROOT}
7360
$ENV{CUDA_HOME}

setup.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ def get_torch_root():
2525
return None
2626

2727

28-
def get_nccl_root():
29-
try:
30-
from nvidia import nccl
31-
32-
return str(Path(nccl.__file__).parent)
33-
except ImportError:
34-
return None
35-
36-
3728
def get_cuda_version():
3829
import torch.utils.cpp_extension as torch_cpp_ext
3930

@@ -215,11 +206,6 @@ def build_extension(self, ext: CMakeExtension):
215206
)
216207
env["LIBTORCH_ROOT"] = LIBTORCH_ROOT
217208

218-
NCCL_ROOT = get_nccl_root()
219-
if NCCL_ROOT is not None:
220-
env["NCCL_ROOT"] = NCCL_ROOT
221-
env["NCCL_VERSION"] = "2"
222-
223209
# print cmake args
224210
print("CMake Args: ", cmake_args)
225211
print("Env: ", env)

0 commit comments

Comments
 (0)