Skip to content

Commit af2098b

Browse files
authored
NCCL fixes (#592)
* Fix an allgather bug * Fix the `nccl.h` installation path (now goes under `mscclpp/`)
1 parent aa28b06 commit af2098b

File tree

6 files changed

+4
-136
lines changed

6 files changed

+4
-136
lines changed

apps/nccl/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT license.
33

44
file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*)
5-
file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS include/nccl.h)
5+
file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS include/*.h)
66

77
if(MSCCLPP_USE_ROCM)
88
set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
@@ -30,12 +30,8 @@ target_link_libraries(mscclpp_nccl_static PUBLIC mscclpp_obj mscclpp_nccl_obj)
3030
set_target_properties(mscclpp_nccl_static PROPERTIES VERSION ${MSCCLPP_VERSION} SOVERSION ${MSCCLPP_SOVERSION})
3131

3232
install(TARGETS mscclpp_nccl_obj
33-
FILE_SET HEADERS DESTINATION ${INSTALL_PREFIX}/include)
33+
FILE_SET HEADERS DESTINATION ${INSTALL_PREFIX})
3434
install(TARGETS mscclpp_nccl
3535
LIBRARY DESTINATION ${INSTALL_PREFIX}/lib)
3636
install(TARGETS mscclpp_nccl_static
3737
ARCHIVE DESTINATION ${INSTALL_PREFIX}/lib)
38-
39-
if(MSCCLPP_BUILD_TESTS)
40-
add_subdirectory(test)
41-
endif()
File renamed without changes.

apps/nccl/src/allgather.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ __global__ void __launch_bounds__(1024, 1)
104104
deviceSyncer.sync(gridDim.x);
105105

106106
if (threadIdx.x < nPeer) {
107-
memChans[threadIdx.x].relaxedSignal();
107+
memChans[threadIdx.x].signal();
108108
memChans[threadIdx.x].wait();
109109
}
110110
}

apps/nccl/src/nccl.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
#include <mscclpp/npkit/npkit.hpp>
2121
#endif
2222
#include <dlfcn.h>
23+
#include <mscclpp/nccl.h>
2324

2425
#include "allgather.hpp"
2526
#include "allreduce.hpp"
2627
#include "broadcast.hpp"
2728
#include "debug.h"
28-
#include "nccl.h"
2929

3030
#define NCCL_API extern "C" __attribute__((visibility("default")))
3131

apps/nccl/test/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

apps/nccl/test/nccl_api_test.cc

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)