CPU Affinity: Filter out packages with zero PUs (#2676)

Author: evan-charmworks

src/conv-core/cpuaffinity.C

@@ -602,7 +602,17 @@ static void cpuAffinityRecvHandler(void *msg)
     if (m->node_hosts[i] == myhost)
       ++nodes_on_host;
 
-  const int package_count = cmi_hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_PACKAGE);
+  // Filter out packages with null cpusets, caused by system resource management
+  const int total_package_count = cmi_hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_PACKAGE);
+  std::vector<hwloc_obj_t> packages;
+  packages.reserve(total_package_count);
+  for (int i = 0; i < total_package_count; ++i)
+  {
+    hwloc_obj_t obj = cmi_hwloc_get_obj_by_type(topology, HWLOC_OBJ_PACKAGE, i);
+    if (cmi_hwloc_get_nbobjs_inside_cpuset_by_type(topology, obj->cpuset, HWLOC_OBJ_PU) > 0)
+      packages.emplace_back(obj);
+  }
+  const int package_count = packages.size();
 
   hwloc_obj_t obj;
   int numranks, myrank;
@@ -627,7 +637,7 @@ static void cpuAffinityRecvHandler(void *msg)
       }
     }
 
-    obj = cmi_hwloc_get_obj_by_type(topology, HWLOC_OBJ_PACKAGE, mypackage);
+    obj = packages[mypackage];
     numranks = pes_on_package;
     myrank = my_first_pe_rank_on_package + CmiMyRank();