Merge remote-tracking branch 'nccl/master' into v2.6.4_merge

[ROCm/rccl commit: fa36fd9ef9]
This commit is contained in:
Wenkai Du committed 2020-04-01 13:35:12 -07:00
commit 4aeb7f041e
53 files changed
+3811 -1517

No files matched your search

+4 -2
View File
@@ -1,5 +1,5 @@
/*************************************************************************
* Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2016-2020, NVIDIA CORPORATION. All rights reserved.
*
* See LICENSE.txt for license information
************************************************************************/
@@ -14,7 +14,7 @@ int ncclCudaCompCap();
// PCI Bus ID <-> int64 conversion functions
ncclResult_t int64ToBusId(int64_t id, char* busId);
ncclResult_t busIdToInt64(char* busId, int64_t* id);
ncclResult_t busIdToInt64(const char* busId, int64_t* id);
ncclResult_t getBusId(int cudaDev, int64_t *busId);
@@ -37,4 +37,6 @@ static long log2i(long n) {
return l;
}
int busIdToCudaDev(int64_t busId);
#endif