CVS commit: pkgsrc/parallel/hwloc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan  7 18:25:45 UTC 2026

Modified Files:
        pkgsrc/parallel/hwloc: Makefile PLIST buildlink3.mk distinfo

Log Message:
hwloc: updated to 2.12

2.12.2 brings several fixes and many small improvements
all over the place.

Side notes before the summary of the changes since v2.12.1.
* The Windows build slave is currently offline, hence there are
  no prebuilt Winballs for rc1. Hopefully this will be fixed for the
  final 2.12.2 next week.
* Until 2.12.1, the official online doc was embedded in the Open MPI
  website layout. It prevented us from enabling some doxygen features
  such as the left navigation panel. Starting with 2.12.2rc1, this
  isn't the case anymore,
  see https://www.open-mpi.org/projects/hwloc/doc/v2.12.2rc1/
* We also had experimental documentation on readthedocs for a while
  but it was not updated with new releases. Hopefully it works now,
  and it should even point to the latest stable release by default
  once the final 2.12.2 gets released.
  See https://hwloc.readthedocs.io/

Version 2.12.2

* Fix hwloc-gather-topology failure because of MemoryModules when
  running as root. Thanks to Andrew Phelps for the report.
* Fix HWLOC_LOCAL_NUMANODE_FLAG_INTERSECT_LOCALITY for empty input
  cpuset, thanks to Hadrien Grasland.
* Fix hwloc_distances_get_by_name() for distances with no kinds.
  Thanks to Hadrien Grasland.
* Initialize distances grouping configuration for duplicated topology.
  Thanks to Hadrien Grasland.
* Improve Windows CMake build to support ARM64, thanks to Chiwen Hui.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/parallel/hwloc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/parallel/hwloc/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/parallel/hwloc/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/parallel/hwloc/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/hwloc/Makefile
diff -u pkgsrc/parallel/hwloc/Makefile:1.41 pkgsrc/parallel/hwloc/Makefile:1.42
--- pkgsrc/parallel/hwloc/Makefile:1.41 Wed Jan  7 08:48:31 2026
+++ pkgsrc/parallel/hwloc/Makefile      Wed Jan  7 18:25:45 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2026/01/07 08:48:31 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2026/01/07 18:25:45 adam Exp $
 
-DISTNAME=      hwloc-1.11.13
-PKGREVISION=   14
+DISTNAME=      hwloc-2.12.2
 CATEGORIES=    parallel
 MASTER_SITES=  http://www.open-mpi.org/software/hwloc/v${PKGVERSION_NOREV:R}/downloads/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/parallel/hwloc/PLIST
diff -u pkgsrc/parallel/hwloc/PLIST:1.6 pkgsrc/parallel/hwloc/PLIST:1.7
--- pkgsrc/parallel/hwloc/PLIST:1.6     Thu Aug  9 11:15:31 2018
+++ pkgsrc/parallel/hwloc/PLIST Wed Jan  7 18:25:45 2026
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2018/08/09 11:15:31 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.7 2026/01/07 18:25:45 adam Exp $
 bin/hwloc-annotate
-bin/hwloc-assembler
-bin/hwloc-assembler-remote
 bin/hwloc-bind
 bin/hwloc-calc
 bin/hwloc-compress-dir
 bin/hwloc-diff
-bin/hwloc-distances
 bin/hwloc-distrib
 bin/hwloc-info
 bin/hwloc-ls
@@ -17,30 +14,32 @@ bin/lstopo-no-graphics
 include/hwloc.h
 include/hwloc/autogen/config.h
 include/hwloc/bitmap.h
+include/hwloc/cpukinds.h
 include/hwloc/cuda.h
 include/hwloc/cudart.h
 include/hwloc/deprecated.h
 include/hwloc/diff.h
+include/hwloc/distances.h
+include/hwloc/export.h
 include/hwloc/gl.h
 include/hwloc/helper.h
 include/hwloc/inlines.h
-include/hwloc/intel-mic.h
-include/hwloc/myriexpress.h
+include/hwloc/levelzero.h
+include/hwloc/memattrs.h
 include/hwloc/nvml.h
 include/hwloc/opencl.h
 include/hwloc/openfabrics-verbs.h
 include/hwloc/plugins.h
 include/hwloc/rename.h
+include/hwloc/rsmi.h
+include/hwloc/shmem.h
 lib/libhwloc.la
 lib/pkgconfig/hwloc.pc
 man/man1/hwloc-annotate.1
