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

[ROCm/rccl commit: a4ea1fed5b]

projects/rccl/tools/topo_expl/include/utils.h

@@ -17,6 +17,7 @@ struct allGather1Data_t {
 // AllGather3 - begin
 struct ncclGraphInfo {
   int pattern;
+  int nChannels;
   int sameChannels;
   float speedIntra;
   float speedInter;
@@ -25,11 +26,8 @@ struct ncclGraphInfo {
 };
 
 struct allGather3Data_t{
-  int cudaCompCap;
-  int fullCudaCompCap;
-  int nChannels;
+  int collNetSupport;
   int nc;
-  int alltoallDisable;
   struct ncclGraphInfo tree;
   struct ncclGraphInfo ring;
   struct ncclGraphInfo collNet;