packages/mpich
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!25 update version from 3.2.1 to 4.0.3

Browse Source 
From: @dan1111 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-01-29 08:08:11 +00:00 committed by Gitee
commit 1ca825dac2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 72 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0003-soften-version-check.patch
View File

@ -1,13 +0,0 @@
diff --git mpich-3.2/./src/binding/cxx/mpicxx.h.in~ mpich-3.2/./src/binding/cxx/mpicxx.h.in
index 375c081e0e..24f1d6c2cc 100644
--- mpich-3.2/./src/binding/cxx/mpicxx.h.in~
+++ mpich-3.2/./src/binding/cxx/mpicxx.h.in
@@ -17,7 +17,7 @@
// between 3.2.3 and 3.4.3 (!!) Normally such changes
// should only occur at major releases (e.g., version 3 to 4)
#ifdef __GNUC__
-# if __GNUC__ >= @GNUCXX_VERSION@
+# if __GNUC__ >= @GNUCXX_VERSION@ && @GNUCXX_VERSION@ == 3
# if __GNUC_MINOR__ > 2 && @GNUCXX_MINORVERSION@ == 2
# error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
# endif

25
fix-hwloc-undeclared.patch
View File

@ -1,25 +0,0 @@
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

BIN
mpich-3.2.1.tar.gz
View File

Binary file not shown.

BIN
mpich-4.0.3.tar.gz Normal file
View File

Binary file not shown.

21
mpich.spec
View File

@ -1,15 +1,14 @@
Summary: A high-performance implementation of MPI
Name: mpich
Version: 3.2.1
Release: 14
Version: 4.0.3
Release: 1
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.py3
Patch0: mpich-modules.patch
Patch3: 0003-soften-version-check.patch
Patch4: fix-hwloc-undeclared.patch
Patch1: remove_json_c_conflict_glibc.patch
BuildRequires: gcc gcc-c++ gcc-gfortran hwloc-devel >= 1.8 valgrind-devel
BuildRequires: python3-devel automake
@ -80,6 +79,7 @@ mpich support for Python 3.
%build
%configure \
--disable-fortran --prefix=$DIR/mpich \
--enable-sharedlibs=gcc \
--enable-shared \
--enable-static=no \
@ -125,9 +125,6 @@ sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
%install
%make_install
mkdir -p %{buildroot}%{_fmoddir}/mpich
mv %{buildroot}%{_includedir}/mpich-*/*.mod %{buildroot}%{_fmoddir}/mpich/
sed -r -i 's|^modincdir=.*|modincdir=%{_fmoddir}/mpich|' %{buildroot}%{_libdir}/mpich/bin/mpifort
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
sed -r 's|%{_bindir}|%{_libdir}/mpich/bin|;
@ -185,24 +182,20 @@ make check V=1
%{_libdir}/mpich/bin/mpicc
%{_libdir}/mpich/bin/mpic++
%{_libdir}/mpich/bin/mpicxx
%{_libdir}/mpich/bin/mpif77
%{_libdir}/mpich/bin/mpif90
%{_libdir}/mpich/bin/mpifort
%{_fmoddir}/mpich/
%{_rpmconfigdir}/macros.d/macros.mpich
%files help
%dir %{_datadir}/mpich
%{_datadir}/mpich/doc/
%dir %{_mandir}/mpich-%{_arch}
%{_mandir}/mpich-%{_arch}/man1/
%{_mandir}/mpich-%{_arch}/man3/
%files -n python3-mpich
%dir %{python3_sitearch}/mpich
%{python3_sitearch}/mpich.pth
%changelog
* Sat Nov 12 2022 hua <dchang@zhixundn.com> 4.0.3-1
- update to 4.0.3
* Fri Jun 17 2022 baizhonggui <baizhonggui@h-partners.com> - 3.2.1-14
- Fix hwloc undeclared

65
remove_json_c_conflict_glibc.patch Normal file
View File

@ -0,0 +1,65 @@
diff -ruN mpich/modules/json-c/CMakeLists.txt mpich-4.0.3/modules/json-c/CMakeLists.txt
--- mpich/modules/json-c/CMakeLists.txt 2023-01-18 10:35:56.712610706 +0800
+++ mpich-4.0.3/modules/json-c/CMakeLists.txt 2023-01-18 10:39:25.377219492 +0800
@@ -30,7 +30,6 @@
if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING AND
(NOT MSVC OR NOT (MSVC_VERSION LESS 1800)) # Tests need at least VS2013
)
-add_subdirectory(tests)
endif()
# Set some packaging variables.
diff -ruN mpich/modules/json-c/configure.ac mpich-4.0.3/modules/json-c/configure.ac
--- mpich/modules/json-c/configure.ac 2023-01-18 10:35:56.723610563 +0800
+++ mpich-4.0.3/modules/json-c/configure.ac 2023-01-18 10:39:29.171175850 +0800
@@ -215,7 +215,6 @@
AC_CONFIG_FILES([
Makefile
json-c.pc
-tests/Makefile
json-c-uninstalled.pc
])
diff -ruN mpich/modules/json-c/Makefile.am mpich-4.0.3/modules/json-c/Makefile.am
--- mpich/modules/json-c/Makefile.am 2023-01-18 10:35:56.723610563 +0800
+++ mpich-4.0.3/modules/json-c/Makefile.am 2023-01-18 10:39:34.581113611 +0800
@@ -10,7 +10,7 @@
chmod -R u+w "$(distdir)/doc"
cd "$(distdir)" && doxygen
-SUBDIRS = . tests
+SUBDIRS = .
if EMBEDDED_BUILD
noinst_LTLIBRARIES = libjson-c.la
@@ -98,8 +98,7 @@
install-sh \
ltmain.sh \
missing \
- test-driver \
- tests/Makefile.in
+ test-driver
JSON_CLEANFILES+= \
libtool \
stamp-h1 \
diff -ruN mpich/modules/json-c/Makefile.in mpich-4.0.3/modules/json-c/Makefile.in
--- mpich/modules/json-c/Makefile.in 2023-01-18 10:35:56.723610563 +0800
+++ mpich-4.0.3/modules/json-c/Makefile.in 2023-01-18 10:39:35.348104790 +0800
@@ -416,7 +416,7 @@
ACLOCAL_AMFLAGS = -I autoconf-archive/m4
EXTRA_DIST = README.md README.html config.h.win32 Doxyfile \
issues_closed_for_0.13.md
-SUBDIRS = . tests
+SUBDIRS = .
@EMBEDDED_BUILD_TRUE@noinst_LTLIBRARIES = libjson-c.la
@EMBEDDED_BUILD_FALSE@lib_LTLIBRARIES = libjson-c.la
@@ -471,7 +471,7 @@
json_config.h
JSON_CLEANFILES = Makefile.in aclocal.m4 autom4te.cache/ compile \
config.guess config.h.in config.sub configure depcomp \
- install-sh ltmain.sh missing test-driver tests/Makefile.in \
+ install-sh ltmain.sh missing test-driver \
libtool stamp-h1 stamp-h2
ANDROID_CFLAGS = -I$(top_srcdir) -DHAVE_CONFIG_H
all: config.h json_config.h