-man/man1/hwloc-assembler-remote.1
-man/man1/hwloc-assembler.1
 man/man1/hwloc-bind.1
 man/man1/hwloc-calc.1
 man/man1/hwloc-compress-dir.1
 man/man1/hwloc-diff.1
-man/man1/hwloc-distances.1
 man/man1/hwloc-distrib.1
 man/man1/hwloc-info.1
 man/man1/hwloc-ls.1
@@ -48,12 +47,37 @@ man/man1/hwloc-patch.1
 man/man1/hwloc-ps.1
 man/man1/lstopo-no-graphics.1
 man/man1/lstopo.1
+man/man3/HWLOC_ALLOW_FLAG_ALL.3
+man/man3/HWLOC_ALLOW_FLAG_CUSTOM.3
+man/man3/HWLOC_ALLOW_FLAG_LOCAL_RESTRICTIONS.3
 man/man3/HWLOC_API_VERSION.3
 man/man3/HWLOC_CPUBIND_NOMEMBIND.3
 man/man3/HWLOC_CPUBIND_PROCESS.3
 man/man3/HWLOC_CPUBIND_STRICT.3
 man/man3/HWLOC_CPUBIND_THREAD.3
+man/man3/HWLOC_DISTANCES_ADD_FLAG_GROUP.3
+man/man3/HWLOC_DISTANCES_ADD_FLAG_GROUP_INACCURATE.3
+man/man3/HWLOC_DISTANCES_KIND_FROM_OS.3
+man/man3/HWLOC_DISTANCES_KIND_FROM_USER.3
+man/man3/HWLOC_DISTANCES_KIND_MEANS_BANDWIDTH.3
+man/man3/HWLOC_DISTANCES_KIND_MEANS_LATENCY.3
+man/man3/HWLOC_DISTANCES_TRANSFORM_LINKS.3
+man/man3/HWLOC_DISTANCES_TRANSFORM_MERGE_SWITCH_PORTS.3
+man/man3/HWLOC_DISTANCES_TRANSFORM_REMOVE_NULL.3
+man/man3/HWLOC_DISTANCES_TRANSFORM_TRANSITIVE_CLOSURE.3
 man/man3/HWLOC_DISTRIB_FLAG_REVERSE.3
+man/man3/HWLOC_LOCAL_NUMANODE_FLAG_ALL.3
+man/man3/HWLOC_LOCAL_NUMANODE_FLAG_LARGER_LOCALITY.3
+man/man3/HWLOC_LOCAL_NUMANODE_FLAG_SMALLER_LOCALITY.3
+man/man3/HWLOC_LOCATION_TYPE_CPUSET.3
+man/man3/HWLOC_LOCATION_TYPE_OBJECT.3
+man/man3/HWLOC_MEMATTR_FLAG_HIGHER_FIRST.3
+man/man3/HWLOC_MEMATTR_FLAG_LOWER_FIRST.3
+man/man3/HWLOC_MEMATTR_FLAG_NEED_INITIATOR.3
+man/man3/HWLOC_MEMATTR_ID_BANDWIDTH.3
+man/man3/HWLOC_MEMATTR_ID_CAPACITY.3
+man/man3/HWLOC_MEMATTR_ID_LATENCY.3
+man/man3/HWLOC_MEMATTR_ID_LOCALITY.3
 man/man3/HWLOC_MEMBIND_BIND.3
 man/man3/HWLOC_MEMBIND_BYNODESET.3
 man/man3/HWLOC_MEMBIND_DEFAULT.3
@@ -64,18 +88,25 @@ man/man3/HWLOC_MEMBIND_MIXED.3
 man/man3/HWLOC_MEMBIND_NEXTTOUCH.3
 man/man3/HWLOC_MEMBIND_NOCPUBIND.3
 man/man3/HWLOC_MEMBIND_PROCESS.3
-man/man3/HWLOC_MEMBIND_REPLICATE.3
 man/man3/HWLOC_MEMBIND_STRICT.3
 man/man3/HWLOC_MEMBIND_THREAD.3
+man/man3/HWLOC_MEMBIND_WEIGHTED_INTERLEAVE.3
 man/man3/HWLOC_OBJ_BRIDGE.3
 man/man3/HWLOC_OBJ_BRIDGE_HOST.3
 man/man3/HWLOC_OBJ_BRIDGE_PCI.3
-man/man3/HWLOC_OBJ_CACHE.3
 man/man3/HWLOC_OBJ_CACHE_DATA.3
 man/man3/HWLOC_OBJ_CACHE_INSTRUCTION.3
 man/man3/HWLOC_OBJ_CACHE_UNIFIED.3
 man/man3/HWLOC_OBJ_CORE.3
 man/man3/HWLOC_OBJ_GROUP.3
