Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
ee494dc8b4
!34 [sync] PR-33: add loongarch64 and sw_64 support
From: @openeuler-sync-bot 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
2023-09-21 12:19:27 +00:00
panchenbo
b3c5ea22e9 add loongarch64 and sw_64 support
(cherry picked from commit 55d7f4c6de18f0fd81f4bfec1d462c215b30a5f9)
2023-09-21 19:14:55 +08:00
openeuler-ci-bot
37965d637b
!24 [sync] PR-23: Fix build error in openEuler-Mainline
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-11-01 01:15:38 +00:00
baizg1107
a63b2a5ef1 fix hwloc undelared
(cherry picked from commit 52a6512c97923196278aa869d928dfcaedbec451)
2022-10-31 18:05:21 +08:00
openeuler-ci-bot
57d0fb1422 !5 fix failure caused by GCC upgrade to 10
From: @Lin__Jiaxin
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-08-04 07:51:54 +00:00
linjiaxin
d226a72dc9 update mpich.spec.
Mismatches between actual and dummy argument lists in a single file are now rejected with an error. Use the new option -fallow-argument-mismatch to turn these errors into warnings; this option is implied with -std=legacy. -Wargument-mismatch has been removed.
refer to: https://gcc.gnu.org/gcc-10/changes.html
2021-08-02 08:06:28 +00:00
openeuler-ci-bot
6b4717b257 !4 delete unnessary file
From: @wangxiao65
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-10-30 14:32:19 +08:00
wangxiao65
5aae770ba5 delete unnessary file 2020-10-30 11:43:50 +08:00
openeuler-ci-bot
0334a9ad94 !3 drop python2 subpackage
From: @wangxiao65
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-10-30 10:11:07 +08:00
wangxiao65
bdeb464147 drop python2 subpackage 2020-10-29 11:36:35 +08:00
3 changed files with 53 additions and 22 deletions

View File

@ -0,0 +1,25 @@
From 8b755526b701806eeb688e1fd139e638602c67b6 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
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

View File

@ -1 +0,0 @@
import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s))

View File

@ -1,18 +1,23 @@
Summary: A high-performance implementation of MPI
Name: mpich
Version: 3.2.1
Release: 10
Release: 15
License: MIT
URL: http://www.mpich.org/
Source0: http://www.mpich.org/static/downloads/%{version}/mpich-%{version}.tar.gz
Source1: mpich.macros
Source2: mpich.pth.py2
Source3: mpich.pth.py3
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
BuildRequires: python3-devel automake
%ifarch %valgrind_arches
BuildRequires: valgrind-devel
%endif
BuildRequires: gcc gcc-c++ gcc-gfortran hwloc-devel >= 1.8 valgrind-devel
BuildRequires: python2-devel python3-devel automake
Provides: mpi
Provides: mpich2 = %{version}
Obsoletes: mpich2 < 3.0
@ -53,12 +58,6 @@ Obsoletes: mpich-doc < %{version}-%{release}
%description help
Contains documentations, examples and man-pages for mpich.
%package -n python2-mpich
Summary: mpich support for Python 2
%description -n python2-mpich
mpich support for Python 2.
%package -n python3-mpich
Summary: mpich support for Python 3
@ -73,7 +72,7 @@ mpich support for Python 3.
%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
%{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
%ifarch aarch64
%ifarch aarch64 sw_64 loongarch64
%global m_option ""
%else
%global m_option -m64
@ -108,7 +107,7 @@ mpich support for Python 3.
CFLAGS="%{m_option} -O2 %{?XFLAGS}" \
CXXFLAGS="%{m_option} -O2 %{?XFLAGS}" \
FCFLAGS="%{m_option} -O2 %{?XFLAGS}" \
FFLAGS="%{m_option} -O2 %{?XFLAGS}" \
FFLAGS="%{m_option} -O2 %{?XFLAGS} -fallow-argument-mismatch" \
LDFLAGS='-Wl,-z,noexecstack' \
MPICHLIB_CFLAGS="%{?opt_cc_cflags}" \
MPICHLIB_CXXFLAGS="%{optflags}" \
@ -139,7 +138,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
sed -r 's|%{_bindir}|%{_libdir}/mpich/bin|;
s|@LIBDIR@|%{_libdir}/mpich|;
s|@MPINAME@|mpich|;
s|@py2sitearch@|%{python2_sitearch}|;
s|@py3sitearch@|%{python3_sitearch}|;
s|@ARCH@|%{_arch}|;
s|@fortranmoddir@|%{_fmoddir}|;
@ -155,10 +153,8 @@ cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh}
install -pDm0644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.mpich
mkdir -p %{buildroot}%{python2_sitearch}/mpich
install -pDm0644 %{SOURCE2} %{buildroot}%{python2_sitearch}/mpich.pth
mkdir -p %{buildroot}%{python3_sitearch}/mpich
install -pDm0644 %{SOURCE3} %{buildroot}%{python3_sitearch}/mpich.pth
install -pDm0644 %{SOURCE2} %{buildroot}%{python3_sitearch}/mpich.pth
find %{buildroot} -type f -name "*.la" -delete
@ -207,15 +203,26 @@ make check V=1
%{_mandir}/mpich-%{_arch}/man1/
%{_mandir}/mpich-%{_arch}/man3/
%files -n python2-mpich
%dir %{python2_sitearch}/mpich
%{python2_sitearch}/mpich.pth
%files -n python3-mpich
%dir %{python3_sitearch}/mpich
%{python3_sitearch}/mpich.pth
%changelog
* Tue Aug 22 2023 panchenbo <panchenbo@kylinsec.com.cn> - 3.2.1-15
- add loongarch64 and sw_64 support
* Fri Jun 17 2022 baizhonggui <baizhonggui@h-partners.com> - 3.2.1-14
- Fix hwloc undeclared
* Mon Aug 02 2021 linjiaxin5 <linjiaxin5@huawei.com> - 3.2.1-13
- Fix failure caused by GCC upgrade to 10
* Fri Oct 30 2020 wangxiao <wangxiao65@huawei.com> - 3.2.1-12
- delete unnessary file
* Wed Oct 21 2020 wangxiao <wangxiao65@huawei.com> - 3.2.1-11
- drop python2 subpackage
* Sat Mar 14 2020 sunguoshuai <sunguoshuai@huawei.com> - 3.2.1-10
- del rpm-mpi-hooks deps.