From a63b2a5ef1ee6f852cb08dce3dca18a571e4f1f2 Mon Sep 17 00:00:00 2001 From: baizg1107 Date: Fri, 17 Jun 2022 17:47:26 +0800 Subject: [PATCH] fix hwloc undelared (cherry picked from commit 52a6512c97923196278aa869d928dfcaedbec451) --- fix-hwloc-undeclared.patch | 25 +++++++++++++++++++++++++ mpich.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 fix-hwloc-undeclared.patch diff --git a/fix-hwloc-undeclared.patch b/fix-hwloc-undeclared.patch new file mode 100644 index 0000000..ed7ecda --- /dev/null +++ b/fix-hwloc-undeclared.patch @@ -0,0 +1,25 @@ +From 8b755526b701806eeb688e1fd139e638602c67b6 Mon Sep 17 00:00:00 2001 +From: baizg1107 +Date: Fri, 17 Jun 2022 17:36:23 +0800 +Subject: [PATCH] fix hwloc undeclared + +--- + src/pm/hydra/tools/topo/hwloc/topo_hwloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c +index 8fff355..d33d15f 100644 +--- a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c ++++ b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c +@@ -428,7 +428,7 @@ HYD_status HYDT_topo_hwloc_init(const char *binding, const char *mapping, const + HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_INTERLEAVE; + } + else if (!strncmp(membind, "replicate:", strlen("replicate:"))) { +- HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_REPLICATE; ++ HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_MIGRATE; + } + else { + HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, +-- +2.27.0 + diff --git a/mpich.spec b/mpich.spec index 2889c78..703062c 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,7 +1,7 @@ Summary: A high-performance implementation of MPI Name: mpich Version: 3.2.1 -Release: 13 +Release: 14 License: MIT URL: http://www.mpich.org/ Source0: http://www.mpich.org/static/downloads/%{version}/mpich-%{version}.tar.gz @@ -9,6 +9,7 @@ Source1: mpich.macros Source2: mpich.pth.py3 Patch0: mpich-modules.patch Patch3: 0003-soften-version-check.patch +Patch4: fix-hwloc-undeclared.patch BuildRequires: gcc gcc-c++ gcc-gfortran hwloc-devel >= 1.8 valgrind-devel BuildRequires: python3-devel automake @@ -202,6 +203,9 @@ make check V=1 %{python3_sitearch}/mpich.pth %changelog +* Fri Jun 17 2022 baizhonggui - 3.2.1-14 +- Fix hwloc undeclared + * Mon Aug 02 2021 linjiaxin5 - 3.2.1-13 - Fix failure caused by GCC upgrade to 10 -- Gitee