+man/man3/HWLOC_OBJ_L1CACHE.3
+man/man3/HWLOC_OBJ_L1ICACHE.3
+man/man3/HWLOC_OBJ_L2CACHE.3
+man/man3/HWLOC_OBJ_L2ICACHE.3
+man/man3/HWLOC_OBJ_L3CACHE.3
+man/man3/HWLOC_OBJ_L3ICACHE.3
+man/man3/HWLOC_OBJ_L4CACHE.3
+man/man3/HWLOC_OBJ_L5CACHE.3
 man/man3/HWLOC_OBJ_MACHINE.3
 man/man3/HWLOC_OBJ_MISC.3
 man/man3/HWLOC_OBJ_NUMANODE.3
@@ -89,33 +120,39 @@ man/man3/HWLOC_OBJ_OS_DEVICE.3
 man/man3/HWLOC_OBJ_PACKAGE.3
 man/man3/HWLOC_OBJ_PCI_DEVICE.3
 man/man3/HWLOC_OBJ_PU.3
-man/man3/HWLOC_OBJ_SYSTEM.3
-man/man3/HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES.3
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_IO.3
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_MISC.3
+man/man3/HWLOC_RESTRICT_FLAG_BYNODESET.3
+man/man3/HWLOC_RESTRICT_FLAG_REMOVE_CPULESS.3
+man/man3/HWLOC_RESTRICT_FLAG_REMOVE_MEMLESS.3
+man/man3/HWLOC_TOPOLOGY_COMPONENTS_FLAG_BLACKLIST.3
 man/man3/HWLOC_TOPOLOGY_DIFF_APPLY_REVERSE.3
 man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR.3
 man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO.3
 man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_NAME.3
 man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE.3
 man/man3/HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX.3
-man/man3/HWLOC_TOPOLOGY_FLAG_ICACHES.3
-man/man3/HWLOC_TOPOLOGY_FLAG_IO_BRIDGES.3
-man/man3/HWLOC_TOPOLOGY_FLAG_IO_DEVICES.3
+man/man3/HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING.3
+man/man3/HWLOC_TOPOLOGY_FLAG_IMPORT_SUPPORT.3
+man/man3/HWLOC_TOPOLOGY_FLAG_INCLUDE_DISALLOWED.3
 man/man3/HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM.3
-man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_IO.3
-man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM.3
+man/man3/HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING.3
+man/man3/HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_MEMBINDING.3
+man/man3/HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES.3
 man/man3/HWLOC_TYPE_DEPTH_BRIDGE.3
 man/man3/HWLOC_TYPE_DEPTH_MULTIPLE.3
 man/man3/HWLOC_TYPE_DEPTH_OS_DEVICE.3
 man/man3/HWLOC_TYPE_DEPTH_PCI_DEVICE.3
 man/man3/HWLOC_TYPE_DEPTH_UNKNOWN.3
+man/man3/HWLOC_TYPE_FILTER_KEEP_ALL.3
+man/man3/HWLOC_TYPE_FILTER_KEEP_IMPORTANT.3
+man/man3/HWLOC_TYPE_FILTER_KEEP_NONE.3
+man/man3/HWLOC_TYPE_FILTER_KEEP_STRUCTURE.3
 man/man3/HWLOC_TYPE_UNORDERED.3
 man/man3/hwloc_alloc.3
 man/man3/hwloc_alloc_membind.3
-man/man3/hwloc_alloc_membind_nodeset.3
 man/man3/hwloc_alloc_membind_policy.3
-man/man3/hwloc_alloc_membind_policy_nodeset.3
+man/man3/hwloc_allow_flags_e.3
 man/man3/hwloc_bitmap_allbut.3
 man/man3/hwloc_bitmap_alloc.3
 man/man3/hwloc_bitmap_alloc_full.3
@@ -135,6 +172,7 @@ man/man3/hwloc_bitmap_foreach_end.3
 man/man3/hwloc_bitmap_free.3
 man/man3/hwloc_bitmap_from_ith_ulong.3
 man/man3/hwloc_bitmap_from_ulong.3
+man/man3/hwloc_bitmap_from_ulongs.3
 man/man3/hwloc_bitmap_intersects.3
 man/man3/hwloc_bitmap_isequal.3
 man/man3/hwloc_bitmap_isfull.3
@@ -147,12 +185,14 @@ man/man3/hwloc_bitmap_list_snprintf.3
 man/man3/hwloc_bitmap_list_sscanf.3
 man/man3/hwloc_bitmap_next.3
 man/man3/hwloc_bitmap_not.3
