AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nccl/master' into HEAD

Browse Source 
[ROCm/rccl-tests commit: 5361dd8177]
This commit is contained in:
Wenkai Du
2020-07-06 17:53:09 +00:00
parent 0b235b136a f35cba73c8
commit 075041a9fa
6 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rccl-tests/src/all_gather.cu
+2 -2
View File
@@ -49,10 +49,10 @@ testResult_t AllGatherInitData(struct threadArgs* args, ncclDataType_t type, ncc
}
void AllGatherGetBw(size_t count, int typesize, double sec, double* algBw, double* busBw, int nranks) {
double baseBw = (double)(count * typesize * (nranks - 1)) / 1.0E9 / sec;
double baseBw = (double)(count * typesize * nranks) / 1.0E9 / sec;
*algBw = baseBw;
double factor = 1;
double factor = ((double)(nranks - 1))/((double)nranks);
*busBw = baseBw * factor;
}
projects/rccl-tests/src/alltoall.cu
+5 -3
View File
@@ -67,7 +67,10 @@ testResult_t AlltoAllRunColl(void* sendbuff, void* recvbuff, size_t count, ncclD
size_t rankOffset = count * wordSize(type);
if (count == 0) return testSuccess;
#if NCCL_MAJOR >= 2 && NCCL_MINOR >= 7
#if NCCL_MAJOR < 2 || NCCL_MINOR < 7
printf("NCCL 2.7 or later is needed for alltoall. This test was compiled with %d.%d.\n", NCCL_MAJOR, NCCL_MINOR);
return testNcclError;
#else
#if defined(RCCL_GATHER_SCATTER) && defined(USE_RCCL_GATHER_SCATTER)
NCCLCHECK(ncclAllToAll(sendbuff, recvbuff, count, type, comm, stream));
#else
@@ -78,9 +81,8 @@ testResult_t AlltoAllRunColl(void* sendbuff, void* recvbuff, size_t count, ncclD
}
NCCLCHECK(ncclGroupEnd());
#endif
#endif
return testSuccess;
#endif
}
struct testColl alltoAllTest = {
projects/rccl-tests/src/common.cu
+2 -2
View File
@@ -352,9 +352,9 @@ testResult_t CheckData(struct threadArgs* args, ncclDataType_t type, ncclRedOp_t
printf("%d:%d ", j, dataHost[j]);
}
printf("\n");
free(dataHost);
free(expectedHost);
//}
free(dataHost);
}
#endif
}
double nranks = args->nProcs*args->nThreads*args->nGpus;
projects/rccl-tests/src/reduce_scatter.cu
+2 -2
View File
@@ -48,10 +48,10 @@ testResult_t ReduceScatterInitData(struct threadArgs* args, ncclDataType_t type,
}
void ReduceScatterGetBw(size_t count, int typesize, double sec, double* algBw, double* busBw, int nranks) {
double baseBw = (double)(count * typesize * (nranks - 1)) / 1.0E9 / sec;
double baseBw = (double)(count * typesize * nranks) / 1.0E9 / sec;
*algBw = baseBw;
double factor = 1;
double factor = ((double)(nranks - 1))/((double)nranks);
*busBw = baseBw * factor;
}