Add NCCL_NET flag to many debug lines.

This commit is contained in:
Sylvain Jeaugey 2018-12-04 13:10:19 -08:00
parent cdae05b277
commit b8a9a32ccb

View File

@ -77,7 +77,7 @@ ncclResult_t initNet(ncclNet_t* net) {
NCCLCHECK(net->init(ncclDebugLog)); NCCLCHECK(net->init(ncclDebugLog));
NCCLCHECK(net->devices(&ndev)); NCCLCHECK(net->devices(&ndev));
if (ndev <= 0) { if (ndev <= 0) {
INFO(NCCL_INIT, "Net/%s: call to devices() returned 0 devices.", net->name); INFO(NCCL_INIT|NCCL_NET, "Net/%s: call to devices() returned 0 devices.", net->name);
return ncclSystemError; return ncclSystemError;
} }
return ncclSuccess; return ncclSuccess;
@ -90,15 +90,15 @@ ncclResult_t initNetPlugin(ncclNet_t** net) {
// string, so checking errno doesn't hurt to try to provide a better // string, so checking errno doesn't hurt to try to provide a better
// error message // error message
if (errno == ENOENT) { if (errno == ENOENT) {
INFO(NCCL_INIT, "No network plugin found."); INFO(NCCL_INIT|NCCL_NET, "No network plugin found.");
} else { } else {
INFO(NCCL_INIT, "Unable to load libnccl-net.so : %s", dlerror()); INFO(NCCL_INIT|NCCL_NET, "Unable to load libnccl-net.so : %s", dlerror());
} }
return ncclSuccess; return ncclSuccess;
} }
ncclNet_t* extNet = (ncclNet_t*) dlsym(netPluginLib, STR(NCCL_PLUGIN_SYMBOL)); ncclNet_t* extNet = (ncclNet_t*) dlsym(netPluginLib, STR(NCCL_PLUGIN_SYMBOL));
if (extNet == NULL) { if (extNet == NULL) {
INFO(NCCL_INIT, "NetPlugin: could not find " STR(NCCL_PLUGIN_SYMBOL) " symbol"); INFO(NCCL_INIT|NCCL_NET, "NetPlugin: could not find " STR(NCCL_PLUGIN_SYMBOL) " symbol");
goto cleanup; goto cleanup;
} }
if (initNet(extNet) == ncclSuccess) { if (initNet(extNet) == ncclSuccess) {
@ -116,7 +116,7 @@ ncclResult_t initNet() {
NCCLCHECK(initNetPlugin(&ncclNet)); NCCLCHECK(initNetPlugin(&ncclNet));
if (ncclNet != NULL) { if (ncclNet != NULL) {
INFO(NCCL_INIT, "Using network plugin %s", ncclNetName()); INFO(NCCL_INIT|NCCL_NET, "Using network plugin %s", ncclNetName());
return ncclSuccess; return ncclSuccess;
} }
if (initNet(&ncclNetIb) == ncclSuccess) { if (initNet(&ncclNetIb) == ncclSuccess) {
@ -124,7 +124,7 @@ ncclResult_t initNet() {
} else { } else {
ncclNet = &ncclNetSocket; ncclNet = &ncclNetSocket;
} }
INFO(NCCL_INIT,"Using network %s", ncclNetName()); INFO(NCCL_INIT|NCCL_NET,"Using network %s", ncclNetName());
return ncclSuccess; return ncclSuccess;
} }