+man/man3/hwloc_bitmap_nr_ulongs.3
 man/man3/hwloc_bitmap_only.3
 man/man3/hwloc_bitmap_or.3
 man/man3/hwloc_bitmap_set.3
 man/man3/hwloc_bitmap_set_ith_ulong.3
 man/man3/hwloc_bitmap_set_range.3
 man/man3/hwloc_bitmap_singlify.3
+man/man3/hwloc_bitmap_singlify_per_core.3
 man/man3/hwloc_bitmap_snprintf.3
 man/man3/hwloc_bitmap_sscanf.3
 man/man3/hwloc_bitmap_t.3
@@ -161,27 +201,29 @@ man/man3/hwloc_bitmap_taskset_snprintf.3
 man/man3/hwloc_bitmap_taskset_sscanf.3
 man/man3/hwloc_bitmap_to_ith_ulong.3
 man/man3/hwloc_bitmap_to_ulong.3
+man/man3/hwloc_bitmap_to_ulongs.3
 man/man3/hwloc_bitmap_weight.3
 man/man3/hwloc_bitmap_xor.3
 man/man3/hwloc_bitmap_zero.3
 man/man3/hwloc_bridge_covers_pcibus.3
 man/man3/hwloc_compare_types.3
-man/man3/hwloc_compare_types_e.3
 man/man3/hwloc_const_bitmap_t.3
 man/man3/hwloc_const_cpuset_t.3
 man/man3/hwloc_const_nodeset_t.3
 man/man3/hwloc_cpubind_flags_t.3
+man/man3/hwloc_cpukinds_get_by_cpuset.3
+man/man3/hwloc_cpukinds_get_info.3
+man/man3/hwloc_cpukinds_get_nr.3
+man/man3/hwloc_cpukinds_register.3
 man/man3/hwloc_cpuset_from_glibc_sched_affinity.3
 man/man3/hwloc_cpuset_from_linux_libnuma_bitmask.3
 man/man3/hwloc_cpuset_from_linux_libnuma_ulongs.3
 man/man3/hwloc_cpuset_from_nodeset.3
-man/man3/hwloc_cpuset_from_nodeset_strict.3
 man/man3/hwloc_cpuset_t.3
 man/man3/hwloc_cpuset_to_glibc_sched_affinity.3
 man/man3/hwloc_cpuset_to_linux_libnuma_bitmask.3
 man/man3/hwloc_cpuset_to_linux_libnuma_ulongs.3
 man/man3/hwloc_cpuset_to_nodeset.3
-man/man3/hwloc_cpuset_to_nodeset_strict.3
 man/man3/hwloc_cuda_get_device_cpuset.3
 man/man3/hwloc_cuda_get_device_osdev.3
 man/man3/hwloc_cuda_get_device_osdev_by_index.3
@@ -191,9 +233,27 @@ man/man3/hwloc_cudart_get_device_cpuset.
 man/man3/hwloc_cudart_get_device_osdev_by_index.3
 man/man3/hwloc_cudart_get_device_pci_ids.3
 man/man3/hwloc_cudart_get_device_pcidev.3
-man/man3/hwloc_custom_insert_group_object_by_parent.3
-man/man3/hwloc_custom_insert_topology.3
+man/man3/hwloc_distances_add_commit.3
+man/man3/hwloc_distances_add_create.3
+man/man3/hwloc_distances_add_flag_e.3
+man/man3/hwloc_distances_add_handle_t.3
+man/man3/hwloc_distances_add_values.3
+man/man3/hwloc_distances_get.3
+man/man3/hwloc_distances_get_by_depth.3
+man/man3/hwloc_distances_get_by_name.3
+man/man3/hwloc_distances_get_by_type.3
+man/man3/hwloc_distances_get_name.3
+man/man3/hwloc_distances_kind_e.3
+man/man3/hwloc_distances_obj_index.3
+man/man3/hwloc_distances_obj_pair_values.3
+man/man3/hwloc_distances_release.3
+man/man3/hwloc_distances_release_remove.3
+man/man3/hwloc_distances_remove.3
+man/man3/hwloc_distances_remove_by_depth.3
+man/man3/hwloc_distances_remove_by_type.3
 man/man3/hwloc_distances_s.3
+man/man3/hwloc_distances_transform.3
+man/man3/hwloc_distances_transform_e.3
 man/man3/hwloc_distrib.3
 man/man3/hwloc_distrib_flags_e.3
 man/man3/hwloc_export_obj_userdata.3
