utils/calc: switch to intersecting local NUMA nodes by default

Thanks to Antoine Morvan for the report

Refs open-mpi#716

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

utils/hwloc/hwloc-calc.1in

@@ -222,10 +222,10 @@ Change the flags used to select local NUMA nodes.
 Flags may be given as numeric values or as a comma-separated list of flag names
 that are passed to \fIhwloc_get_local_numanode_objs()\fR.
 Those names may be substrings of actual flag names as long as a single one matches.
-The default is \fB3\fR (or \fBsmaller,larger\fR)
+The default is \f0xb\fR (or \fBsmaller,larger,intersects\fR)
 which means NUMA nodes are displayed
-if their locality either contains or is contained
-in the locality of the given object.
+if their locality either contains, is contained, or intersects
+the locality of the given object.
 
 This option enables \fB\-\-local\-memory\fR.
 .TP

utils/hwloc/hwloc-calc.c

@@ -85,7 +85,7 @@ static struct hwloc_calc_level intersect;
 static int hiernblevels;
 static struct hwloc_calc_level *hierlevels;
 static int local_numanodes = 0;
-static unsigned long local_numanode_flags = HWLOC_LOCAL_NUMANODE_FLAG_SMALLER_LOCALITY | HWLOC_LOCAL_NUMANODE_FLAG_LARGER_LOCALITY;
+static unsigned long local_numanode_flags = HWLOC_LOCAL_NUMANODE_FLAG_SMALLER_LOCALITY | HWLOC_LOCAL_NUMANODE_FLAG_LARGER_LOCALITY | HWLOC_LOCAL_NUMANODE_FLAG_INTERSECT_LOCALITY;
 static hwloc_memattr_id_t best_memattr_id = (hwloc_memattr_id_t) -1;
 static unsigned long best_node_flags = 0;
 static int showlargestobjs = 0;

utils/hwloc/test-hwloc-calc.output

@@ -181,6 +181,23 @@ NUMANode:1
 # Best-capacity local node near a PU (node:6@Machine)
 6
 
+
+# no node is local to one pu of each package
+
+
+# 1 node is local to one package and one pu of the other
+0
+
+# both nodes are local to one pu of each package, if intersecting
+NUMANode:0,NUMANode:1
+
+# both nodes are local to one package and one pu of the other, if intersecting
+0,1
+
+# all local nodes
+0%1
+
+
 # CPU kind by index
 0x000000ff
 

utils/hwloc/test-hwloc-calc.sh.in

@@ -235,6 +235,24 @@ set -e
   $calc --if synthetic --input "[numa(memory=1000000)] pack:2 [numa(memory=100000)] die:2 [numa(memory=1000)] pu:2" --best-memattr capacity pu:4
   echo
 
+  echo
+  echo "# no node is local to one pu of each package"
+  $calc --if synthetic --input "pack:2 [numa] pu:2" --local-memory-flags small,large pack:all.pu:0 
+  echo
+  echo "# 1 node is local to one package and one pu of the other"
+  $calc --if synthetic --input "pack:2 [numa] pu:2" --local-memory-flags small,large pack:0 pack:1.pu:0
+  echo
+  echo "# both nodes are local to one pu of each package, if intersecting"
+  $calc --if synthetic --input "pack:2 [numa] pu:2" --local-memory-flags intersect pack:all.pu:0 --oo
+  echo
+  echo "# both nodes are local to one package and one pu of the other, if intersecting"
+  $calc --if synthetic --input "pack:2 [numa] pu:2" --local-memory-flags intersect pack:0 pack:1.pu:0
+  echo
+  echo "# all local nodes"
+  $calc --if synthetic --input "pack:2 [numa] pu:2" --local-memory-flags _all pu:0 --sep "%"
+  echo
+
+  echo
   echo "# CPU kind by index"
   $calc --if xml --input $linuxdir/fakeheterocpunuma.xml --cpukind 1 all
   echo