From 47d1b5d5dd20491db1ec2c54e9b486293990eba5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 12 Feb 2024 14:09:56 +0100 Subject: [PATCH 1/2] remove numa configure option from hwloc 2.2+ --- easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-10.2.0.eb | 3 +-- easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-9.3.0.eb | 3 +-- easybuild/easyconfigs/h/hwloc/hwloc-2.4.1-GCCcore-10.3.0.eb | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-10.2.0.eb index ddabd3a7381..f3d9db107b4 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-10.2.0.eb @@ -35,8 +35,7 @@ dependencies = [ ('libpciaccess', '0.16'), ] -configopts = "--enable-libnuma=$EBROOTNUMACTL " -configopts += "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " +configopts = "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " sanity_check_paths = { 'files': ['bin/lstopo', 'include/hwloc/linux.h', diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-9.3.0.eb index a109e5d7a9b..a4faff0a428 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-9.3.0.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-2.2.0-GCCcore-9.3.0.eb @@ -35,8 +35,7 @@ dependencies = [ ('libpciaccess', '0.16'), ] -configopts = "--enable-libnuma=$EBROOTNUMACTL " -configopts += "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " +configopts = "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " sanity_check_paths = { 'files': ['bin/lstopo', 'include/hwloc/linux.h', diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-2.4.1-GCCcore-10.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-2.4.1-GCCcore-10.3.0.eb index d107ffdc713..c073323d16a 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-2.4.1-GCCcore-10.3.0.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-2.4.1-GCCcore-10.3.0.eb @@ -38,8 +38,7 @@ dependencies = [ ('libpciaccess', '0.16'), ] -configopts = "--enable-libnuma=$EBROOTNUMACTL " -configopts += "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " +configopts = "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " sanity_check_paths = { 'files': ['bin/lstopo', 'include/hwloc/linux.h', From 78d48913b8900e9ebf31b36882fdd764e88b4bfb Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 12 Feb 2024 14:12:17 +0100 Subject: [PATCH 2/2] remove numa configure option from hwloc 2+ --- easybuild/easyconfigs/h/hwloc/hwloc-2.0.2-GCCcore-8.2.0.eb | 3 +-- easybuild/easyconfigs/h/hwloc/hwloc-2.0.3-GCCcore-8.3.0.eb | 3 +-- easybuild/easyconfigs/h/hwloc/hwloc-2.1.0-GCCcore-9.2.0.eb | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-2.0.2-GCCcore-8.2.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-2.0.2-GCCcore-8.2.0.eb index 72e874914ce..8cfa41cb0c5 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-2.0.2-GCCcore-8.2.0.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-2.0.2-GCCcore-8.2.0.eb @@ -35,8 +35,7 @@ dependencies = [ ('libpciaccess', '0.14'), ] -configopts = "--enable-libnuma=$EBROOTNUMACTL " -configopts += "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " +configopts = "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " sanity_check_paths = { 'files': ['bin/lstopo', 'include/hwloc/linux.h', diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-2.0.3-GCCcore-8.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-2.0.3-GCCcore-8.3.0.eb index 78cc42f4ed7..c9c64f7bbfc 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-2.0.3-GCCcore-8.3.0.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-2.0.3-GCCcore-8.3.0.eb @@ -35,8 +35,7 @@ dependencies = [ ('libpciaccess', '0.14'), ] -configopts = "--enable-libnuma=$EBROOTNUMACTL " -configopts += "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " +configopts = "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " sanity_check_paths = { 'files': ['bin/lstopo', 'include/hwloc/linux.h', diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-2.1.0-GCCcore-9.2.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-2.1.0-GCCcore-9.2.0.eb index ed6d9b15b31..4abf2d989ab 100644 --- a/easybuild/easyconfigs/h/hwloc/hwloc-2.1.0-GCCcore-9.2.0.eb +++ b/easybuild/easyconfigs/h/hwloc/hwloc-2.1.0-GCCcore-9.2.0.eb @@ -35,8 +35,7 @@ dependencies = [ ('libpciaccess', '0.16'), ] -configopts = "--enable-libnuma=$EBROOTNUMACTL " -configopts += "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " +configopts = "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " sanity_check_paths = { 'files': ['bin/lstopo', 'include/hwloc/linux.h',