The package rpms/MUMPS.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/MUMPS.git/commit/?id=93d75872f01c04a....
Change: +%ifarch %{openblas_arches}
Thanks.
Full change: ============
commit c25118ebe93b78894f1914bee11c22b865a6cba0 Author: sagitter sagitter@fedoraproject.org Date: Mon Jun 19 18:26:39 2017 +0200
Generate and install libmpiseq libraries (bug fix)
diff --git a/MUMPS-shared-seq-openmp.patch b/MUMPS-shared-seq-openmp.patch index 8b6eb66..20d2831 100644 --- a/MUMPS-shared-seq-openmp.patch +++ b/MUMPS-shared-seq-openmp.patch @@ -2,13 +2,25 @@ Create a shared version of the sequential library, MUST BE LAST IN SERIES
--- libseq/Makefile +++ libseq/Makefile +@@ -8,7 +8,7 @@ + include ../Makefile.inc + +-libmpiseq: libmpiseq$(PLAT)$(LIBEXT) ++libmpiseq: libmpiseq$(PLAT)$(LIBEXT) libmpiseqo$(PLAT).so + + libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o + $(AR)$@ mpi.o mpic.o elapse.o + + +--- libseq/Makefile ++++ libseq/Makefile @@ -13,10 +13,13 @@ libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o $(AR)$@ mpi.o mpic.o elapse.o $(RANLIB) $@ +libmpiseqo$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseqo$(PLAT).so.5.1.1 -o libmpiseqo$(PLAT).so.5.1.1 -+ ln -s libmpiseqo$(PLAT).so.5.1.1 $@ ++ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseqo$(PLAT)-5.1.1.so -o libmpiseqo$(PLAT)-5.1.1.so ++ ln -s libmpiseqo$(PLAT)-5.1.1.so $@ .f.o: - $(FC) $(OPTF) -c $*.f $(OUTF)$*.o + $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o diff --git a/MUMPS-shared-seq.patch b/MUMPS-shared-seq.patch index caec118..6c05248 100644 --- a/MUMPS-shared-seq.patch +++ b/MUMPS-shared-seq.patch @@ -2,13 +2,24 @@ Create a shared version of the sequential library, MUST BE LAST IN SERIES
--- libseq/Makefile +++ libseq/Makefile +@@ -8,7 +8,7 @@ + include ../Makefile.inc + +-libmpiseq: libmpiseq$(PLAT)$(LIBEXT) ++libmpiseq: libmpiseq$(PLAT)$(LIBEXT) libmpiseq$(PLAT).so + + libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o + $(AR)$@ mpi.o mpic.o elapse.o + +--- libseq/Makefile ++++ libseq/Makefile @@ -13,10 +13,13 @@ libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o $(AR)$@ mpi.o mpic.o elapse.o $(RANLIB) $@ +libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseq$(PLAT).so.5.1.1 -o libmpiseq$(PLAT).so.5.1.1 -+ ln -s libmpiseq$(PLAT).so.5.1.1 $@ ++ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseq$(PLAT)-5.1.1.so -o libmpiseq$(PLAT)-5.1.1.so ++ ln -s libmpiseq$(PLAT)-5.1.1.so $@ .f.o: - $(FC) $(OPTF) -c $*.f $(OUTF)$*.o + $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o diff --git a/MUMPS.spec b/MUMPS.spec index 7256752..ec6176f 100644 --- a/MUMPS.spec +++ b/MUMPS.spec @@ -59,7 +59,7 @@
Name: MUMPS Version: 5.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A MUltifrontal Massively Parallel sparse direct Solver License: CeCILL-C Group: Development/Libraries @@ -654,6 +654,8 @@ install -cpm 755 %{name}-%{version}/lib/lib*mumps.so $RPM_BUILD_ROOT%{_libdir} install -cpm 755 %{name}-%{version}/lib/lib*mumps-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir} install -cpm 755 %{name}-%{version}/lib/libpord-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir} install -cpm 755 %{name}-%{version}/lib/libpord.so $RPM_BUILD_ROOT%{_libdir} +install -cpm 755 %{name}-%{version}/lib/libmpiseq-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir} +install -cpm 755 %{name}-%{version}/lib/libmpiseq.so $RPM_BUILD_ROOT%{_libdir}
# Make symbolic links instead hard-link ln -sf %{_libdir}/libsmumps-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libsmumps.so @@ -662,6 +664,7 @@ ln -sf %{_libdir}/libzmumps-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libzm ln -sf %{_libdir}/libdmumps-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libdmumps.so ln -sf %{_libdir}/libmumps_common-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libmumps_common.so ln -sf %{_libdir}/libpord-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libpord.so +ln -sf %{_libdir}/libmpiseq-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libmpiseq.so
install -cpm 755 %{name}-%{version}/examples/?simpletest $RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}/examples install -cpm 755 %{name}-%{version}/examples/input_* $RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}/examples @@ -683,6 +686,8 @@ install -cpm 755 %{name}-%{version}-openmp/lib/lib*mumpso.so $RPM_BUILD_ROOT%{_l install -cpm 755 %{name}-%{version}-openmp/lib/lib*mumpso-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir} install -cpm 755 %{name}-%{version}-openmp/lib/libpordo-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir} install -cpm 755 %{name}-%{version}-openmp/lib/libpordo.so $RPM_BUILD_ROOT%{_libdir} +install -cpm 755 %{name}-%{version}-openmp/lib/libmpiseqo-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir} +install -cpm 755 %{name}-%{version}-openmp/lib/libpordo.so $RPM_BUILD_ROOT%{_libdir}
# Make symbolic links instead hard-link ln -sf %{_libdir}/libsmumpso-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libsmumpso.so @@ -691,6 +696,7 @@ ln -sf %{_libdir}/libzmumpso-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libz ln -sf %{_libdir}/libdmumpso-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libdmumpso.so ln -sf %{_libdir}/libmumpso_common-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libmumpso_common.so ln -sf %{_libdir}/libpordo-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libpordo.so +ln -sf %{_libdir}/libmpiseqo-%{soname_version}.so $RPM_BUILD_ROOT%{_libdir}/libmpiseqo.so
install -cpm 755 %{name}-%{version}-openmp/examples/?simpletest $RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}-openmp/examples install -cpm 755 %{name}-%{version}-openmp/examples/input_* $RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}-openmp/examples @@ -744,6 +750,7 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
%files %{_libdir}/libpord-%{soname_version}.so +%{_libdir}/libmpiseq-%{soname_version}.so %{_libdir}/lib?mumps-%{soname_version}.so %{_libdir}/libmumps_common-%{soname_version}.so
@@ -754,6 +761,7 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %{_libdir}/lib?mumps.so %{_libdir}/libmumps_common.so %{_libdir}/libpord.so +%{_libdir}/libmpiseq.so
%files examples %{_libexecdir}/%{name}-%{version}/ @@ -762,6 +770,7 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?with_openmp} %files openmp +%{_libdir}/libmpiseqo-%{soname_version}.so %{_libdir}/libpordo-%{soname_version}.so %{_libdir}/lib?mumpso-%{soname_version}.so %{_libdir}/libmumpso_common-%{soname_version}.so @@ -770,6 +779,7 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %{_libdir}/lib?mumpso.so %{_libdir}/libmumpso_common.so %{_libdir}/libpordo.so +%{_libdir}/libmpiseqo.so %{_fmoddir}/%{name}-openmp-%{version}/
%files openmp-examples @@ -784,6 +794,9 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %license LICENSE
%changelog +* Mon Jun 19 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.1-2 +- Generate and install libmpiseq libraries (bug fix) + * Tue Mar 21 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.1-1 - Update to 5.1.1 - Build openmp version on Fedora and Rhel7 only
commit 1e18137c994cfffb2727fa21180bbedca4b591da Author: sagitter sagitter@fedoraproject.org Date: Thu Mar 23 17:29:03 2017 +0100
Update to 5.1.1
diff --git a/.gitignore b/.gitignore index 29b1365..fe64264 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /MUMPS_5.0.0.tar.gz /MUMPS_5.0.1.tar.gz /MUMPS_5.0.2.tar.gz +/MUMPS_5.1.1.tar.gz diff --git a/MUMPS-Makefile.par.inc b/MUMPS-Makefile.par.inc index 9d3d921..6216f14 100644 --- a/MUMPS-Makefile.par.inc +++ b/MUMPS-Makefile.par.inc @@ -91,7 +91,7 @@ LIBOTHERS = -lpthread CDEFS = -DAdd_
#Begin Optimized options -OPTF = @@CFLAGS@@ -Dintel_ -DALLOW_NON_INIT +OPTF = @@CFLAGS@@ -Dintel_ OPTL = @@-O@@ OPTC = @@CFLAGS@@ #End Optimized options diff --git a/MUMPS-Makefile.seq.inc b/MUMPS-Makefile.seq.inc index 4bccf65..3b62a07 100644 --- a/MUMPS-Makefile.seq.inc +++ b/MUMPS-Makefile.seq.inc @@ -82,7 +82,7 @@ METISLIB = -lmetis CDEFS = -DAdd_
#Begin Optimized options -OPTF = @@CFLAGS@@ -Dintel_ -DALLOW_NON_INIT +OPTF = @@CFLAGS@@ -Dintel_ OPTL = @@-O@@ OPTC = @@CFLAGS@@ #End Optimized options diff --git a/MUMPS-examples-mpilibs.patch b/MUMPS-examples-mpilibs.patch index dd3b278..117234a 100644 --- a/MUMPS-examples-mpilibs.patch +++ b/MUMPS-examples-mpilibs.patch @@ -4,7 +4,7 @@ Index: mumps/examples/Makefile =================================================================== --- mumps.orig/examples/Makefile +++ mumps/examples/Makefile -@@ -26,29 +26,29 @@ +@@ -27,28 +27,28 @@ LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
ssimpletest: $(LIBSMUMPS) $$@.o @@ -32,10 +32,9 @@ Index: mumps/examples/Makefile - $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(MUMPS_LIBF77) $(LIBBLAS) $(LIBOTHERS)
- c_example: $(LIBDMUMPS) $$@.o - $(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + $(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(MUMPS_LIBF77) $(LIBBLAS) $(LIBOTHERS)
- .SUFFIXES: .c .F .o + multiple_arithmetics_example: $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $$@.o diff --git a/MUMPS-shared-openmp.patch b/MUMPS-shared-openmp.patch index af5a047..372f6b7 100644 --- a/MUMPS-shared-openmp.patch +++ b/MUMPS-shared-openmp.patch @@ -30,16 +30,16 @@ Index: mumps/src/Makefile -$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER) - $(AR)$@ $? +$(libdir)/libmumpso_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -+ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumpso_common$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ ln -s libmumpso_common$(PLAT)-5.0.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ ln -s libmumpso_common$(PLAT)-5.1.1.so $@ + +$(libdir)/lib$(ARITH)mumpso$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER) + $(AR) $@ $? $(RANLIB) $@
+$(libdir)/lib$(ARITH)mumpso$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER) -+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) -lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ ln -s lib$(ARITH)mumpso$(PLAT)-5.0.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) -lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ ln -s lib$(ARITH)mumpso$(PLAT)-5.1.1.so $@ + # Dependencies between modules: $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ diff --git a/MUMPS-shared-pord-openmp.patch b/MUMPS-shared-pord-openmp.patch index abbe63e..d158fd0 100644 --- a/MUMPS-shared-pord-openmp.patch +++ b/MUMPS-shared-pord-openmp.patch @@ -24,8 +24,8 @@ Index: mumps/PORD/lib/Makefile $(RANLIB) $@
+libpordo$(PLAT).so: $(OBJS) -+ $(CC) -shared $(OBJS) -Wl,-soname,libpordo$(PLAT)-5.0.2.so -o libpordo$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ ln -s libpordo$(PLAT)-5.0.2.so $@ ++ $(CC) -shared $(OBJS) -Wl,-soname,libpordo$(PLAT)-5.1.1.so -o libpordo$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ ln -s libpordo$(PLAT)-5.1.1.so $@ + clean: rm -f *.o diff --git a/MUMPS-shared-pord.patch b/MUMPS-shared-pord.patch index 0de497b..df27715 100644 --- a/MUMPS-shared-pord.patch +++ b/MUMPS-shared-pord.patch @@ -24,8 +24,8 @@ Index: mumps/PORD/lib/Makefile $(RANLIB) $@
+libpord$(PLAT).so: $(OBJS) -+ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.0.2.so -o libpord$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ ln -s libpord$(PLAT)-5.0.2.so $@ ++ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.1.1.so -o libpord$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ ln -s libpord$(PLAT)-5.1.1.so $@ + clean: rm -f *.o @@ -37,16 +37,16 @@ Index: mumps/Makefile =================================================================== --- mumps.orig/Makefile +++ mumps/Makefile -@@ -51,7 +51,7 @@ - dexamples: d - (cd examples ; $(MAKE) d) +@@ -54,7 +54,7 @@ + multi_example: s d c z + (cd examples ; $(MAKE) multi)
-requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) +requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT).a $(libdir)/libpord$(PLAT).so
# dummy MPI library (sequential version)
-@@ -59,19 +59,26 @@ +@@ -62,19 +62,26 @@ (cd libseq; $(MAKE))
# Build the libpord.a library and copy it into $(topdir)/lib @@ -76,4 +76,3 @@ Index: mumps/Makefile (cd libseq; $(MAKE) clean) if [ "$(LPORDDIR)" != "" ] ; then \ cd $(LPORDDIR); $(MAKE) realclean; \ - diff --git a/MUMPS-shared-seq-openmp.patch b/MUMPS-shared-seq-openmp.patch index af46bd6..8b6eb66 100644 --- a/MUMPS-shared-seq-openmp.patch +++ b/MUMPS-shared-seq-openmp.patch @@ -7,8 +7,8 @@ Create a shared version of the sequential library, MUST BE LAST IN SERIES $(AR)$@ mpi.o mpic.o elapse.o $(RANLIB) $@ +libmpiseqo$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseqo$(PLAT).so.5.0.2 -o libmpiseqo$(PLAT).so.5.0.2 -+ ln -s libmpiseqo$(PLAT).so.5.0.2 $@ ++ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseqo$(PLAT).so.5.1.1 -o libmpiseqo$(PLAT).so.5.1.1 ++ ln -s libmpiseqo$(PLAT).so.5.1.1 $@ .f.o: - $(FC) $(OPTF) -c $*.f $(OUTF)$*.o + $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o @@ -36,18 +36,18 @@ Create a shared version of the sequential library, MUST BE LAST IN SERIES $(RANLIB) $@
$(libdir)/libmumpso_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -- $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumpso_common$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o $(libdir)/libmumpso_common$(PLAT)-5.0.2.so -Wl,-z,defs - ln -s libmumpso_common$(PLAT)-5.0.2.so $@ +- $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o $(libdir)/libmumpso_common$(PLAT)-5.1.1.so -Wl,-z,defs + ln -s libmumpso_common$(PLAT)-5.1.1.so $@
$(libdir)/lib$(ARITH)mumpso$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER) @@ -168,7 +168,7 @@ $(RANLIB) $@
$(libdir)/lib$(ARITH)mumpso$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER) -- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) -lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) -lmumpso_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-5.0.2.so -Wl,-z,defs - ln -s lib$(ARITH)mumpso$(PLAT)-5.0.2.so $@ +- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) -lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) -lmumpso_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-5.1.1.so -Wl,-z,defs + ln -s lib$(ARITH)mumpso$(PLAT)-5.1.1.so $@
diff --git a/MUMPS-shared-seq.patch b/MUMPS-shared-seq.patch index 1091743..caec118 100644 --- a/MUMPS-shared-seq.patch +++ b/MUMPS-shared-seq.patch @@ -7,8 +7,8 @@ Create a shared version of the sequential library, MUST BE LAST IN SERIES $(AR)$@ mpi.o mpic.o elapse.o $(RANLIB) $@ +libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseq$(PLAT).so.5.0.2 -o libmpiseq$(PLAT).so.5.0.2 -+ ln -s libmpiseq$(PLAT).so.5.0.2 $@ ++ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseq$(PLAT).so.5.1.1 -o libmpiseq$(PLAT).so.5.1.1 ++ ln -s libmpiseq$(PLAT).so.5.1.1 $@ .f.o: - $(FC) $(OPTF) -c $*.f $(OUTF)$*.o + $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o @@ -36,18 +36,18 @@ Create a shared version of the sequential library, MUST BE LAST IN SERIES $(RANLIB) $@
$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -- $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.0.2.so -Wl,-z,defs - ln -s libmumps_common$(PLAT)-5.0.2.so $@ +- $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.1.1.so -Wl,-z,defs + ln -s libmumps_common$(PLAT)-5.1.1.so $@
$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER) @@ -168,7 +168,7 @@ $(RANLIB) $@
$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER) -- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) -lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.2.so -Wl,-z,defs - ln -s lib$(ARITH)mumps$(PLAT)-5.0.2.so $@ +- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) -lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.1.so -Wl,-z,defs + ln -s lib$(ARITH)mumps$(PLAT)-5.1.1.so $@
diff --git a/MUMPS-shared.patch b/MUMPS-shared.patch index 17c317a..6a55dd4 100644 --- a/MUMPS-shared.patch +++ b/MUMPS-shared.patch @@ -16,10 +16,10 @@ Index: mumps/src/Makefile + $(libdir)/lib$(ARITH)mumps$(PLAT).so
OBJS_COMMON_MOD = \ - ana_omp_m.o\ -@@ -154,14 +154,22 @@ - $(ARITH)type3_root.o\ - $(ARITH)mumps_restart.o + lr_common.o \ +@@ -167,14 +169,23 @@ + $(ARITH)tools.o\ + $(ARITH)type3_root.o
-$(libdir)/libmumps_common$(PLAT)$(LIBEXT): $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) - $(AR)$@ $? @@ -30,21 +30,22 @@ Index: mumps/src/Makefile -$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER) - $(AR)$@ $? +$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ ln -s libmumps_common$(PLAT)-5.0.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ ln -s libmumps_common$(PLAT)-5.1.1.so $@ + +$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER) + $(AR) $@ $? $(RANLIB) $@
+$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER) -+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.2.so $(OPTL) -L$(libdir) -lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.2.so $(OPTL) -Wl,-z,defs -+ ln -s lib$(ARITH)mumps$(PLAT)-5.0.2.so $@ ++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -L$(libdir) -lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs ++ ln -s lib$(ARITH)mumps$(PLAT)-5.1.1.so $@ ++ + # Dependencies between modules: $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ $(ARITH)mumps_struc_def.o \ -@@ -259,13 +267,13 @@ +@@ -290,13 +301,13 @@
.SUFFIXES: .c .F .o .F.o: @@ -61,4 +62,3 @@ Index: mumps/src/Makefile
clean: - diff --git a/MUMPS.spec b/MUMPS.spec index d2558b8..7256752 100644 --- a/MUMPS.spec +++ b/MUMPS.spec @@ -8,15 +8,17 @@ %global _incmpichdir %{_includedir}/mpich-%{_arch} %global _libmpichdir %{_libdir}/mpich/lib
-%global soname_version 5.0.2 +%global soname_version %{version}
# openblas Upstream supports the package only on these architectures. +%if 0%{?fedora} || 0%{?rhel} >= 7 %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} %ifarch %{openblas_arches} %global with_openmp 1 %else %global with_openmp 0 %endif +%endif
%if 0%{?rhel} || 0%{?rhel} < 7 %ifarch %{power64} @@ -28,6 +30,7 @@ %ifnarch %{power64} %global with_mpicheck 1 %global with_mpich 1 +%global with_openmpi 1 %endif %endif %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -54,17 +57,9 @@ %endif %endif
-# Missing packages on el6 -%if 0%{?rhel} && 0%{?rhel} < 7 -%ifarch ppc64 -%global with_mpich 0 -%global with_mpicheck 0 -%endif -%endif - Name: MUMPS -Version: 5.0.2 -Release: 9%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: A MUltifrontal Massively Parallel sparse direct Solver License: CeCILL-C Group: Development/Libraries @@ -131,6 +126,7 @@ BuildArch: noarch This package contains common documentation files for MUMPS.
######################################################## +%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?with_openmp} %package openmp Summary: MUMPS libraries with OpenMP support @@ -157,6 +153,7 @@ Requires: %{name}-openmp%{?_isa} = %{version}-%{release} This package contains common illustrative test programs about how MUMPS-openmp can be used. %endif +%endif ##########################################################
######################################################## @@ -290,14 +287,14 @@ sed -e 's|@@MPICLIB@@|-lmpi|g' -i Makefile.inc ## EPEL6 provides OpenMPI 1.8.1 ## EPEL7 provides OpenMPI 1.10.0 %if 0%{?rhel} && 0%{?rhel} < 7 -sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} %{mpif77_libs} -lopen-rte -lopen-pal -L%{_libdir} -lblas|g' -i Makefile.inc +sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} %{mpif77_libs} -lopen-rte -lopen-pal -L%{_libdir} -llapack -lblas|g' -i Makefile.inc %endif %if 0%{?rhel} && 0%{?rhel} >= 7 -sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} %{mpif77_libs} -L%{_libdir} -lblas|g' -i Makefile.inc +sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} %{mpif77_libs} -L%{_libdir} -llapack -lblas|g' -i Makefile.inc %endif
%if 0%{?fedora} -sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs}|g' -i Makefile.inc +sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs} -L%{_libdir} -llapack -lblas|g' -i Makefile.inc %endif
MUMPS_MPI=openmpi @@ -358,7 +355,7 @@ cp -f %{SOURCE1} Makefile.inc sed -e 's|@@CFLAGS@@|%{optflags} -Wl,-z,now -Dscotch -Dmetis -Dptscotch -I%{_fmoddir}|g' -i Makefile.inc sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now -Wl,--as-needed|g' -i Makefile.inc sed -e 's|@@MPICLIB@@|-lmpich|g' -i Makefile.inc -sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs}|g' -i Makefile.inc +sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs} -L%{_libdir} -llapack -lblas|g' -i Makefile.inc
MUMPS_MPI=mpich MUMPS_INCDIR=-I%{_incmpichdir} @@ -445,6 +442,7 @@ make clean #######################################################
## Build OpenMP version +%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?with_openmp}
patch -R -p0 < %{PATCH3} @@ -495,6 +493,7 @@ rm -rf lib/* cp -pr src/*.mod %{name}-%{version}-openmp/modules make clean %endif +%endif #######################################################
# Make sure documentation is using Unicode. @@ -503,10 +502,12 @@ iconv -f iso8859-1 -t utf-8 README > README-t && mv README-t README %post -p /sbin/ldconfig %postun -p /sbin/ldconfig
+%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?with_openmp} %post openmp -p /sbin/ldconfig %postun openmp -p /sbin/ldconfig %endif +%endif
%check # Running test programs @@ -523,6 +524,7 @@ LD_LIBRARY_PATH=$PWD:../lib:$LD_LIBRARY_PATH \ ./c_example popd
+%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?with_openmp} pushd %{name}-%{version}-openmp/examples LD_LIBRARY_PATH=$PWD:../lib:$LD_LIBRARY_PATH \ @@ -537,6 +539,7 @@ LD_LIBRARY_PATH=$PWD:../lib:$LD_LIBRARY_PATH \ ./c_example popd %endif +%endif
%if 0%{?with_mpicheck} %if 0%{?with_openmpi} @@ -666,6 +669,7 @@ install -cpm 755 %{name}-%{version}/examples/README-* $RPM_BUILD_ROOT%{_libexecd install -cpm 644 %{name}-%{version}/modules/* $RPM_BUILD_ROOT%{_fmoddir}/%{name}-%{version}/
############################################################ +%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?with_openmp} mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}-openmp/examples mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name}-openmp-%{version} @@ -693,6 +697,7 @@ install -cpm 755 %{name}-%{version}-openmp/examples/input_* $RPM_BUILD_ROOT%{_li install -cpm 755 %{name}-%{version}-openmp/examples/README-* $RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}-openmp/examples install -cpm 644 %{name}-%{version}-openmp/modules/* $RPM_BUILD_ROOT%{_fmoddir}/%{name}-openmp-%{version}/ %endif +%endif ##############################################################
install -cpm 644 include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name} @@ -754,6 +759,7 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %{_libexecdir}/%{name}-%{version}/
####################################################### +%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?with_openmp} %files openmp %{_libdir}/libpordo-%{soname_version}.so @@ -769,6 +775,7 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %files openmp-examples %{_libexecdir}/%{name}-%{version}-openmp/ %endif +%endif #######################################################
%files common @@ -777,6 +784,10 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %license LICENSE
%changelog +* Tue Mar 21 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.1-1 +- Update to 5.1.1 +- Build openmp version on Fedora and Rhel7 only + * Wed Mar 15 2017 Orion Poplawski orion@cora.nwra.com - 5.0.2-9 - Build with openblas on all available architectures
diff --git a/sources b/sources index ab851f1..0d18cc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (MUMPS_5.0.2.tar.gz) = c57daba4b47c57eaa7cdf0af32d763357647b528a1cb78fd8397c26836761333045fb665d368c21b2016f9f0e686c5cdd4d0724a070c889313f38a2f9a750a21 +SHA512 (MUMPS_5.1.1.tar.gz) = 145dd61c9164bc50d07c2baf48345a2aca200332c4e359ea8b5b64fbb2027a6556f622a5620585b4852f785ba8e210267585c53634564f712828add2939901a9
commit 93d75872f01c04a294467abcc2012d4fbc2bef8f Author: Orion Poplawski orion@cora.nwra.com Date: Wed Mar 15 15:30:12 2017 -0600
Build with openblas on all available architectures
diff --git a/MUMPS.spec b/MUMPS.spec index 46e33ce..d2558b8 100644 --- a/MUMPS.spec +++ b/MUMPS.spec @@ -11,7 +11,8 @@ %global soname_version 5.0.2
# openblas Upstream supports the package only on these architectures. -%ifarch x86_64 %{ix86} armv7hl ppc64le +%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} +%ifarch %{openblas_arches} %global with_openmp 1 %else %global with_openmp 0 @@ -63,7 +64,7 @@
Name: MUMPS Version: 5.0.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A MUltifrontal Massively Parallel sparse direct Solver License: CeCILL-C Group: Development/Libraries @@ -776,6 +777,9 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %license LICENSE
%changelog +* Wed Mar 15 2017 Orion Poplawski orion@cora.nwra.com - 5.0.2-9 +- Build with openblas on all available architectures + * Tue Feb 14 2017 Antonio Trande <sagitterATfedoraproject.org> 5.0.2-8 - Build OpenMPI version on Fedora26-s390
commit f03cbfc91d178b2d51848b3e55e42799888a657c Author: sagitter sagitter@fedoraproject.org Date: Tue Feb 14 11:22:37 2017 +0100
Build OpenMPI version on Fedora26-s390
diff --git a/MUMPS.spec b/MUMPS.spec index 190cbfb..46e33ce 100644 --- a/MUMPS.spec +++ b/MUMPS.spec @@ -10,10 +10,6 @@
%global soname_version 5.0.2
-## Define if use openmpi/mpich or not -%global with_mpicheck 1 -%global with_mpich 1 - # openblas Upstream supports the package only on these architectures. %ifarch x86_64 %{ix86} armv7hl ppc64le %global with_openmp 1 @@ -36,14 +32,17 @@ %if 0%{?fedora} || 0%{?rhel} >= 7 %global with_mpicheck 1 %global with_mpich 1 +%global with_openmpi 1 %endif
%ifarch s390x -%global with_openmpi 0 -%else +%if 0%{?fedora} >= 26 %global with_openmpi 1 +%else +%global with_openmpi 0 %global with_mpicheck 1 %endif +%endif
%ifarch s390x %if 0%{?fedora} >= 26 @@ -64,7 +63,7 @@
Name: MUMPS Version: 5.0.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A MUltifrontal Massively Parallel sparse direct Solver License: CeCILL-C Group: Development/Libraries @@ -777,6 +776,9 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %license LICENSE
%changelog +* Tue Feb 14 2017 Antonio Trande <sagitterATfedoraproject.org> 5.0.2-8 +- Build OpenMPI version on Fedora26-s390 + * Fri Feb 10 2017 Fedora Release Engineering releng@fedoraproject.org - 5.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 614b16e96b5b7f46756d8272b8cb890a3f7425a0 Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Feb 10 05:11:14 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/MUMPS.spec b/MUMPS.spec index 646cd37..190cbfb 100644 --- a/MUMPS.spec +++ b/MUMPS.spec @@ -64,7 +64,7 @@
Name: MUMPS Version: 5.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A MUltifrontal Massively Parallel sparse direct Solver License: CeCILL-C Group: Development/Libraries @@ -777,6 +777,9 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} %license LICENSE
%changelog +* Fri Feb 10 2017 Fedora Release Engineering releng@fedoraproject.org - 5.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 31 2017 Antonio Trande <sagitterATfedoraproject.org> 5.0.2-6 - Rebuild for gcc-gfortran - Include Fortran modules
arch-excludes@lists.fedoraproject.org