NCCL 2.26.6-1

Fix profiler_v2 compatibility layer
 * Removing trafficBytes in profiler_v3 breaks casting to ncclProfilerEventDescr_v2_t
   in the compatibility layer for profiler_v2 interface. This patch fixes the issue
   by making the conversion between the two descriptors explicit.

Author: gcongiu

makefiles/version.mk

@@ -1,6 +1,6 @@
 ##### version
 NCCL_MAJOR   := 2
 NCCL_MINOR   := 26
-NCCL_PATCH   := 5
+NCCL_PATCH   := 6
 NCCL_SUFFIX  :=
 PKG_REVISION := 1

src/plugin/profiler/profiler_v2.cc

@@ -12,11 +12,53 @@ static ncclProfiler_t ncclProfiler;
 static ncclProfiler_v2_t* ncclProfiler_v2;
 
 static ncclResult_t ncclProfiler_startEvent(void* context, void** eHandle, ncclProfilerEventDescr_t* eDescr) {
-  if (eDescr->type == ncclProfileKernelCh || eDescr->type == ncclProfileNetPlugin) {
-    *eHandle = NULL;
-    return ncclSuccess;
+  *eHandle = nullptr;
+  ncclProfilerEventDescr_v2_t eDescr_v2 = { };
+  eDescr_v2.type = eDescr->type;
+  eDescr_v2.parentObj = eDescr->parentObj;
+  eDescr_v2.rank = eDescr->rank;
+  switch(eDescr->type) {
+    case ncclProfileGroup: break;
+    case ncclProfileColl: {
+      eDescr_v2.coll.name = eDescr->coll.name;
+      eDescr_v2.coll.commHash = eDescr->coll.commHash;
+      eDescr_v2.coll.seqNumber = eDescr->coll.seqNumber;
+      eDescr_v2.coll.func = eDescr->coll.func;
+      eDescr_v2.coll.sendBuff = eDescr->coll.sendBuff;
+      eDescr_v2.coll.recvBuff = eDescr->coll.recvBuff;
+      eDescr_v2.coll.count = eDescr->coll.count;
+      eDescr_v2.coll.root = eDescr->coll.root;
+      eDescr_v2.coll.datatype = eDescr->coll.datatype;
+      eDescr_v2.coll.trafficBytes = 0; // removed in v3
+      eDescr_v2.coll.nMaxChannels = eDescr->coll.nMaxChannels;
+      eDescr_v2.coll.nWarps = eDescr->coll.nWarps;
+      eDescr_v2.coll.algo = eDescr->coll.algo;
+      eDescr_v2.coll.proto = eDescr->coll.proto;
+    } break;
+    case ncclProfileP2p: {
+      eDescr_v2.p2p.name = eDescr->p2p.name;
+      eDescr_v2.p2p.commHash = eDescr->p2p.commHash;
+      eDescr_v2.p2p.func = eDescr->p2p.func;
+      eDescr_v2.p2p.buff = eDescr->p2p.buff;
+      eDescr_v2.p2p.count = eDescr->p2p.count;
+      eDescr_v2.p2p.datatype = eDescr->p2p.datatype;
+      eDescr_v2.p2p.peer = eDescr->p2p.peer;
+    } break;
+    case ncclProfileProxyOp: {
+      eDescr_v2.proxyOp.pid = eDescr->proxyOp.pid;
+      eDescr_v2.proxyOp.channelId = eDescr->proxyOp.channelId;
+      eDescr_v2.proxyOp.peer = eDescr->proxyOp.peer;
+      eDescr_v2.proxyOp.nSteps = eDescr->proxyOp.nSteps;
+      eDescr_v2.proxyOp.chunkSize = eDescr->proxyOp.chunkSize;
+      eDescr_v2.proxyOp.isSend = eDescr->proxyOp.isSend;
+    } break;
+    case ncclProfileProxyStep: {
+      eDescr_v2.proxyStep.step = eDescr->proxyStep.step;
+    } break;
+    case ncclProfileProxyCtrl: break;
+    default: return ncclSuccess;
   }
-  return ncclProfiler_v2->startEvent(context, eHandle, (ncclProfilerEventDescr_v2_t *)eDescr);
+  return ncclProfiler_v2->startEvent(context, eHandle, &eDescr_v2);
 }
 
 static ncclResult_t ncclProfiler_recordEventState(void* eHandle, ncclProfilerEventState_t eState, ncclProfilerEventStateArgs_t* eStateArgs) {