@@ -204,7 +264,6 @@ man/man3/hwloc_get_ancestor_obj_by_depth
 man/man3/hwloc_get_ancestor_obj_by_type.3
 man/man3/hwloc_get_api_version.3
 man/man3/hwloc_get_area_membind.3
-man/man3/hwloc_get_area_membind_nodeset.3
 man/man3/hwloc_get_area_memlocation.3
 man/man3/hwloc_get_cache_covering_cpuset.3
 man/man3/hwloc_get_cache_type_depth.3
@@ -213,14 +272,12 @@ man/man3/hwloc_get_closest_objs.3
 man/man3/hwloc_get_common_ancestor_obj.3
 man/man3/hwloc_get_cpubind.3
 man/man3/hwloc_get_depth_type.3
-man/man3/hwloc_get_distance_matrix_covering_obj_by_depth.3
 man/man3/hwloc_get_first_largest_obj_inside_cpuset.3
-man/man3/hwloc_get_hostbridge_by_pcibus.3
 man/man3/hwloc_get_largest_objs_inside_cpuset.3
 man/man3/hwloc_get_last_cpu_location.3
-man/man3/hwloc_get_latency.3
+man/man3/hwloc_get_local_numanode_objs.3
 man/man3/hwloc_get_membind.3
-man/man3/hwloc_get_membind_nodeset.3
+man/man3/hwloc_get_memory_parents_depth.3
 man/man3/hwloc_get_nbobjs_by_depth.3
 man/man3/hwloc_get_nbobjs_by_type.3
 man/man3/hwloc_get_nbobjs_inside_cpuset_by_depth.3
@@ -249,7 +306,6 @@ man/man3/hwloc_get_pcidev_by_busidstring
 man/man3/hwloc_get_proc_cpubind.3
 man/man3/hwloc_get_proc_last_cpu_location.3
 man/man3/hwloc_get_proc_membind.3
-man/man3/hwloc_get_proc_membind_nodeset.3
 man/man3/hwloc_get_pu_obj_by_os_index.3
 man/man3/hwloc_get_root_obj.3
 man/man3/hwloc_get_shared_cache_covering_obj.3
@@ -258,24 +314,39 @@ man/man3/hwloc_get_type_depth.3
 man/man3/hwloc_get_type_depth_e.3
 man/man3/hwloc_get_type_or_above_depth.3
 man/man3/hwloc_get_type_or_below_depth.3
-man/man3/hwloc_get_whole_distance_matrix_by_depth.3
-man/man3/hwloc_get_whole_distance_matrix_by_type.3
 man/man3/hwloc_gl_get_display_by_osdev.3
 man/man3/hwloc_gl_get_display_osdev_by_name.3
 man/man3/hwloc_gl_get_display_osdev_by_port_device.3
 man/man3/hwloc_ibv_get_device_cpuset.3
 man/man3/hwloc_ibv_get_device_osdev.3
 man/man3/hwloc_ibv_get_device_osdev_by_name.3
-man/man3/hwloc_intel_mic_get_device_cpuset.3
-man/man3/hwloc_intel_mic_get_device_osdev_by_index.3
+man/man3/hwloc_info_s.3
+man/man3/hwloc_levelzero_get_device_cpuset.3
+man/man3/hwloc_levelzero_get_device_osdev.3
+man/man3/hwloc_levelzero_get_sysman_device_cpuset.3
+man/man3/hwloc_levelzero_get_sysman_device_osdev.3
 man/man3/hwloc_linux_get_tid_cpubind.3
 man/man3/hwloc_linux_get_tid_last_cpu_location.3
-man/man3/hwloc_linux_parse_cpumap_file.3
+man/man3/hwloc_linux_read_path_as_cpumask.3
 man/man3/hwloc_linux_set_tid_cpubind.3
+man/man3/hwloc_local_numanode_flag_e.3
+man/man3/hwloc_location.3
+man/man3/hwloc_location_type_e.3
+man/man3/hwloc_memattr_flag_e.3
+man/man3/hwloc_memattr_get_best_initiator.3
+man/man3/hwloc_memattr_get_best_target.3
+man/man3/hwloc_memattr_get_by_name.3
+man/man3/hwloc_memattr_get_flags.3
+man/man3/hwloc_memattr_get_initiators.3
+man/man3/hwloc_memattr_get_name.3
+man/man3/hwloc_memattr_get_targets.3
+man/man3/hwloc_memattr_get_value.3
+man/man3/hwloc_memattr_id_e.3
+man/man3/hwloc_memattr_id_t.3
+man/man3/hwloc_memattr_register.3
+man/man3/hwloc_memattr_set_value.3
 man/man3/hwloc_membind_flags_t.3
 man/man3/hwloc_membind_policy_t.3
