ab2b89c4c3
Add support for IB SHARP 1PPN operation with user buffers. Improve support for MNNVL, add NVLS support and multi-clique support. * Detect the NVLS clique through NVML * Exchange XML between peers in the same NVLS clique and fuse XMLs before creating the topology graph. * Rework bootstrap allgather algorithms to allow for large allgather operations intra-node (XML exchange). Net/IB: add support for dynamic GID detection. * Automatically select RoCEv2/IPv4 interface by default. Allow to select IPv6 or even the network/mask. Reduce NVLS memory usage. * Add stepSize as property of a connection to allow for different sizes on different peers; set it to 128K for NVLink SHARP. Improve tuner loading * Look for more paths, be more consistent with the network device plugin. * Also search for tuner support inside the net plugin. Improve tuner API * Add context to support multi-device per process. Add magic number around comm object to detect comm corruption. * Add some basic check around communicators so that we can report a problem when a communicator gets corrupted or a wrong comm pointer is passed to NCCL. Fix net/IB error path. Github PR #1164 Fix collnet rail mapping with split comm. Fix packet reordering issue causing bootstrap mismatch * Use a different tag in ncclTransportP2pSetup for the connectInfo exchange and the following barrier. Fix hang when crossNic is inconsistent between ranks. Fix minCompCap/maxCompCap computation. Github issue #1184
376 строки
12 KiB
C
376 строки
12 KiB
C
/*************************************************************************
|
|
* Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* See LICENSE.txt for license information
|
|
************************************************************************/
|
|
|
|
#ifndef XML_H_
|
|
#define XML_H_
|
|
|
|
#include "nccl.h"
|
|
#include "debug.h"
|
|
#include "checks.h"
|
|
#include "alloc.h"
|
|
#include <stdlib.h>
|
|
|
|
// A few constraints to make the implementation easy
|
|
#define MAX_STR_LEN 255
|
|
#define MAX_ATTR_COUNT 16
|
|
#define MAX_SUBS 128
|
|
|
|
#define NODE_TYPE_NONE 0
|
|
#define NODE_TYPE_OPEN 1
|
|
#define NODE_TYPE_CLOSE 2
|
|
#define NODE_TYPE_SINGLE 3
|
|
|
|
struct ncclXmlNode {
|
|
char name[MAX_STR_LEN+1];
|
|
struct {
|
|
char key[MAX_STR_LEN+1];
|
|
char value[MAX_STR_LEN+1];
|
|
} attrs[MAX_ATTR_COUNT+1]; // Need an extra one to consume extra params
|
|
int nAttrs;
|
|
int type;
|
|
struct ncclXmlNode* parent;
|
|
struct ncclXmlNode* subs[MAX_SUBS];
|
|
int nSubs;
|
|
};
|
|
|
|
struct ncclXml {
|
|
int maxIndex, maxNodes;
|
|
struct ncclXmlNode nodes[1];
|
|
};
|
|
|
|
/* File functions */
|
|
#define NCCL_TOPO_XML_VERSION 1
|
|
ncclResult_t ncclTopoGetXmlFromFile(const char* xmlTopoFile, struct ncclXml* xml, int warn);
|
|
ncclResult_t ncclTopoDumpXmlToFile(const char* xmlTopoFile, struct ncclXml* xml);
|
|
#define NCCL_GRAPH_XML_VERSION 1
|
|
ncclResult_t ncclTopoGetXmlGraphFromFile(const char* xmlGraphFile, struct ncclXml* xml);
|
|
|
|
/* Auto-detect functions */
|
|
ncclResult_t ncclTopoFillGpu(struct ncclXml* xml, const char* busId, struct ncclXmlNode** gpuNode);
|
|
ncclResult_t ncclTopoFillNet(struct ncclXml* xml, const char* pciPath, const char* netName, struct ncclXmlNode** netNode);
|
|
|
|
/* Remove unneeded parts */
|
|
ncclResult_t ncclTopoTrimXml(struct ncclXml* xml);
|
|
|
|
/* Fuse multiple system XMLs into one, skipping duplicate CPUs */
|
|
ncclResult_t ncclTopoFuseXml(struct ncclXml* dst, struct ncclXml* src);
|
|
/* Relocate pointers in XML to (de-)serialize the structure */
|
|
ncclResult_t ncclTopoConvertXml(struct ncclXml* xml, uintptr_t base, int exp);
|
|
|
|
/**************/
|
|
/* XML Struct */
|
|
/* Functions */
|
|
/**************/
|
|
|
|
static size_t xmlMemSize(int maxNodes) {
|
|
return offsetof(struct ncclXml, nodes) + sizeof(struct ncclXmlNode)*maxNodes;
|
|
}
|
|
static ncclResult_t xmlAlloc(struct ncclXml** xml, int maxNodes) {
|
|
char* mem;
|
|
NCCLCHECK(ncclCalloc(&mem, xmlMemSize(maxNodes)));
|
|
*xml = (struct ncclXml*)mem;
|
|
(*xml)->maxNodes = maxNodes;
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlGetAttrIndex(struct ncclXmlNode* node, const char* attrName, int* index) {
|
|
*index = -1;
|
|
const int nAttrs = node->nAttrs;
|
|
for (int a=0; a<nAttrs; a++) {
|
|
if (strncmp(node->attrs[a].key, attrName, MAX_STR_LEN) == 0) {
|
|
*index = a;
|
|
return ncclSuccess;
|
|
}
|
|
}
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlGetAttr(struct ncclXmlNode* node, const char* attrName, const char** value) {
|
|
int index;
|
|
NCCLCHECK(xmlGetAttrIndex(node, attrName, &index));
|
|
*value = index == -1 ? NULL : node->attrs[index].value;
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlGetAttrStr(struct ncclXmlNode* node, const char* attrName, const char** value) {
|
|
NCCLCHECK(xmlGetAttr(node, attrName, value));
|
|
if (*value == NULL) {
|
|
WARN("Attribute %s of node %s not found", attrName, node->name);
|
|
return ncclInternalError;
|
|
}
|
|
return ncclSuccess;
|
|
}
|
|
static ncclResult_t xmlGetAttrInt(struct ncclXmlNode* node, const char* attrName, int* value) {
|
|
const char* str;
|
|
NCCLCHECK(xmlGetAttrStr(node, attrName, &str));
|
|
*value = strtol(str, NULL, 0);
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlGetAttrIntDefault(struct ncclXmlNode* node, const char* attrName, int* value, int defaultValue) {
|
|
const char* str;
|
|
NCCLCHECK(xmlGetAttr(node, attrName, &str));
|
|
*value = str ? strtol(str, NULL, 0) : defaultValue;
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlGetAttrLong(struct ncclXmlNode* node, const char* attrName, int64_t* value) {
|
|
const char* str;
|
|
NCCLCHECK(xmlGetAttrStr(node, attrName, &str));
|
|
*value = strtol(str, NULL, 0);
|
|
return ncclSuccess;
|
|
}
|
|
|
|
|
|
static ncclResult_t xmlGetAttrFloat(struct ncclXmlNode* node, const char* attrName, float* value) {
|
|
const char* str;
|
|
NCCLCHECK(xmlGetAttrStr(node, attrName, &str));
|
|
*value = strtof(str, NULL);
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlFindTag(struct ncclXml* xml, const char* tagName, struct ncclXmlNode** node) {
|
|
*node = NULL;
|
|
for (int i=0; i<xml->maxIndex; i++) {
|
|
struct ncclXmlNode* n = xml->nodes+i;
|
|
if (strcmp(n->name, tagName) == 0) {
|
|
*node = n;
|
|
return ncclSuccess;
|
|
}
|
|
}
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlFindNextTag(struct ncclXml* xml, const char* tagName, struct ncclXmlNode* prev, struct ncclXmlNode** node) {
|
|
*node = NULL;
|
|
for (int i=prev-xml->nodes+1; i<xml->maxIndex; i++) {
|
|
struct ncclXmlNode* n = xml->nodes+i;
|
|
if (strcmp(n->name, tagName) == 0) {
|
|
*node = n;
|
|
return ncclSuccess;
|
|
}
|
|
}
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlFindTagKv(struct ncclXml* xml, const char* tagName, struct ncclXmlNode** node, const char* attrName, const char* attrValue) {
|
|
*node = NULL;
|
|
for (int i=0; i<xml->maxIndex; i++) {
|
|
struct ncclXmlNode* n = xml->nodes+i;
|
|
if (strcmp(n->name, tagName) == 0) {
|
|
const char* value;
|
|
NCCLCHECK(xmlGetAttr(n, attrName, &value));
|
|
if (value && strcmp(value, attrValue) == 0) {
|
|
*node = n;
|
|
return ncclSuccess;
|
|
}
|
|
}
|
|
}
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlSetAttr(struct ncclXmlNode* node, const char* attrName, const char* value) {
|
|
int index;
|
|
NCCLCHECK(xmlGetAttrIndex(node, attrName, &index));
|
|
if (index == -1) {
|
|
index = node->nAttrs++;
|
|
strncpy(node->attrs[index].key, attrName, MAX_STR_LEN);
|
|
node->attrs[index].key[MAX_STR_LEN] = '\0';
|
|
}
|
|
strncpy(node->attrs[index].value, value, MAX_STR_LEN);
|
|
node->attrs[index].value[MAX_STR_LEN] = '\0';
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlSetAttrIfUnset(struct ncclXmlNode* node, const char* attrName, const char* value) {
|
|
int index;
|
|
NCCLCHECK(xmlGetAttrIndex(node, attrName, &index));
|
|
if (index != -1) return ncclSuccess;
|
|
index = node->nAttrs++;
|
|
strncpy(node->attrs[index].key, attrName, MAX_STR_LEN);
|
|
node->attrs[index].key[MAX_STR_LEN] = '\0';
|
|
strncpy(node->attrs[index].value, value, MAX_STR_LEN);
|
|
node->attrs[index].value[MAX_STR_LEN] = '\0';
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlSetAttrInt(struct ncclXmlNode* node, const char* attrName, const int value) {
|
|
int index;
|
|
NCCLCHECK(xmlGetAttrIndex(node, attrName, &index));
|
|
if (index == -1) {
|
|
index = node->nAttrs++;
|
|
strncpy(node->attrs[index].key, attrName, MAX_STR_LEN);
|
|
node->attrs[index].key[MAX_STR_LEN] = '\0';
|
|
}
|
|
snprintf(node->attrs[index].value, MAX_STR_LEN, "%d", value);
|
|
node->attrs[index].value[MAX_STR_LEN] = '\0';
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlSetAttrFloat(struct ncclXmlNode* node, const char* attrName, const float value) {
|
|
int index;
|
|
NCCLCHECK(xmlGetAttrIndex(node, attrName, &index));
|
|
if (index == -1) {
|
|
index = node->nAttrs++;
|
|
strncpy(node->attrs[index].key, attrName, MAX_STR_LEN);
|
|
node->attrs[index].key[MAX_STR_LEN] = '\0';
|
|
}
|
|
snprintf(node->attrs[index].value, MAX_STR_LEN, "%g", value);
|
|
node->attrs[index].value[MAX_STR_LEN] = '\0';
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlSetAttrLong(struct ncclXmlNode* node, const char* attrName, const int64_t value) {
|
|
int index;
|
|
NCCLCHECK(xmlGetAttrIndex(node, attrName, &index));
|
|
if (index == -1) {
|
|
index = node->nAttrs++;
|
|
strncpy(node->attrs[index].key, attrName, MAX_STR_LEN);
|
|
node->attrs[index].key[MAX_STR_LEN] = '\0';
|
|
}
|
|
snprintf(node->attrs[index].value, MAX_STR_LEN, "%#lx", value);
|
|
node->attrs[index].value[MAX_STR_LEN] = '\0';
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlUnsetAttr(struct ncclXmlNode* node, const char* attrName) {
|
|
int index;
|
|
NCCLCHECK(xmlGetAttrIndex(node, attrName, &index));
|
|
if (index == -1) return ncclSuccess;
|
|
for (int i=index+1; i<node->nAttrs; i++) {
|
|
strcpy(node->attrs[i-1].key, node->attrs[i].key);
|
|
strcpy(node->attrs[i-1].value, node->attrs[i].value);
|
|
}
|
|
node->nAttrs--;
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlGetSub(struct ncclXmlNode* node, const char* subName, struct ncclXmlNode** sub) {
|
|
*sub = NULL;
|
|
for (int s=0; s<node->nSubs; s++) {
|
|
if (strcmp(node->subs[s]->name, subName) == 0) {
|
|
*sub = node->subs[s];
|
|
return ncclSuccess;
|
|
}
|
|
}
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlGetSubKv(struct ncclXmlNode* node, const char* subName, struct ncclXmlNode** sub, const char* attrName, const char* attrValue) {
|
|
*sub = NULL;
|
|
for (int s=0; s<node->nSubs; s++) {
|
|
struct ncclXmlNode* subNode = node->subs[s];
|
|
if (strcmp(subNode->name, subName) == 0) {
|
|
const char* value;
|
|
NCCLCHECK(xmlGetAttr(subNode, attrName, &value));
|
|
if (value && strcmp(value, attrValue) == 0) {
|
|
*sub = node->subs[s];
|
|
return ncclSuccess;
|
|
}
|
|
}
|
|
}
|
|
return ncclSuccess;
|
|
}
|
|
static ncclResult_t xmlGetSubKvInt(struct ncclXmlNode* node, const char* subName, struct ncclXmlNode** sub, const char* attrName, const int attrValue) {
|
|
char strValue[10];
|
|
snprintf(strValue, 10, "%d", attrValue);
|
|
NCCLCHECK(xmlGetSubKv(node, subName, sub, attrName, strValue));
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlAddNode(struct ncclXml* xml, struct ncclXmlNode* parent, const char* subName, struct ncclXmlNode** sub) {
|
|
if (xml->maxIndex == xml->maxNodes) {
|
|
WARN("Error : too many XML nodes (max %d)", xml->maxNodes);
|
|
return ncclInternalError;
|
|
}
|
|
struct ncclXmlNode* s = xml->nodes+xml->maxIndex++;
|
|
s->nSubs = 0;
|
|
s->nAttrs = 0;
|
|
*sub = s;
|
|
s->parent = parent;
|
|
if (parent) {
|
|
if (parent->nSubs == MAX_SUBS) {
|
|
WARN("Error : too many XML subnodes (max %d)", MAX_SUBS);
|
|
return ncclInternalError;
|
|
}
|
|
parent->subs[parent->nSubs++] = s;
|
|
}
|
|
strncpy(s->name, subName, MAX_STR_LEN);
|
|
s->name[MAX_STR_LEN] = '\0';
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlRemoveNode(struct ncclXmlNode* node) {
|
|
node->type = NODE_TYPE_NONE;
|
|
struct ncclXmlNode* parent = node->parent;
|
|
if (parent == NULL) return ncclSuccess;
|
|
int shift = 0;
|
|
for (int s=0; s<parent->nSubs; s++) {
|
|
if (parent->subs[s] == node) shift = 1;
|
|
else if (shift) parent->subs[s-1] = parent->subs[s];
|
|
}
|
|
parent->nSubs--;
|
|
return ncclSuccess;
|
|
}
|
|
|
|
static ncclResult_t xmlAddTree(struct ncclXml* dst, struct ncclXmlNode* parent, struct ncclXmlNode* srcNode) {
|
|
if (dst->maxIndex == dst->maxNodes) {
|
|
WARN("Error : too many XML nodes (max %d)", dst->maxNodes);
|
|
return ncclInternalError;
|
|
}
|
|
struct ncclXmlNode* dstNode = dst->nodes+dst->maxIndex++;
|
|
*dstNode = *srcNode;
|
|
dstNode->parent = parent;
|
|
if (parent) {
|
|
if (parent->nSubs == MAX_SUBS) {
|
|
WARN("Error : too many XML subnodes (max %d)", MAX_SUBS);
|
|
return ncclInternalError;
|
|
}
|
|
parent->subs[parent->nSubs++] = dstNode;
|
|
}
|
|
dstNode->nSubs = 0;
|
|
// Recursively copy the subtree(s)
|
|
for (int i=0; i<srcNode->nSubs; i++)
|
|
NCCLCHECK(xmlAddTree(dst, dstNode, srcNode->subs[i]));
|
|
return ncclSuccess;
|
|
}
|
|
|
|
|
|
// Dictionary for STR -> INT conversions. No dictionary size information,
|
|
// there needs to be a last element with str == NULL.
|
|
struct kvDict {
|
|
const char* str;
|
|
int value;
|
|
};
|
|
|
|
static ncclResult_t kvConvertToInt(const char* str, int* value, struct kvDict* dict) {
|
|
struct kvDict* d = dict;
|
|
while (d->str) {
|
|
if (strncmp(str, d->str, strlen(d->str)) == 0) {
|
|
*value = d->value;
|
|
return ncclSuccess;
|
|
}
|
|
d++;
|
|
}
|
|
INFO(NCCL_GRAPH, "KV Convert to int : could not find value of '%s' in dictionary, falling back to %d", str, d->value);
|
|
*value = d->value;
|
|
return ncclSuccess;
|
|
}
|
|
static ncclResult_t kvConvertToStr(int value, const char** str, struct kvDict* dict) {
|
|
struct kvDict* d = dict;
|
|
while (d->str) {
|
|
if (value == d->value) {
|
|
*str = d->str;
|
|
return ncclSuccess;
|
|
}
|
|
d++;
|
|
}
|
|
WARN("KV Convert to str : could not find value %d in dictionary", value);
|
|
return ncclInternalError;
|
|
}
|
|
|
|
#endif
|