Loading source/adios2/toolkit/sst/dp/rdma_dp.c +71 −58 Original line number Diff line number Diff line Loading @@ -111,16 +111,18 @@ static void init_fabric(struct fabric_state *fabric) originfo = info; useinfo = NULL; while(info) { while (info) { prov_name = info->fabric_attr->prov_name; domain_name = info->domain_attr->name; if (ifname && strcmp(ifname, domain_name) == 0) { if (ifname && strcmp(ifname, domain_name) == 0) { useinfo = info; break; } if(strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { if (strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { useinfo = info; } info = info->next; Loading Loading @@ -1076,30 +1078,41 @@ static int RdmaGetPriority(CP_Services Svcs, void *CP_Stream) fi_getinfo(FI_VERSION(1, 5), NULL, NULL, 0, hints, &info); fi_freeinfo(hints); if(!info) { Svcs->verbose(CP_Stream, "RDMA Dataplane could not find any viable fabrics.\n"); if (!info) { Svcs->verbose(CP_Stream, "RDMA Dataplane could not find any viable fabrics.\n"); } while(info) { while (info) { prov_name = info->fabric_attr->prov_name; domain_name = info->domain_attr->name; if (ifname && strcmp(ifname, domain_name) == 0) { Svcs->verbose(CP_Stream, "RDMA Dataplane found the requested interface %s, provider type %s.\n", ifname, prov_name); if (ifname && strcmp(ifname, domain_name) == 0) { Svcs->verbose(CP_Stream, "RDMA Dataplane found the requested " "interface %s, provider type %s.\n", ifname, prov_name); Ret = 100; break; } if(strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { if (strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { Svcs->verbose(CP_Stream, "RDMA Dataplane sees interface %s, provider type %s, which should work.\n", domain_name, prov_name); Svcs->verbose(CP_Stream, "RDMA Dataplane sees interface %s, " "provider type %s, which should work.\n", domain_name, prov_name); Ret = 10; } info = info->next; } if(Ret == -1) { Svcs->verbose(CP_Stream, "RDMA Dataplane could not find an RDMA-compatible fabric.\n"); if (Ret == -1) { Svcs->verbose( CP_Stream, "RDMA Dataplane could not find an RDMA-compatible fabric.\n"); } fi_freeinfo(originfo); Loading Loading
source/adios2/toolkit/sst/dp/rdma_dp.c +71 −58 Original line number Diff line number Diff line Loading @@ -111,16 +111,18 @@ static void init_fabric(struct fabric_state *fabric) originfo = info; useinfo = NULL; while(info) { while (info) { prov_name = info->fabric_attr->prov_name; domain_name = info->domain_attr->name; if (ifname && strcmp(ifname, domain_name) == 0) { if (ifname && strcmp(ifname, domain_name) == 0) { useinfo = info; break; } if(strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { if (strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { useinfo = info; } info = info->next; Loading Loading @@ -1076,30 +1078,41 @@ static int RdmaGetPriority(CP_Services Svcs, void *CP_Stream) fi_getinfo(FI_VERSION(1, 5), NULL, NULL, 0, hints, &info); fi_freeinfo(hints); if(!info) { Svcs->verbose(CP_Stream, "RDMA Dataplane could not find any viable fabrics.\n"); if (!info) { Svcs->verbose(CP_Stream, "RDMA Dataplane could not find any viable fabrics.\n"); } while(info) { while (info) { prov_name = info->fabric_attr->prov_name; domain_name = info->domain_attr->name; if (ifname && strcmp(ifname, domain_name) == 0) { Svcs->verbose(CP_Stream, "RDMA Dataplane found the requested interface %s, provider type %s.\n", ifname, prov_name); if (ifname && strcmp(ifname, domain_name) == 0) { Svcs->verbose(CP_Stream, "RDMA Dataplane found the requested " "interface %s, provider type %s.\n", ifname, prov_name); Ret = 100; break; } if(strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { if (strcmp(prov_name, "verbs") == 0 || strcmp(prov_name, "gni") == 0 || strcmp(prov_name, "psm2") == 0) { Svcs->verbose(CP_Stream, "RDMA Dataplane sees interface %s, provider type %s, which should work.\n", domain_name, prov_name); Svcs->verbose(CP_Stream, "RDMA Dataplane sees interface %s, " "provider type %s, which should work.\n", domain_name, prov_name); Ret = 10; } info = info->next; } if(Ret == -1) { Svcs->verbose(CP_Stream, "RDMA Dataplane could not find an RDMA-compatible fabric.\n"); if (Ret == -1) { Svcs->verbose( CP_Stream, "RDMA Dataplane could not find an RDMA-compatible fabric.\n"); } fi_freeinfo(originfo); Loading