-man/man3/hwloc_mx_board_get_device_cpuset.3
-man/man3/hwloc_mx_endpoint_get_device_cpuset.3
 man/man3/hwloc_nodeset_from_linux_libnuma_bitmask.3
 man/man3/hwloc_nodeset_from_linux_libnuma_ulongs.3
 man/man3/hwloc_nodeset_t.3
@@ -286,44 +357,57 @@ man/man3/hwloc_nvml_get_device_osdev.3
 man/man3/hwloc_nvml_get_device_osdev_by_index.3
 man/man3/hwloc_obj.3
 man/man3/hwloc_obj_add_info.3
+man/man3/hwloc_obj_add_other_obj_sets.3
 man/man3/hwloc_obj_attr_snprintf.3
 man/man3/hwloc_obj_attr_u.3
 man/man3/hwloc_obj_attr_u_hwloc_bridge_attr_s.3
 man/man3/hwloc_obj_attr_u_hwloc_cache_attr_s.3
 man/man3/hwloc_obj_attr_u_hwloc_group_attr_s.3
+man/man3/hwloc_obj_attr_u_hwloc_numanode_attr_s.3
+man/man3/hwloc_obj_attr_u_hwloc_numanode_attr_s_hwloc_memory_page_type_s.3
 man/man3/hwloc_obj_attr_u_hwloc_osdev_attr_s.3
 man/man3/hwloc_obj_attr_u_hwloc_pcidev_attr_s.3
 man/man3/hwloc_obj_bridge_type_e.3
 man/man3/hwloc_obj_bridge_type_t.3
 man/man3/hwloc_obj_cache_type_e.3
 man/man3/hwloc_obj_cache_type_t.3
-man/man3/hwloc_obj_cpuset_snprintf.3
 man/man3/hwloc_obj_get_info_by_name.3
-man/man3/hwloc_obj_info_s.3
 man/man3/hwloc_obj_is_in_subtree.3
-man/man3/hwloc_obj_memory_s.3
-man/man3/hwloc_obj_memory_s_hwloc_obj_memory_page_type_s.3
 man/man3/hwloc_obj_osdev_type_e.3
 man/man3/hwloc_obj_osdev_type_t.3
+man/man3/hwloc_obj_set_subtype.3
 man/man3/hwloc_obj_t.3
+man/man3/hwloc_obj_type_is_cache.3
+man/man3/hwloc_obj_type_is_dcache.3
+man/man3/hwloc_obj_type_is_icache.3
+man/man3/hwloc_obj_type_is_io.3
+man/man3/hwloc_obj_type_is_memory.3
+man/man3/hwloc_obj_type_is_normal.3
 man/man3/hwloc_obj_type_snprintf.3
-man/man3/hwloc_obj_type_sscanf.3
 man/man3/hwloc_obj_type_string.3
 man/man3/hwloc_obj_type_t.3
 man/man3/hwloc_opencl_get_device_cpuset.3
 man/man3/hwloc_opencl_get_device_osdev.3
 man/man3/hwloc_opencl_get_device_osdev_by_index.3
+man/man3/hwloc_opencl_get_device_pci_busid.3
 man/man3/hwloc_restrict_flags_e.3
+man/man3/hwloc_rsmi_get_device_cpuset.3
+man/man3/hwloc_rsmi_get_device_osdev.3
+man/man3/hwloc_rsmi_get_device_osdev_by_index.3
 man/man3/hwloc_set_area_membind.3
-man/man3/hwloc_set_area_membind_nodeset.3
 man/man3/hwloc_set_cpubind.3
 man/man3/hwloc_set_membind.3
-man/man3/hwloc_set_membind_nodeset.3
 man/man3/hwloc_set_proc_cpubind.3
 man/man3/hwloc_set_proc_membind.3
-man/man3/hwloc_set_proc_membind_nodeset.3
 man/man3/hwloc_set_thread_cpubind.3
+man/man3/hwloc_shmem_topology_adopt.3
+man/man3/hwloc_shmem_topology_get_length.3
+man/man3/hwloc_shmem_topology_write.3
+man/man3/hwloc_topology_abi_check.3
+man/man3/hwloc_topology_alloc_group_object.3
+man/man3/hwloc_topology_allow.3
 man/man3/hwloc_topology_check.3
+man/man3/hwloc_topology_components_flag_e.3
 man/man3/hwloc_topology_cpubind_support.3
 man/man3/hwloc_topology_destroy.3
 man/man3/hwloc_topology_diff_apply.3
