Skip to content

fix: use gin_dev attribute for GIN network devices #2166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Outsider3911 wants to merge 1 commit into
base: v2.30u1
Choose a base branch
from
+5 −3
Open

fix: use gin_dev attribute for GIN network devices #2166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/graph/topo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ ncclResult_t ncclTopoAddNet(struct ncclXmlNode* xmlNet, struct ncclTopoSystem* s

ncclResult_t ncclTopoAddGin(struct ncclXmlNode* xmlNet, struct ncclTopoSystem* system, struct ncclTopoNode* nic, int systemId) {
int dev;
NCCLCHECK(xmlGetAttrInt(xmlNet, "dev", &dev));
NCCLCHECK(xmlGetAttrInt(xmlNet, "gin_dev", &dev));

int64_t netId = NCCL_TOPO_ID(systemId, dev);
struct ncclTopoNode* net;
Expand Down Expand Up @@ -471,6 +471,7 @@ ncclResult_t ncclTopoAddNic(struct ncclXmlNode* xmlNic, struct ncclTopoSystem* s
if (strcmp(xmlNet->name, "net") != 0) continue;
int index;
NCCLCHECK(xmlGetAttrIndex(xmlNet, "dev", &index));
if (index == -1) NCCLCHECK(xmlGetAttrIndex(xmlNet, "gin_dev", &index));
// This means that the "dev" attribute wasn't set on this net xml node. That means it should not be added to the system topology graph
if (index == -1) continue;

Expand Down Expand Up @@ -1465,10 +1466,11 @@ static ncclResult_t ncclTopoPopulateNics(ncclXml* xml, int startIndex, int endIn
NCCLCHECK(xmlGetAttr(netNode, "coll", &colAttr));

NCCLCHECK(xmlSetAttrInt(netNode, "keep", 1));
const char* devAttr = netInfo->gin ? "gin_dev" : "dev";
int dev;
xmlGetAttrIntDefault(netNode, "dev", &dev, -1);
xmlGetAttrIntDefault(netNode, devAttr, &dev, -1);
if (dev != -1 && dev != n) INFO(NCCL_GRAPH, "TOPO/NET : Changing %s dev index from %d to %d", netInfo->name, dev, n);
NCCLCHECK(xmlSetAttrInt(netNode, "dev", n));
NCCLCHECK(xmlSetAttrInt(netNode, devAttr, n));
NCCLCHECK(xmlInitAttrInt(netNode, "latency", props.latency));
NCCLCHECK(xmlInitAttrInt(netNode, "speed", props.speed));
NCCLCHECK(xmlInitAttrInt(netNode, "port", props.port));
Expand Down