rathann pushed to elpa (epel7). "revert 1e7ebb1dbc2be9ae6e63766ef4cfa65a3839a3b1 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 24 22:38:55 UTC 2015
>From b6952cf915caa5aec21642b6bbc09f7c2b8cd773 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date: Tue, 24 Mar 2015 23:38:06 +0100
Subject: revert 1e7ebb1dbc2be9ae6e63766ef4cfa65a3839a3b1
Revert most of the changes in 1e7ebb1dbc2be9ae6e63766ef4cfa65a3839a3b1.
diff --git a/elpa-rpm.patch b/elpa-rpm.patch
index f889df3..813de74 100644
--- a/elpa-rpm.patch
+++ b/elpa-rpm.patch
@@ -9,63 +9,63 @@ diff -up mpich/elpa.pc.in.r mpich/elpa.pc.in
+fcflags= -I${libdir}/gfortran/modules @OPENMP_FCFLAGS@
diff -up mpich/Makefile.am.r mpich/Makefile.am
--- mpich/Makefile.am.r 2015-03-17 16:05:37.000000000 +0100
-+++ mpich/Makefile.am 2015-03-24 14:52:25.520859067 +0100
-@@ -204,47 +206,47 @@ check_SCRIPTS = \
++++ mpich/Makefile.am 2015-03-20 10:59:37.967517516 +0100
+@@ -204,47 +204,47 @@ check_SCRIPTS = \
TESTS = $(check_SCRIPTS)
elpa1_test_real.sh:
- echo 'mpiexec -n 2 ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_real at SUFFIX@.sh.log' > elpa1_test_real.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real.sh
chmod +x elpa1_test_real.sh
elpa1_test_real_with_c.sh:
- echo 'mpiexec -n 2 ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_with_c.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_real_with_c at SUFFIX@.sh.log' > elpa1_test_real_with_c.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_with_c.sh
chmod +x elpa1_test_real_with_c.sh
elpa1_test_real_c_version.sh:
- echo 'mpiexec -n 2 ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_c_version.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_real_c_version at SUFFIX@.sh.log' > elpa1_test_real_c_version.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_c_version.sh
chmod +x elpa1_test_real_c_version.sh
elpa2_test_real.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_real at SUFFIX@.sh.log' > elpa2_test_real.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real.sh
chmod +x elpa2_test_real.sh
elpa2_test_real_default_kernel.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_real_default_kernel at SUFFIX@.sh.log' > elpa2_test_real_default_kernel.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel.sh
chmod +x elpa2_test_real_default_kernel.sh
elpa2_test_real_default_kernel_qr_decomposition.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@ || cat ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@.sh.log' > elpa2_test_real_default_kernel_qr_decomposition.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition.sh
chmod +x elpa2_test_real_default_kernel_qr_decomposition.sh
elpa2_test_real_choose_kernel_with_api.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_real_choose_kernel_with_api at SUFFIX@.sh.log' > elpa2_test_real_choose_kernel_with_api.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api.sh
chmod +x elpa2_test_real_choose_kernel_with_api.sh
elpa1_test_complex.sh:
- echo 'mpiexec -n 2 ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_complex at SUFFIX@.sh.log' > elpa1_test_complex.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex.sh
chmod +x elpa1_test_complex.sh
elpa2_test_complex.sh:
- echo 'mpiexec -n 2 ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_complex at SUFFIX@.sh.log' > elpa2_test_complex.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex.sh
chmod +x elpa2_test_complex.sh
elpa2_test_complex_default_kernel.sh:
- echo 'mpiexec -n 2 ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_complex_default_kernel at SUFFIX@.sh.log' > elpa2_test_complex_default_kernel.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel.sh
chmod +x elpa2_test_complex_default_kernel.sh
elpa2_test_complex_choose_kernel_with_api.sh:
- echo 'mpiexec -n 2 ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@.sh.log' > elpa2_test_complex_choose_kernel_with_api.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api.sh
chmod +x elpa2_test_complex_choose_kernel_with_api.sh
elpa2_utilities.i: $(top_srcdir)/src/elpa2_utilities.F90
diff --git a/elpa.spec b/elpa.spec
index 3d16c09..aa07e74 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -1,7 +1,7 @@
Summary: High-performance library for parallel solution of eigenvalue problems
Name: elpa
Version: 2015.02.002
-Release: 2%{?dist}
+Release: 1%{?dist}
URL: http://elpa.rzg.mpg.de/
Source0: http://elpa.rzg.mpg.de/elpa-%{version}.tar.gz
# fix pkgconfig file
@@ -262,9 +262,6 @@ popd
%exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/*_openmp.mod
%changelog
-* Tue Mar 24 2015 Dominik Mierzejewski <rpm at greysector.net> 2015.02.002-2
-- make each individual test output its full log upon failure
-
* Thu Mar 19 2015 Dominik Mierzejewski <rpm at greysector.net> 2015.02.002-1
- update to 2015.02.002 release (ABI change)
- drop libtool bug workaround
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/elpa.git/commit/?h=epel7&id=b6952cf915caa5aec21642b6bbc09f7c2b8cd773
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list