@@ -344,32 +428,36 @@ man/man3/hwloc_topology_export_synthetic
 man/man3/hwloc_topology_export_xml.3
 man/man3/hwloc_topology_export_xmlbuffer.3
 man/man3/hwloc_topology_flags_e.3
+man/man3/hwloc_topology_free_group_object.3
 man/man3/hwloc_topology_get_allowed_cpuset.3
 man/man3/hwloc_topology_get_allowed_nodeset.3
 man/man3/hwloc_topology_get_complete_cpuset.3
 man/man3/hwloc_topology_get_complete_nodeset.3
+man/man3/hwloc_topology_get_default_nodeset.3
 man/man3/hwloc_topology_get_depth.3
 man/man3/hwloc_topology_get_flags.3
-man/man3/hwloc_topology_get_online_cpuset.3
 man/man3/hwloc_topology_get_topology_cpuset.3
 man/man3/hwloc_topology_get_topology_nodeset.3
+man/man3/hwloc_topology_get_type_filter.3
 man/man3/hwloc_topology_get_userdata.3
-man/man3/hwloc_topology_ignore_all_keep_structure.3
-man/man3/hwloc_topology_ignore_type.3
-man/man3/hwloc_topology_ignore_type_keep_structure.3
 man/man3/hwloc_topology_init.3
-man/man3/hwloc_topology_insert_misc_object_by_cpuset.3
-man/man3/hwloc_topology_insert_misc_object_by_parent.3
+man/man3/hwloc_topology_insert_group_object.3
+man/man3/hwloc_topology_insert_misc_object.3
 man/man3/hwloc_topology_is_thissystem.3
 man/man3/hwloc_topology_load.3
 man/man3/hwloc_topology_membind_support.3
+man/man3/hwloc_topology_misc_support.3
+man/man3/hwloc_topology_refresh.3
 man/man3/hwloc_topology_restrict.3
-man/man3/hwloc_topology_set_custom.3
-man/man3/hwloc_topology_set_distance_matrix.3
+man/man3/hwloc_topology_set_all_types_filter.3
+man/man3/hwloc_topology_set_cache_types_filter.3
+man/man3/hwloc_topology_set_components.3
 man/man3/hwloc_topology_set_flags.3
-man/man3/hwloc_topology_set_fsroot.3
+man/man3/hwloc_topology_set_icache_types_filter.3
+man/man3/hwloc_topology_set_io_types_filter.3
 man/man3/hwloc_topology_set_pid.3
 man/man3/hwloc_topology_set_synthetic.3
+man/man3/hwloc_topology_set_type_filter.3
 man/man3/hwloc_topology_set_userdata.3
 man/man3/hwloc_topology_set_userdata_export_callback.3
 man/man3/hwloc_topology_set_userdata_import_callback.3
@@ -377,17 +465,26 @@ man/man3/hwloc_topology_set_xml.3
 man/man3/hwloc_topology_set_xmlbuffer.3
 man/man3/hwloc_topology_support.3
 man/man3/hwloc_topology_t.3
+man/man3/hwloc_type_filter_e.3
+man/man3/hwloc_type_sscanf.3
+man/man3/hwloc_type_sscanf_as_depth.3
+man/man3/hwloc_windows_get_nr_processor_groups.3
+man/man3/hwloc_windows_get_processor_group_cpuset.3
 man/man3/hwlocality_advanced_io.3
+man/man3/hwlocality_api_error_reporting.3
 man/man3/hwlocality_api_version.3
 man/man3/hwlocality_bitmap.3
 man/man3/hwlocality_configuration.3
 man/man3/hwlocality_cpubinding.3
+man/man3/hwlocality_cpukinds.3
 man/man3/hwlocality_creation.3
 man/man3/hwlocality_cuda.3
 man/man3/hwlocality_cudart.3
-man/man3/hwlocality_custom.3
 man/man3/hwlocality_diff.3
-man/man3/hwlocality_distances.3
+man/man3/hwlocality_distances_add.3
+man/man3/hwlocality_distances_consult.3
+man/man3/hwlocality_distances_get.3
+man/man3/hwlocality_distances_remove.3
 man/man3/hwlocality_gl.3
 man/man3/hwlocality_glibc_sched.3
 man/man3/hwlocality_helper_ancestors.3
@@ -398,14 +495,16 @@ man/man3/hwlocality_helper_find_inside.3
 man/man3/hwlocality_helper_find_misc.3
 man/man3/hwlocality_helper_nodeset_convert.3
 man/man3/hwlocality_helper_topology_sets.3
