The package rpms/python-assimulo.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/python-assimulo.git/commit/?id=7e....
Change:
-%ifnarch %{power64} aarch64
Thanks.
Full change:
============
commit 7ee4d46d10229c9ffcdb05e6057e9a72b03c6c7a
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Jan 27 20:53:33 2018 +0100
Update to commit #859 (patched for newest Sundials releases)
diff --git a/.gitignore b/.gitignore
index 5cd62a9..6041983 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/assimulo-licenses.tar.gz
/Assimulo-2.9.zip
/assimulo-commit-845.tar.gz
+/assimulo-commit-859.tar.gz
diff --git a/python-assimulo-fix_numpy_rc_version.patch
b/python-assimulo-fix_numpy_rc_version.patch
index e54774c..d4397fb 100644
--- a/python-assimulo-fix_numpy_rc_version.patch
+++ b/python-assimulo-fix_numpy_rc_version.patch
@@ -17,21 +17,3 @@
extraargs['extra_f77_compile_args'] = extra_compile_flags[:]
extraargs['extra_f90_compile_args'] = extra_compile_flags[:]
-@@ -484,7 +484,7 @@
- dasp3_f77_compile_flags =
["-fdefault-double-8","-fdefault-real-8"]
- dasp3_f77_compile_flags += extra_compile_flags
-
-- if StrictVersion(np.version.version) > StrictVersion("1.6.1"):
#NOTE, THERE IS A PROBLEM WITH PASSING F77 COMPILER ARGS FOR NUMPY LESS THAN 1.6.1,
DISABLE FOR NOW
-+ if np.version.version > "1.14.0": #NOTE, THERE IS A PROBLEM WITH
PASSING F77 COMPILER ARGS FOR NUMPY LESS THAN 1.6.1, DISABLE FOR NOW
- dasp3_list = ['dasp3dp.pyf', 'DASP3.f',
'ANORM.f','CTRACT.f','DECOMP.f',
'HMAX.f','INIVAL.f','JACEST.f','PDERIV.f','PREPOL.f','SOLVE.f','SPAPAT.f']
-
src=['assimulo'+os.sep+'thirdparty'+os.sep+'dasp3'+os.sep+code for
code in dasp3_list]
- config.add_extension('assimulo.lib.dasp3dp',
-@@ -500,7 +500,7 @@
- glimda_list = ['glimda_complete.f','glimda_complete.pyf']
-
src=['assimulo'+os.sep+'thirdparty'+os.sep+'glimda'+os.sep+code
for code in glimda_list]
- extraargs_glimda={'extra_link_args':extra_link_flags[:],
'extra_compile_args':extra_compile_flags[:], 'library_dirs':[self.BLASdir,
self.LAPACKdir], 'libraries':['lapack', 'blas']}
-- if StrictVersion(np.version.version) > StrictVersion("1.6.1"):
-+ if np.version.version > "1.14.0":
- extraargs_glimda["extra_f77_compile_args"] =
extra_compile_flags[:]
- config.add_extension('assimulo.lib.glimda', sources=
src,include_dirs=[np.get_include()],**extraargs_glimda)
- extra_link_flags=extra_link_flags[:-2] # remove LAPACK flags after GLIMDA
diff --git a/python-assimulo.spec b/python-assimulo.spec
index 3066acf..3fa392c 100644
--- a/python-assimulo.spec
+++ b/python-assimulo.spec
@@ -2,23 +2,18 @@
%global with_python3 1
%endif
-# openblas available on these architectures.
-%if 0%{?fedora} && 0%{?fedora} > 26
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64
s390x}
-%else
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%endif
-%if 0%{?rhel}
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%endif
+%global with_check 1
+
+# SuperLUMT is on these arches only
+ExcludeArch: %{power64} aarch64
%global pname assimulo
-%global checkout 845
-%global date 20171222
+%global checkout 859
+%global date 20180113
Name: python-%{pname}
Version: 2.9
-Release: 17.%{date}svn%{checkout}%{?dist}
+Release: 20.%{date}svn%{checkout}%{?dist}
Summary: Ordinary differential and differential algebraic equations solver
License: LGPLv3+ and LGPLv2+ and BSD and GPLv3
URL:
http://www.jmodelica.org/assimulo
@@ -29,27 +24,18 @@ URL:
http://www.jmodelica.org/assimulo
## tar -cvzf assimulo-commit-%%{checkout}.tar.gz trunk
Source0: assimulo-commit-%{checkout}.tar.gz
-##http://www.gnu.org/licenses/gpl-3.0.txt
-##http://www.gnu.org/licenses/lgpl-3.0.txt
-##http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
-Source1: %{pname}-licenses.tar.gz
+BuildRequires: openblas-srpm-macros
-BuildRequires: python2-devel, python-setuptools, python-nose
-BuildRequires: numpy, pytest, Cython, python-matplotlib
-BuildRequires: sundials-devel
-BuildRequires: gcc-gfortran
%ifarch %{openblas_arches}
-BuildRequires: openblas-devel, openblas-srpm-macros, openblas-static
+BuildRequires: openblas-devel, openblas-srpm-macros, openblas-static, lapack-devel,
lapack-static
%else
BuildRequires: blas-devel, blas-static
BuildRequires: lapack-devel, lapack-static
-%endif
-BuildRequires: numpy-f2py, scipy, dos2unix, xorg-x11-server-Xvfb
-BuildRequires: qhull-devel
-%ifnarch %{power64} aarch64
-BuildRequires: SuperLU-devel
%endif
-Requires: python-matplotlib, numpy, scipy
+BuildRequires: SuperLUMT-devel
+BuildRequires: qhull-devel
+BuildRequires: gcc-gfortran, gcc-c++, dos2unix
+BuildRequires: sundials-devel
##This patch changes the tolerance in the mechanical systems test
##on PPC architecture
@@ -74,6 +60,11 @@ Python via a common high-level interface.
Summary: Ordinary differential and differential algebraic equations solver
%{?python_provide:%python_provide python2-%{pname}}
+BuildRequires: python2-devel, python2-setuptools, python2-nose
+BuildRequires: python2-numpy, python2-pytest, python2-Cython, python2-matplotlib
+BuildRequires: python2-numpy-f2py, python2-scipy
+Requires: python2-matplotlib, python2-numpy, python2-scipy
+
%description -n python2-%{pname}
Assimulo is a Cython/Python based simulation package that allows for simulation
of both ordinary differential equations (ODEs), f(t,y),
@@ -88,8 +79,7 @@ Summary: Ordinary differential and differential algebraic equations
solver
BuildRequires: python3-devel, python3-setuptools, python3-nose
BuildRequires: python3-numpy, python3-pytest, python3-Cython, python3-matplotlib
-BuildRequires: sundials-devel, lapack-devel, blas-devel, gcc-gfortran, dos2unix
-BuildRequires: blas-static, python3-numpy-f2py, python3-ipython-console, python3-scipy
+BuildRequires: python3-numpy-f2py, python3-ipython-console, python3-scipy
Requires: python3-matplotlib, python3-numpy, python3-scipy
%description -n python3-%{pname}
@@ -101,13 +91,8 @@ Requires: python3-matplotlib, python3-numpy, python3-scipy
mv trunk python2
pushd python2
-##Copy license files
-tar -xf %{SOURCE1}
-
dos2unix */*
-%if 0%{?fedora} > 25 || 0%{?rhel}
%patch0 -p1
-%endif
%patch1 -p0
%patch2 -p0
%if 0%{?fedora} > 27
@@ -117,10 +102,8 @@ dos2unix */*
sed -i 's|/usr/local/include|%{_includedir}|g' setup.py
sed -i 's|/usr/local/lib|%{_libdir}|g' setup.py
-%ifnarch %{power64} aarch64
sed -i 's|@@lib@@|%{_libdir}|g' setup.py
-sed -i 's|@@inc@@|%{_includedir}/SuperLU|g' setup.py
-%endif
+sed -i 's|@@inc@@|%{_includedir}/SuperLUMT|g' setup.py
popd
%if 0%{?with_python3}
@@ -139,18 +122,13 @@ export BLASNAME=
export INCBLAS=-I%{_includedir}
%endif
-CFLAGS="%{optflags} -Wl,-z,relro -fPIC -Wl,-z,now -Wno-cpp" \
-LDFLAGS="%{__global_ldflags} -shared -Wl,--as-needed -Wl,-z,now" \
-FFLAGS="%{optflags} -Wl,-z,relro -fPIC -Wl,-z,now -Wno-cpp" \
-%{__python2} setup.py build --executable="%{__python2} -s" \
- --blas-home=%{_libdir} --extra-c-flags=$INCBLAS \
- --blas-name=$BLASNAME --lapack-home=%{_libdir} \
- --sundials-home=%{_prefix} \
-%ifnarch %{power64} aarch64
- --superlu-home=%{_libdir} \
-%endif
- --sundials-with-superlu=false --with_openmp=true \
- --extra-c-flags="%{optflags} -Wl,-z,relro -fPIC -Wl,-z,now -Wno-cpp"
--log=DEBUG
+CFLAGS="%{optflags} -Wl,--as-needed" %{__python2} setup.py build
--executable="%{__python2} -s" \
+ --blas-home=%{_libdir} --blas-name=$BLASNAME --lapack-home=%{_libdir} \
+ --sundials-home=%{_prefix} --superlu-home=%{_libdir} \
+ --with_openmp=true \
+ --extra-c-flags="$INCBLAS -I%{_includedir}/SuperLUMT" \
+ --extra-fortran-link-flags="%{__global_ldflags}" \
+ --log=DEBUG
popd
%if 0%{?with_python3}
@@ -165,18 +143,13 @@ export BLASNAME=blas
export INCBLAS=-I%{_includedir}
%endif
-CFLAGS="%{optflags} -Wl,-z,relro -fPIC -Wl,-z,now -Wno-cpp" \
-LDFLAGS="%{__global_ldflags} -shared -Wl,--as-needed -Wl,-z,now" \
-FFLAGS="%{optflags} -Wl,-z,relro -fPIC -Wl,-z,now -Wno-cpp" \
-%{__python3} setup.py build --executable="%{__python3} -s" \
- --blas-home=%{_libdir} --extra-c-flags=$INCBLAS \
- --blas-name=$BLASNAME --lapack-home=%{_libdir} \
- --sundials-home=%{_prefix} \
-%ifnarch %{power64} aarch64
- --superlu-home=%{_libdir} \
-%endif
- --sundials-with-superlu=false --with_openmp=true \
- --extra-c-flags="%{optflags} -Wl,-z,relro -fPIC -Wl,-z,now -Wno-cpp"
--log=DEBUG
+CFLAGS="%{optflags} -lm -Wl,--as-needed" %{__python3} setup.py build
--executable="%{__python3} -s" \
+ --blas-home=%{_libdir} --blas-name=$BLASNAME --lapack-home=%{_libdir} \
+ --sundials-home=%{_prefix} --superlu-home=%{_libdir} \
+ --with_openmp=true \
+ --extra-c-flags="$INCBLAS -I%{_includedir}/SuperLUMT" \
+ --extra-fortran-link-flags="%{__global_ldflags}" \
+ --log=DEBUG
popd
%endif # with_python3
@@ -215,6 +188,7 @@ for i in `find $RPM_BUILD_ROOT%{python3_sitearch}/%{pname} -type f \(
-name "*.s
done
%endif
+%if 0%{?with_check}
%check
# test_dasp3_basic disabled
# See
http://www.jmodelica.org/27779
@@ -233,9 +207,9 @@ LD_PRELOAD=%{_libdir}/libsundials_idas.so
LD_PRELOAD=%{_libdir}/libsundials_cvodes.so
export PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitearch}
%if 0%{?rhel}
-xvfb-run -a nosetests -v
+xvfb-run -a nosetests -v --exclude=test_cvode_with_jac_sparse
%else
-nosetests -v
+nosetests -v --exclude=test_cvode_with_jac_sparse
%endif
popd
@@ -255,28 +229,38 @@ LD_PRELOAD=%{_libdir}/libsundials_idas.so
LD_PRELOAD=%{_libdir}/libsundials_cvodes.so
export PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitearch}
%if 0%{?rhel}
-xvfb-run -a nosetests-%{python3_version} -v
+xvfb-run -a nosetests-%{python3_version} -v --exclude=test_cvode_with_jac_sparse
%else
-nosetests-%{python3_version} -v
+nosetests-%{python3_version} -v --exclude=test_cvode_with_jac_sparse
%endif
popd
%endif
+%endif
%files -n python2-%{pname}
%doc python2/README python2/CHANGELOG
-%license python2/thirdparty/*/LICENSE_* python2/*.txt
+%license python2/thirdparty/*/LICENSE_* python2/LICENSE
%{python2_sitearch}/*.egg-info
%{python2_sitearch}/assimulo/
%if 0%{?with_python3}
%files -n python3-%{pname}
%doc python3/README python3/CHANGELOG
-%license python3/thirdparty/*/LICENSE_* python3/*.txt
+%license python3/thirdparty/*/LICENSE_* python3/LICENSE
%{python3_sitearch}/*.egg-info
%{python3_sitearch}/assimulo/
%endif
%changelog
+* Sat Jan 13 2018 Antonio Trande <sagitterATfedoraproject.org> -
2.9-20.20180113svn859
+- Update to commit #859
+
+* Fri Dec 29 2017 Antonio Trande <sagitterATfedoraproject.org> -
2.9-19.20171229svn858
+- Update to commit #858 (patched for using openblas)
+
+* Thu Dec 28 2017 Antonio Trande <sagitterATfedoraproject.org> -
2.9-18.20171227svn857
+- Update to commit #857 (patched for newest Sundials releases)
+
* Sat Dec 23 2017 Antonio Trande <sagitterATfedoraproject.org> -
2.9-17.20171222svn845
- Fix Python interpreter
diff --git a/sources b/sources
index a14b5fe..e97e25e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (assimulo-commit-845.tar.gz) =
887fbc544683ec5e3c4811ec082f4643fbfe268e05e9974cb7114ba1b0a67bec48f1fbda576e2a10140788436a786eb5783ff885b6788a5a2242eddf22d4b8ab
-SHA512 (assimulo-licenses.tar.gz) =
d13a7f0f03aea4037571ad2953982cd279806664714a8827347f1f95fbb60fdff0168270b85fe13e9196e0a178e1df79702ffbee3077c9a57370aad44221cfc2
+SHA512 (assimulo-commit-859.tar.gz) =
cb7dcb6d31d213a956962acac8c1c59211669b45e138bc0736304d3cbaf04ef10b192ac16501797b7a7303b2ce44a5bf1470c63e987cc75ce7048557a14ec344