distances: relax constraints on distance kinds

Allow FROM or MEANS to be missing if unknown.
Nothing requires them internally, they are only
used to enable/disable grouping (latency only)
and checked by the get() API filters.

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

Author: bgoglin

hwloc/distances.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2022 Inria.  All rights reserved.
+ * Copyright © 2010-2024 Inria.  All rights reserved.
  * Copyright © 2011-2012 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -624,8 +624,8 @@ void * hwloc_distances_add_create(hwloc_topology_t topology,
     return NULL;
   }
   if ((kind & ~HWLOC_DISTANCES_KIND_ALL)
-      || hwloc_weight_long(kind & HWLOC_DISTANCES_KIND_FROM_ALL) != 1
-      || hwloc_weight_long(kind & HWLOC_DISTANCES_KIND_MEANS_ALL) != 1) {
+      || hwloc_weight_long(kind & HWLOC_DISTANCES_KIND_FROM_ALL) > 1
+      || hwloc_weight_long(kind & HWLOC_DISTANCES_KIND_MEANS_ALL) > 1) {
     errno = EINVAL;
     return NULL;
   }

include/hwloc/distances.h

@@ -70,9 +70,9 @@ struct hwloc_distances_s {
  * The \p kind attribute of struct hwloc_distances_s is a OR'ed set
  * of kinds.
  *
- * Each distance matrix has exactly one kind HWLOC_DISTANCES_KIND_FROM_*
+ * Each distance matrix may have only one kind among HWLOC_DISTANCES_KIND_FROM_*
  * specifying where distance information comes from,
- * and exactly one kind HWLOC_DISTANCES_KIND_MEANS_* specifying
+ * and one kind among HWLOC_DISTANCES_KIND_MEANS_* specifying
  * whether values are latencies or bandwidths.
  */
 enum hwloc_distances_kind_e {
@@ -356,7 +356,7 @@ typedef void * hwloc_distances_add_handle_t;
  * Otherwise, it will be copied internally and may later be freed by the caller.
  *
  * \p kind specifies the kind of distance as a OR'ed set of ::hwloc_distances_kind_e.
- * Exactly one kind of meaning and one kind of provenance must be given
+ * Only one kind of meaning and one kind of provenance may be given if appropriate
  * (e.g. ::HWLOC_DISTANCES_KIND_MEANS_BANDWIDTH and ::HWLOC_DISTANCES_KIND_FROM_USER).
  * Kind ::HWLOC_DISTANCES_KIND_HETEROGENEOUS_TYPES will be automatically set
  * according to objects having different types in hwloc_distances_add_values().