guix_mirror_bot pushed a commit to branch hpc-team
in repository guix.
commit e88753249737d60b97bfc2e2a738a3d45e5fd55d
Author: Cayetano Santos <[email protected]>
AuthorDate: Fri Aug 21 11:48:05 2026 +0200
gnu: hwloc: Update to 2.14.0.
* gnu/packages/mpi.scm (hwloc): Update to 2.14.0.
* gnu/packages/patches/hwloc-add-with-opencl.patch: Delete patch,
applied upstream.
* gnu/local.mk: Unregister it.
Merges guix/guix!9190
Signed-off-by: Cayetano Santos <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/mpi.scm | 6 +-
gnu/packages/patches/hwloc-add-with-opencl.patch | 90 ------------------------
3 files changed, 2 insertions(+), 95 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 8c6bb0041d1..1ac20bee026 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1638,7 +1638,6 @@ dist_patch_DATA =
\
%D%/packages/patches/hurd-pfinet-recv-control-block.patch \
%D%/packages/patches/hurd-refcounts-assert.patch \
%D%/packages/patches/hurd-rumpdisk-no-hd.patch \
- %D%/packages/patches/hwloc-add-with-opencl.patch \
%D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch \
%D%/packages/patches/i7z-gcc-10.patch \
%D%/packages/patches/icecat-adjust-mozilla-desktop.patch \
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 2bf77a8d7ce..1b8e19f15e6 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -79,7 +79,7 @@
(define-public hwloc
(package
(name "hwloc")
- (version "2.13.0")
+ (version "2.14.0")
(source
(origin
(method git-fetch)
@@ -88,9 +88,7 @@
(commit (string-append "hwloc-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1l9skkcizlv0qvw2lzmysndbm528xvszhiqq3569da157qpa5xav"))
- ;; XXX: Remove after updating package from 2.13.0.
- (patches (search-patches "hwloc-add-with-opencl.patch"))))
+ (base32 "09j3d997qqpmwp10l1p4d34iq5s2hwxzbsmzdgnw2lcy8av7rf4m"))))
(build-system gnu-build-system)
(outputs '("out" ;'lstopo' & co., depends on Cairo, libx11, etc.
"lib" ;small closure
diff --git a/gnu/packages/patches/hwloc-add-with-opencl.patch
b/gnu/packages/patches/hwloc-add-with-opencl.patch
deleted file mode 100644
index 03a16d34d0e..00000000000
--- a/gnu/packages/patches/hwloc-add-with-opencl.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From f30cc463a948260088b496c3609dd91c83c0ce1b Mon Sep 17 00:00:00 2001
-From: Brice Goglin <[email protected]>
-Date: Mon, 16 Feb 2026 15:00:53 +0100
-Subject: [PATCH] configure: add --with-opencl=<dir>
-
-For non-ROCm non-CUDA installs.
-
-Thanks to Romain Garbage for the suggestion.
-
-Signed-off-by: Brice Goglin <[email protected]>
-(cherry picked from commit 462eff5a4541dfcb3db15034490c796c4f1d8ec6)
----
- config/hwloc.m4 | 18 +++++++++++++++---
- config/hwloc_internal.m4 | 13 ++++++++++++-
- 2 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/config/hwloc.m4 b/config/hwloc.m4
-index e0057e8e5..4a26a7ec0 100644
---- a/config/hwloc.m4
-+++ b/config/hwloc.m4
-@@ -1,7 +1,7 @@
- dnl -*- Autoconf -*-
- dnl
- dnl SPDX-License-Identifier: BSD-3-Clause
--dnl Copyright © 2009-2025 Inria. All rights reserved.
-+dnl Copyright © 2009-2026 Inria. All rights reserved.
- dnl Copyright © 2009-2012, 2015-2017, 2020, 2023, 2025 Université Bordeaux
- dnl Copyright © 2004-2005 The Trustees of Indiana University and Indiana
- dnl University Research and Technology
-@@ -1365,6 +1365,18 @@ return rsmi_init(0);
- echo "**** OpenCL configuration"
-
- hwloc_opencl_happy=yes
-+
-+ if test "x$with_opencl" != x -a "x$with_opencl" != xyes; then
-+ opencl_dir=$with_opencl
-+ AC_MSG_NOTICE([using custom OpenCL install path $opencl_dir ...])
-+ else
-+ AC_MSG_NOTICE([assuming OpenCL is installed in standard directories
...])
-+ fi
-+ if test "x$opencl_dir" != x; then
-+ HWLOC_OPENCL_CPPFLAGS="-I$opencl_dir/include/"
-+ HWLOC_OPENCL_LDFLAGS="-L$opencl_dir/lib/"
-+ fi
-+
- case ${target} in
- *-*-darwin*)
- # On Darwin, only use the OpenCL framework
-@@ -1387,8 +1399,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
- ;;
- *)
- # On Others, look for OpenCL at normal locations
-- HWLOC_OPENCL_CPPFLAGS="$HWLOC_CUDA_COMMON_CPPFLAGS"
-- HWLOC_OPENCL_LDFLAGS="$HWLOC_CUDA_COMMON_LDFLAGS"
-+ HWLOC_OPENCL_CPPFLAGS="$HWLOC_OPENCL_CPPFLAGS
$HWLOC_CUDA_COMMON_CPPFLAGS"
-+ HWLOC_OPENCL_LDFLAGS="$HWLOC_OPENCL_LDFLAGS
$HWLOC_CUDA_COMMON_LDFLAGS"
- if test "x$rocm_dir" != x; then
- if test -d "$rocm_dir/include/CL"; then
- HWLOC_OPENCL_CPPFLAGS="$HWLOC_OPENCL_CPPFLAGS
-I$rocm_dir/include/"
-diff --git a/config/hwloc_internal.m4 b/config/hwloc_internal.m4
-index da6505e91..1135a245f 100644
---- a/config/hwloc_internal.m4
-+++ b/config/hwloc_internal.m4
-@@ -1,7 +1,7 @@
- dnl -*- Autoconf -*-
- dnl
- dnl SPDX-License-Identifier: BSD-3-Clause
--dnl Copyright © 2010-2025 Inria. All rights reserved.
-+dnl Copyright © 2010-2026 Inria. All rights reserved.
- dnl Copyright © 2009, 2011 Université Bordeaux
- dnl Copyright © 2004-2005 The Trustees of Indiana University and Indiana
- dnl University Research and Technology
-@@ -147,6 +147,17 @@ AC_DEFUN([HWLOC_DEFINE_ARGS],[
- [AC_MSG_ERROR([--with-amdgpu=<dir> missing the
installation directory])])]
- )
-
-+ # OpenCL
-+ AC_ARG_ENABLE([opencl],
-+ AS_HELP_STRING([--disable-opencl],
-+ [Disable the OpenCL device discovery]))
-+ AC_ARG_WITH([opencl],
-+ AS_HELP_STRING([--with-opencl=<dir>],
-+ [Specify the OpenCL installation directory]),
-+ [AS_IF([test "x$withval" = xyes -o "x$withval" = x],
-+ [AC_MSG_ERROR([--with-opencl=<dir> missing the
installation directory])])]
-+ )
-+
- # LevelZero
- AC_ARG_ENABLE([levelzero],
- AS_HELP_STRING([--disable-levelzero],
