Remove references to NVLS functions

[ROCm/rccl commit: 897745a266]
Этот коммит содержится в:
Wenkai Du
2023-05-05 07:55:20 -07:00
родитель 757ce8c554
Коммит a8f43b496c
2 изменённых файлов: 7 добавлений и 1 удалений
+2
Просмотреть файл
@@ -74,8 +74,10 @@ struct ncclTransport {
ncclResult_t ncclTransportP2pConnect(struct ncclComm* comm, int channelId, int nrecv, int* peerRecv, int nsend, int* peerSend, int connIndex);
ncclResult_t ncclTransportP2pSetup(struct ncclComm* comm, struct ncclTopoGraph* graph, int connIndex, int* highestTransportType=NULL);
#if CUDART_VERSION >= 12010
ncclResult_t ncclNvlsSetup(struct ncclComm* comm);
ncclResult_t ncclNvlsFree(struct ncclComm* comm);
#endif
enum { collNetRecv=0, collNetSend=1 };
int ncclTransportCollNetSetup(struct ncclComm* comm, struct ncclTopoGraph* collNetGraph, struct ncclChannel* channel, int masterRank, int masterPeer, int collNetGraphChannelId, int type);
+5 -1
Просмотреть файл
@@ -373,7 +373,9 @@ static ncclResult_t commFree(ncclComm_t comm) {
NCCLCHECK(ncclStrongStreamDestruct(&comm->deviceStream));
}
#if CUDART_VERSION >= 12010
if (comm->nvlsSupport) NCCLCHECK(ncclNvlsFree(comm));
#endif
struct ncclDestructor* dtor = comm->destructorHead;
while (dtor != nullptr) {
@@ -1268,7 +1270,9 @@ static ncclResult_t initTransportsRank(struct ncclComm* comm, ncclUniqueId* comm
// Check if we can setup CollNet
if (comm->collNetSupport > 0) collNetTrySetup(comm, &collNetGraph);
//NCCLCHECKGOTO(ncclNvlsSetup(comm), ret, fail);
#if CUDART_VERSION >= 12010
NCCLCHECKGOTO(ncclNvlsSetup(comm), ret, fail);
#endif
TRACE(NCCL_INIT, "rank %d nranks %d - CONNECTED %d RINGS AND TREES", rank, nranks, comm->nChannels);