The package rpms/gpaw.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/gpaw.git/commit/?id=0902e2103e0a6420....
Change: -%ifarch s390x
Thanks.
Full change: ============
commit ff1f30456cb99e40aa211bb02c6cd929f139b556 Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Sun Dec 23 12:26:31 2018 +0100
One more typo... ugh
diff --git a/gpaw.spec b/gpaw.spec index 9a6ad47..6f99ae3 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -351,7 +351,7 @@ for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3; do done %endif for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}; do - sed -i 's|^#!/usr/bin/env python|#!%{bindir}/python2|g' $f + sed -i 's|^#!/usr/bin/env python|#!%{_bindir}/python2|g' $f done for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript; do sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/python2|g' $f
commit b8f7e626f7e6f24d4f59075af7b2d48bbf68c30d Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Sun Dec 23 12:19:57 2018 +0100
No such thing as gpaw-python installed
diff --git a/gpaw.spec b/gpaw.spec index 91736b4..9a6ad47 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -346,14 +346,14 @@ popd for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}3; do sed -i 's|^#!/usr/bin/env python3|#!%{_bindir}/python3|g' $f done -for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-{python,runscript}3; do +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3; do sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/python3|g' $f done %endif for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}; do sed -i 's|^#!/usr/bin/env python|#!%{bindir}/python2|g' $f done -for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-{python,runscript}; do +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript; do sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/python2|g' $f done
commit ac2f9e5a44e2b9b672f0cd0775dbc684dc95a365 Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Sun Dec 23 12:17:19 2018 +0100
No such thing as gpaw-python installed
diff --git a/gpaw.spec b/gpaw.spec index 2df1a6b..91736b4 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -347,14 +347,14 @@ for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-m sed -i 's|^#!/usr/bin/env python3|#!%{_bindir}/python3|g' $f done for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-{python,runscript}3; do - sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python3|g' $f + sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/python3|g' $f done %endif for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}; do sed -i 's|^#!/usr/bin/env python|#!%{bindir}/python2|g' $f done for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-{python,runscript}; do - sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python|g' $f + sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/python2|g' $f done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
commit 8211669365549ad6f7f78c3cb89b5ee9729dd627 Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Sun Dec 23 12:07:03 2018 +0100
Missed a file
diff --git a/gpaw.spec b/gpaw.spec index eaa62ac..2df1a6b 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -346,12 +346,16 @@ popd for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}3; do sed -i 's|^#!/usr/bin/env python3|#!%{_bindir}/python3|g' $f done -sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python3|g' ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3 +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-{python,runscript}3; do + sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python3|g' $f +done %endif for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}; do sed -i 's|^#!/usr/bin/env python|#!%{bindir}/python2|g' $f done -sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python2|g' ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3 +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-{python,runscript}; do + sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python|g' $f +done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
commit 7a08cafcb1da72090821e8428a76d5f382256376 Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Sun Dec 23 12:04:37 2018 +0100
Fix typo
diff --git a/gpaw.spec b/gpaw.spec index a57bfe8..eaa62ac 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -349,7 +349,7 @@ done sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python3|g' ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3 %endif for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}; do - sed -i 's|^#!/usr/bin/env python3|#!%{bindir}/python2|g' $f + sed -i 's|^#!/usr/bin/env python|#!%{bindir}/python2|g' $f done sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python2|g' ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3
commit 0902e2103e0a64208a258ccadb179b6fdbfbeb61 Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Sun Dec 23 11:53:06 2018 +0100
Fix shebangs.
diff --git a/gpaw.spec b/gpaw.spec index fced4be..a57bfe8 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -20,7 +20,7 @@ ExcludeArch: ppc64
Name: gpaw Version: 1.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ @@ -34,12 +34,7 @@ BuildRequires: libxc-devel BuildRequires: hdf5-devel BuildRequires: python2-devel BuildRequires: python-ase - -%ifarch s390x -BuildRequires: atlas-devel -%else BuildRequires: openblas-devel -%endif
%if 0%{?with_python3} BuildRequires: python3-devel @@ -346,6 +341,18 @@ PYTHON=python2%doinstall_executable popd %{_mpich_unload}
+# Fix shebangs +%if 0%{?with_python3} +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}3; do + sed -i 's|^#!/usr/bin/env python3|#!%{_bindir}/python3|g' $f +done +sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python3|g' ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3 +%endif +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}; do + sed -i 's|^#!/usr/bin/env python3|#!%{bindir}/python2|g' $f +done +sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/gpaw-python2|g' ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3 + mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
%check @@ -439,6 +446,10 @@ popd
%changelog +* Sun Dec 23 2018 Susi Lehtola jussilehtola@fedoraproject.org - 1.4.0-7 +- Switch to openblas on s390x as well. +- Fix shebangs (BZ #1661785). + * Sun Jul 15 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-6 - explicitly use python3/python2, including gpaw-pythonX
commit e3a1d37354919b8f52fc06f322b6e426e8c8b528 Author: Marcin Dulak marcin.dulak@gmail.com Date: Sun Jul 15 11:53:03 2018 +0000
restore NPROC
diff --git a/gpaw.spec b/gpaw.spec index 0bdd4a7..fced4be 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -350,7 +350,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
%check
-export NPROC=2 # test on 4 cores (scalapack test needs that) +export NPROC=4 # test on 4 cores (scalapack test needs that)
# To avoid replicated code define a macro %global docheck() \
commit 83756a237d8b3c28aa9323bc8fe9a840f7ce803e Author: Marcin Dulak marcin.dulak@gmail.com Date: Sun Jul 15 11:39:02 2018 +0000
fix python problems due to Fedora_29_Mass_Rebuild
diff --git a/gpaw.spec b/gpaw.spec index 3310671..0bdd4a7 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -20,7 +20,7 @@ ExcludeArch: ppc64
Name: gpaw Version: 1.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ @@ -234,11 +234,11 @@ cp -pf python2/customize.py python3/customize.py # hdf5.c:(.text+0x1192): undefined reference to `Py_InitModule' sed -i "s/.*hdf5 =.*/hdf5 = False/" python3/customize.py pushd python3 -MPI_SUFFIX=_serial PYTHON=%{__python3} %dobuild +MPI_SUFFIX=_serial PYTHON=python3 %dobuild popd %endif # with _python3 pushd python2 -MPI_SUFFIX=_serial PYTHON=%{__python} %dobuild +MPI_SUFFIX=_serial PYTHON=python2 %dobuild popd
# build openmpi version @@ -256,11 +256,11 @@ cp -pf python2/customize.py python3/customize.py # hdf5.c:(.text+0x1192): undefined reference to `Py_InitModule' sed -i "s/.*hdf5 =.*/hdf5 = False/" python3/customize.py pushd python3 -PYTHON=%{__python3} %dobuild +PYTHON=python3 %dobuild popd %endif # with _python3 pushd python2 -PYTHON=%{__python} %dobuild +PYTHON=python2 %dobuild popd %{_openmpi_unload}
@@ -279,11 +279,11 @@ cp -pf python2/customize.py python3/customize.py # hdf5.c:(.text+0x1192): undefined reference to `Py_InitModule' sed -i "s/.*hdf5 =.*/hdf5 = False/" python3/customize.py pushd python3 -PYTHON=%{__python3} %dobuild +PYTHON=python3 %dobuild popd %endif # with _python3 pushd python2 -PYTHON=%{__python} %dobuild +PYTHON=python2 %dobuild popd %{_mpich_unload}
@@ -305,7 +305,7 @@ CFLAGS="$RPM_OPT_FLAGS" ${PYTHON} setup.py install --skip-build --prefix=$RPM_BU cp -pf python2/customize.py python3/customize.py pushd python3 mv build_serial build -PYTHON=%{__python3} %doinstall +PYTHON=python3 %doinstall # rename scripts for file in `find $RPM_BUILD_ROOT/%{_bindir}/ -name "gpaw*"`; do mv -f ${file} $RPM_BUILD_ROOT/%{_bindir}/`basename $file`3 @@ -314,7 +314,7 @@ popd %endif # with _python3 pushd python2 mv build_serial build -PYTHON=%{__python} %doinstall +PYTHON=python2 %doinstall popd
# copy parallel executables @@ -330,7 +330,7 @@ PYTHON=python3 %doinstall_executable popd %endif # with _python3 pushd python2 -PYTHON=python %doinstall_executable +PYTHON=python2%doinstall_executable popd %{_openmpi_unload}
@@ -342,7 +342,7 @@ PYTHON=python3 %doinstall_executable popd %endif # with _python3 pushd python2 -PYTHON=python %doinstall_executable +PYTHON=python2%doinstall_executable popd %{_mpich_unload}
@@ -350,7 +350,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
%check
-export NPROC=4 # test on 4 cores (scalapack test needs that) +export NPROC=2 # test on 4 cores (scalapack test needs that)
# To avoid replicated code define a macro %global docheck() \ @@ -366,7 +366,7 @@ MPI_SUFFIX="" PYTHON="python3" GPAW_EXECUTABLE="python3" %docheck popd %endif # with _python3 pushd python2 -MPI_SUFFIX="" PYTHON="python" GPAW_EXECUTABLE="python" %docheck +MPI_SUFFIX="" PYTHON="python2" GPAW_EXECUTABLE="python2" %docheck popd
# check openmpi version @@ -377,7 +377,7 @@ PYTHON="python3" GPAW_EXECUTABLE="mpiexec -np ${NPROC} build$MPI_SUFFIX/bin.*/%{ popd %endif # with _python3 pushd python2 -PYTHON="python" GPAW_EXECUTABLE="mpiexec -np ${NPROC} build$MPI_SUFFIX/bin.*/%{name}-python" %docheck +PYTHON="python2" GPAW_EXECUTABLE="mpiexec -np ${NPROC} build$MPI_SUFFIX/bin.*/%{name}-python" %docheck popd %{_openmpi_unload}
@@ -390,16 +390,16 @@ PYTHON="python3" GPAW_EXECUTABLE="mpiexec -np ${NPROC} build$MPI_SUFFIX/bin.*/%{ popd %endif # with _python3 pushd python2 -PYTHON="python" GPAW_EXECUTABLE="mpiexec -np ${NPROC} build$MPI_SUFFIX/bin.*/%{name}-python" %docheck +PYTHON="python2" GPAW_EXECUTABLE="mpiexec -np ${NPROC} build$MPI_SUFFIX/bin.*/%{name}-python" %docheck popd %{_mpich_unload}
%files -n python2-%{name} %{_bindir}/%{name}* -%{python_sitearch}/_%{name}*.so -%{python_sitearch}/%{name} -%{python_sitearch}/%{name}-%{version}-py*.egg-info +%{python2_sitearch}/_%{name}*.so +%{python2_sitearch}/%{name} +%{python2_sitearch}/%{name}-%{version}-py*.egg-info %if 0%{?with_python3} %exclude %{_bindir}/%{name}*3 %endif @@ -410,11 +410,11 @@ popd
%files openmpi -%{_libdir}/openmpi%{?_opt_cc_suffix}/bin/%{name}-python_openmpi +%{_libdir}/openmpi%{?_opt_cc_suffix}/bin/%{name}-python2_openmpi
%files mpich -%{_libdir}/mpich%{?_opt_cc_suffix}/bin/%{name}-python_mpich +%{_libdir}/mpich%{?_opt_cc_suffix}/bin/%{name}-python2_mpich
%if 0%{?with_python3} @@ -439,6 +439,9 @@ popd
%changelog +* Sun Jul 15 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-6 +- explicitly use python3/python2, including gpaw-pythonX + * Fri Jul 13 2018 Fedora Release Engineering releng@fedoraproject.org - 1.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit ce7fd6b2f8784fc4792a2b319b6f51ed00d4ffbb Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jul 13 04:24:17 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/gpaw.spec b/gpaw.spec index 4d37f44..3310671 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -20,7 +20,7 @@ ExcludeArch: ppc64
Name: gpaw Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ @@ -439,6 +439,9 @@ popd
%changelog +* Fri Jul 13 2018 Fedora Release Engineering releng@fedoraproject.org - 1.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-4 - dummy commit to rebuild with f29-python
commit d94420450e2334ac70b22a7e5012521e2ec16179 Author: Marcin Dulak marcin.dulak@gmail.com Date: Thu Jun 28 20:34:46 2018 +0000
dummy commit to repeat f29 build - needs release tag
diff --git a/gpaw.spec b/gpaw.spec index 82ae345..4d37f44 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -20,7 +20,7 @@ ExcludeArch: ppc64
Name: gpaw Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ @@ -439,6 +439,9 @@ popd
%changelog +* Thu Jun 28 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-4 +- dummy commit to rebuild with f29-python + * Wed Jun 27 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-3 * patch https://gitlab.com/gpaw/gpaw/issues/147
commit 0a7177406c9349efbab370dcde2cf1719602ca66 Author: Marcin Dulak marcin.dulak@gmail.com Date: Thu Jun 28 20:32:26 2018 +0000
dummy commit to repeat f29 build
diff --git a/gpaw.spec b/gpaw.spec index b4de7c1..82ae345 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -448,7 +448,7 @@ popd * Fri Jun 08 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-1 - new upstream release - drop rhel7 support: Numpy 1.9 is required for python-ase -- requires scipy +- requires scipy - no more git commit in tar directory name
* Wed Feb 07 2018 Fedora Release Engineering releng@fedoraproject.org - 1.2.0-7
commit 905e8bfdfff623de71df48d7cbc9a9ebf684f41c Merge: 856e931 c58e6e1 Author: Marcin Dulak marcin.dulak@gmail.com Date: Wed Jun 27 20:55:26 2018 +0000
resolve conflict
diff --cc gpaw.spec index 82b13a0,a5fef54..b4de7c1 --- a/gpaw.spec +++ b/gpaw.spec @@@ -20,7 -20,7 +20,7 @@@ ExcludeArch: ppc6
Name: gpaw Version: 1.4.0 --Release: 2%{?dist} ++Release: 3%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ @@@ -439,9 -437,9 +439,12 @@@ pop
%changelog - * Wed Jun 27 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-2 ++* Wed Jun 27 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-3 +* patch https://gitlab.com/gpaw/gpaw/issues/147 + + * Tue Jun 19 2018 Miro Hronok mhroncok@redhat.com - 1.4.0-2 + - Rebuilt for Python 3.7 + * Fri Jun 08 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-1 - new upstream release - drop rhel7 support: Numpy 1.9 is required for python-ase
commit 856e93113771ac300a4f1708043a924883e7c32c Author: Marcin Dulak marcin.dulak@gmail.com Date: Wed Jun 27 20:52:40 2018 +0000
patch for python 3.7
diff --git a/gpaw.hs_operators.py.patch b/gpaw.hs_operators.py.patch new file mode 100644 index 0000000..e887c66 --- /dev/null +++ b/gpaw.hs_operators.py.patch @@ -0,0 +1,60 @@ +--- gpaw-1.4.0/gpaw/hs_operators.py.orig 2018-05-29 14:58:42.000000000 +0200 ++++ gpaw-1.4.0/gpaw/hs_operators.py 2018-06-27 21:29:31.350279845 +0200 +@@ -25,10 +25,10 @@ + """ + + nblocks = 1 +- async = True ++ asynchronous = True + hermitian = True + +- def __init__(self, ksl, nblocks=None, async=None, hermitian=None): ++ def __init__(self, ksl, nblocks=None, asynchronous=None, hermitian=None): + """The constructor now calculates the work array sizes, but does not + allocate them. Here is a summary of the relevant variables and the + cases handled. +@@ -79,8 +79,8 @@ + self.buffer_size = ksl.buffer_size + if nblocks is not None: + self.nblocks = nblocks +- if async is not None: +- self.async = async ++ if asynchronous is not None: ++ self.asynchronous = asynchronous + if hermitian is not None: + self.hermitian = hermitian + +@@ -186,12 +186,12 @@ + rankp = (band_comm.rank + 1) % band_comm.size + self.req, self.req2 = [], [] + +- # If asyncronous, non-blocking send/receives of psit_nG's start here. +- if self.async: ++ # If asynchronous, non-blocking send/receives of psit_nG's start here. ++ if self.asynchronous: + self.req.append(band_comm.send(sbuf_mG, rankm, 11, False)) + self.req.append(band_comm.receive(rbuf_mG, rankp, 11, False)) + +- # Auxiliary asyncronous cycle, also send/receive of P_ani's. ++ # Auxiliary asynchronous cycle, also send/receive of P_ani's. + if auxiliary: + self.req2.append(band_comm.send(sbuf_nI, rankm, 31, False)) + self.req2.append(band_comm.receive(rbuf_nI, rankp, 31, False)) +@@ -232,7 +232,7 @@ + rankp = (band_comm.rank + 1) % band_comm.size + + # If syncronous, blocking send/receives of psit_nG's carried out here. +- if self.async: ++ if self.asynchronous: + assert len(self.req) == 2, 'Expected asynchronous request pairs.' + band_comm.waitall(self.req) + else: +@@ -240,7 +240,7 @@ + band_comm.sendreceive(sbuf_mG, rankm, rbuf_mG, rankp, 11, 11) + sbuf_mG, rbuf_mG = rbuf_mG, sbuf_mG + +- # Auxiliary asyncronous cycle, also wait for P_ani's. ++ # Auxiliary asynchronous cycle, also wait for P_ani's. + if auxiliary: + assert len(self.req2) == 2, 'Expected asynchronous request pairs.' + band_comm.waitall(self.req2) diff --git a/gpaw.spec b/gpaw.spec index 8d747e8..82b13a0 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -20,13 +20,14 @@ ExcludeArch: ppc64
Name: gpaw Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ URL: https://wiki.fysik.dtu.dk/gpaw/ Source0: https://gitlab.com/%%7Bname%7D/%%7Bname%7D/repository/archive.tar.gz?ref=%%7... - +# https://gitlab.com/gpaw/gpaw/issues/147 +Patch0: gpaw.hs_operators.py.patch
BuildRequires: time BuildRequires: libxc-devel @@ -187,6 +188,7 @@ This package contains the mpich Python 3 version.
%prep %setup -qTc -a 0 +%patch0 -p0 mv %{name}-%{version} python2 pushd python2 popd @@ -437,6 +439,9 @@ popd
%changelog +* Wed Jun 27 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-2 +* patch https://gitlab.com/gpaw/gpaw/issues/147 + * Fri Jun 08 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-1 - new upstream release - drop rhel7 support: Numpy 1.9 is required for python-ase
commit c58e6e108a619be0fbd11994bccb3bfc9f23c1b7 Author: Miro Hronok miro@hroncok.cz Date: Tue Jun 19 10:44:14 2018 +0200
Rebuilt for Python 3.7
diff --git a/gpaw.spec b/gpaw.spec index 8d747e8..a5fef54 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -20,7 +20,7 @@ ExcludeArch: ppc64
Name: gpaw Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ @@ -437,6 +437,9 @@ popd
%changelog +* Tue Jun 19 2018 Miro Hronok mhroncok@redhat.com - 1.4.0-2 +- Rebuilt for Python 3.7 + * Fri Jun 08 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-1 - new upstream release - drop rhel7 support: Numpy 1.9 is required for python-ase
commit c81c9c2efc500b1d50d6c8d7e22af4febdb5dc2b Author: Marcin Dulak marcin.dulak@gmail.com Date: Fri Jun 8 21:34:19 2018 +0000
new upstream release
diff --git a/.gitignore b/.gitignore index 3bd6284..b0c9f55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /gpaw-1.0.0-347356f1e567c7a7fc81f54805224d8a6ef4505d.tar.gz /gpaw-1.1.0-7e8d3125fe2fd3d1064393d6ac181db6dd655a53.tar.gz /gpaw-1.2.0-8963a4467f21f43a491933d0ce2ac2949eed77cb.tar.gz +/gpaw-1.4.0.tar.gz diff --git a/gpaw.spec b/gpaw.spec index 4642f15..8d747e8 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -1,3 +1,8 @@ +# Warning: +# Anyone editing this spec file please make sure the same spec file +# works on other fedora and epel releases, which are supported by this software. +# No quick Rawhide-only fixes will be allowed. + %if 0%{?el6} # Error: No Package found for mpich-devel on el6 ExcludeArch: ppc64 @@ -13,17 +18,14 @@ ExcludeArch: ppc64 %global with_python3 1 %endif
-%global upstream_commit 8963a4467f21f43a491933d0ce2ac2949eed77cb - Name: gpaw -Version: 1.2.0 -Release: 7%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: A grid-based real-space PAW method DFT code
License: GPLv3+ URL: https://wiki.fysik.dtu.dk/gpaw/ -Source0: https://gitlab.com/%%7Bname%7D/%%7Bname%7D/repository/archive.tar.gz?ref=%%7... -Patch0: gpaw-1.2.0-libxc4.patch +Source0: https://gitlab.com/%%7Bname%7D/%%7Bname%7D/repository/archive.tar.gz?ref=%%7...
BuildRequires: time @@ -71,6 +73,7 @@ multigrid methods or atom-centered basis-functions. %package -n python2-%{name} Summary: %summary Requires: python-ase +Requires: scipy Requires: %{name}-common = %{version}-%{release} Requires: tar %{?python_provide:%python_provide python2-%{name}} @@ -135,6 +138,7 @@ This package contains the common data files. %package -n python3-%{name} Summary: A grid-based real-space PAW method DFT code for Python 3 Requires: python3-ase +Requires: python3-scipy Requires: %{name}-common = %{version}-%{release}
%description -n python3-%{name} @@ -183,9 +187,8 @@ This package contains the mpich Python 3 version.
%prep %setup -qTc -a 0 -mv %{name}-%{version}-%{upstream_commit} python2 +mv %{name}-%{version} python2 pushd python2 -%patch0 -p1 -b .libxc4 popd
# do not link lapack when linking to openblas @@ -352,7 +355,7 @@ export NPROC=4 # test on 4 cores (scalapack test needs that) GPAW_PLATFORM=$($PYTHON -c "from distutils import util, sysconfig; print(util.get_platform()+'-'+sysconfig.get_python_version())")&& \ export PYTHONPATH=`pwd`/build/lib.${GPAW_PLATFORM} \ PATH=`pwd`/tools:${PATH} \ -time $GPAW_EXECUTABLE `which gpaw` test --range='linalg/gemm_complex.py,vdw/potential.py' --debug 2>&1 | tee gpaw-test${NPROC}$MPI_SUFFIX.log +time $GPAW_EXECUTABLE `which gpaw` test --range='linalg/gemm_complex.py,vdw/potential.py' 2>&1 | tee gpaw-test${NPROC}$MPI_SUFFIX.log
# check serial version %if 0%{?with_python3} @@ -434,6 +437,12 @@ popd
%changelog +* Fri Jun 08 2018 Marcin Dulak Marcin.Dulak@gmail.com - 1.4.0-1 +- new upstream release +- drop rhel7 support: Numpy 1.9 is required for python-ase +- requires scipy +- no more git commit in tar directory name + * Wed Feb 07 2018 Fedora Release Engineering releng@fedoraproject.org - 1.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources index 5434808..264bdaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gpaw-1.2.0-8963a4467f21f43a491933d0ce2ac2949eed77cb.tar.gz) = 1d7206ba5798602018d6fcacc7c2559d896f97d33ebc2a1b3f32d6eee86ce4e9b799e6646a41b1db535412d504cf967d6c6ea17abea801d9d40b3b3bf20b6238 +SHA512 (gpaw-1.4.0.tar.gz) = 3f5c5962fbf6e59198eec8a58d5244788c6c089add333ba9c048c10adeacfe391acba620371146052c7cfb677b3e8305e5e0207832f50eb7c446471c5499361d
arch-excludes@lists.fedoraproject.org