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

[ROCm/rccl commit: c4edc257b0]
2020-04-27 17:16:54 +00:00
parent 5f57e6b466 c43022b9d8
commit 9813d67cd1
8 changed files with 50 additions and 47 deletions
@@ -578,7 +578,7 @@ ncclResult_t ncclTopoGetXmlFromGpu(struct ncclXmlNode* pciNode, nvmlDevice_t nvm
    NCCLCHECK(xmlSetAttrInt(gpuNode, "dev", dev));
  }
  NCCLCHECK(xmlGetAttrInt(gpuNode, "dev", &dev));
-  if (dev == -1) return ncclSuccess;
+  if (dev == -1) { *gpuNodeRet = NULL; return ncclSuccess; }

  NCCLCHECK(xmlGetAttrIndex(gpuNode, "sm", &index));
  if (index == -1) {