+man/man3/hwlocality_helper_types.3
 man/man3/hwlocality_info_attr.3
-man/man3/hwlocality_intel_mic.3
 man/man3/hwlocality_levels.3
+man/man3/hwlocality_levelzero.3
 man/man3/hwlocality_linux.3
 man/man3/hwlocality_linux_libnuma_bitmask.3
 man/man3/hwlocality_linux_libnuma_ulongs.3
+man/man3/hwlocality_memattrs.3
+man/man3/hwlocality_memattrs_manage.3
 man/man3/hwlocality_membinding.3
-man/man3/hwlocality_myriexpress.3
 man/man3/hwlocality_nvml.3
 man/man3/hwlocality_object_sets.3
 man/man3/hwlocality_object_strings.3
@@ -413,11 +512,26 @@ man/man3/hwlocality_object_types.3
 man/man3/hwlocality_objects.3
 man/man3/hwlocality_opencl.3
 man/man3/hwlocality_openfabrics.3
+man/man3/hwlocality_rsmi.3
+man/man3/hwlocality_setsource.3
+man/man3/hwlocality_shmem.3
 man/man3/hwlocality_syntheticexport.3
 man/man3/hwlocality_tinker.3
+man/man3/hwlocality_windows.3
 man/man3/hwlocality_xmlexport.3
 man/man7/hwloc.7
+share/bash-completion/completions/hwloc
+share/doc/hwloc/dynamic_SVG_example.html
 share/doc/hwloc/hwloc-a4.pdf
 share/doc/hwloc/hwloc-letter.pdf
+share/hwloc/hwloc-ps.www/README
+share/hwloc/hwloc-ps.www/assets/index.html
+share/hwloc/hwloc-ps.www/assets/main.css
+share/hwloc/hwloc-ps.www/assets/script.js
+share/hwloc/hwloc-ps.www/assets/style.css
+share/hwloc/hwloc-ps.www/client.js
+share/hwloc/hwloc-ps.www/package.json
 share/hwloc/hwloc-valgrind.supp
 share/hwloc/hwloc.dtd
+share/hwloc/hwloc2-diff.dtd
+share/hwloc/hwloc2.dtd

Index: pkgsrc/parallel/hwloc/buildlink3.mk
diff -u pkgsrc/parallel/hwloc/buildlink3.mk:1.17 pkgsrc/parallel/hwloc/buildlink3.mk:1.18
--- pkgsrc/parallel/hwloc/buildlink3.mk:1.17    Wed Jan  7 08:48:31 2026
+++ pkgsrc/parallel/hwloc/buildlink3.mk Wed Jan  7 18:25:45 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2026/01/07 08:48:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2026/01/07 18:25:45 adam Exp $
 
 BUILDLINK_TREE+=       hwloc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        hwloc
 HWLOC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hwloc+=  hwloc>=1.4
-BUILDLINK_ABI_DEPENDS.hwloc?=  hwloc>=1.11.13nb14
+BUILDLINK_ABI_DEPENDS.hwloc+=  hwloc>=2.12
 BUILDLINK_PKGSRCDIR.hwloc?=    ../../parallel/hwloc
 
 .include "../../mk/bsd.fast.prefs.mk"

Index: pkgsrc/parallel/hwloc/distinfo
diff -u pkgsrc/parallel/hwloc/distinfo:1.16 pkgsrc/parallel/hwloc/distinfo:1.17
--- pkgsrc/parallel/hwloc/distinfo:1.16 Tue Oct 26 11:10:36 2021
+++ pkgsrc/parallel/hwloc/distinfo      Wed Jan  7 18:25:45 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 11:10:36 nia Exp $
+$NetBSD: distinfo,v 1.17 2026/01/07 18:25:45 adam Exp $
 
-BLAKE2s (hwloc-1.11.13.tar.bz2) = cb510d17dc6a8c5b4c78cd337fce717c20dc8a9a52dca4abcd74bfc858ddb3c3
-SHA512 (hwloc-1.11.13.tar.bz2) = dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
-Size (hwloc-1.11.13.tar.bz2) = 4120436 bytes
+BLAKE2s (hwloc-2.12.2.tar.bz2) = ed2056f017e992b70b4328f92b582fc343b64f2b2a5497c29fe50d658b7fbbb8
+SHA512 (hwloc-2.12.2.tar.bz2) = 949d6c9d7b858ee58e477b15e6c06f57812872142fa1c7f3ef20aae2e4ef954135f839e8604404bfd0637fde99729c7d00211c8aee860dfde9ac60bba0e78aef
+Size (hwloc-2.12.2.tar.bz2) = 5617977 bytes