pool/python-numpy
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 386196 from devel:languages:python

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/386196
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2016-04-11 07:12:48 +00:00 committed by Git OBS Bridge
parent 17dec2c552
commit e11fb1df02
7 changed files with 115 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
numpy-1.10.4-cblas.patch Normal file
View File

@ -0,0 +1,39 @@
diff -Npru numpy-1.10.4.orig/numpy/distutils/system_info.py numpy-1.10.4/numpy/distutils/system_info.py
--- numpy-1.10.4.orig/numpy/distutils/system_info.py 2016-03-29 17:35:18.195045099 -0400
+++ numpy-1.10.4/numpy/distutils/system_info.py 2016-03-30 15:14:40.981853527 -0400
@@ -1688,9 +1688,10 @@ class blas_info(system_info):
info['language'] = 'f77' # XXX: is it generally true?
else:
lib = self.has_cblas(info)
+ # In openSUSE, both libblas.so and libcblas.so are needed.
if lib is not None:
info['language'] = 'c'
- info['libraries'] = [lib]
+ info['libraries'] = [lib,'blas']
info['define_macros'] = [('HAVE_CBLAS', None)]
self.set_info(**info)
@@ -1720,18 +1721,19 @@ class blas_info(system_info):
# check we can link (find library)
# some systems have separate cblas and blas libs. First
# check for cblas lib, and if not present check for blas lib.
+ # In openSUSE, libcblas.so dose not contain symbols in libblas.so
try:
c.link_executable(obj, os.path.join(tmpdir, "a.out"),
- libraries=["cblas"],
+ libraries=["blas"],
library_dirs=info['library_dirs'],
extra_postargs=info.get('extra_link_args', []))
- res = "cblas"
+ res = "blas"
except distutils.ccompiler.LinkError:
c.link_executable(obj, os.path.join(tmpdir, "a.out"),
- libraries=["blas"],
+ libraries=["cblas","blas"],
library_dirs=info['library_dirs'],
extra_postargs=info.get('extra_link_args', []))
- res = "blas"
+ res = "cblas"
except distutils.ccompiler.CompileError:
res = None
finally:

3
numpy-1.10.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b
size 4069996

3
numpy-1.11.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e
size 4169494

24
python-numpy-doc.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Mon Apr 4 16:15:27 UTC 2016 - toddrme2178@gmail.com
specfile:
* require setuptools
- update to version 1.11.0:
* Highlights
+ The datetime64 type is now timezone naive.
+ A dtype parameter has been added to randint.
+ Improved detection of two arrays possibly sharing memory.
+ Automatic bin size estimation for np.histogram.
+ Speed optimization of A @ A.T and dot(A, A.T).
+ New function np.moveaxis for reordering array axes.
* full changelog at https://github.com/numpy/numpy/blob/master/doc/release/1.11.0-notes.rst
-------------------------------------------------------------------
Wed Mar 30 17:59:14 UTC 2016 - stecue@gmail.com
- Add numpy-1.10.4-cblas.patch to build against system cblas.
Numpy assumes either libblas.so or libcblas.so to contain all CBLAS
and BLAS functions. However the cblas-devel in Leap and Tumbleweed
contains only the CBLAS interface and libblas.so is also needed.
-------------------------------------------------------------------
Sat Mar 19 15:13:24 UTC 2016 - bwiedemann@suse.com

11
python-numpy-doc.spec
View File

@ -19,7 +19,7 @@
%define modname numpy
Name: python-numpy-doc
%define docname numpydoc
Version: 1.10.4
Version: 1.11.0
Release: 0
%define docvers 0.4
Url: http://www.numpy.org/
@ -31,14 +31,20 @@ Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}
Patch0: numpy-buildfix.patch
# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure
Patch1: numpy-1.9.0-remove-__declspec.patch
# PATCH-FIX-OPENSUSE numpy-1.10.4-cblas.patch -- fix for building with system cblas.
Patch2: numpy-1.10.4-cblas.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: blas-devel
BuildRequires: lapack-devel
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
BuildRequires: cblas-devel
%endif
BuildRequires: python-Sphinx
BuildRequires: python-devel
BuildRequires: python-matplotlib
BuildRequires: python-numpy-devel = %{version}
BuildRequires: python-numpydoc
BuildRequires: python-setuptools
BuildRequires: zip
# LaTeX requirements, not available on SLES
%if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
@ -122,6 +128,9 @@ This package provides the PDF documentation for NumPy
%setup -q -n numpy-%{version}
%patch0 -p1
%patch1 -p1
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
%patch2 -p1
%endif
# drop build date from doc to fix build-compare
sed -i "s/\(html_last_updated_fmt = \).*/\\1None/" doc/source/conf.py

26
python-numpy.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Mon Apr 4 16:15:27 UTC 2016 - toddrme2178@gmail.com
specfile:
* require setuptools
- update to version 1.11.0:
* Highlights
+ The datetime64 type is now timezone naive.
+ A dtype parameter has been added to randint.
+ Improved detection of two arrays possibly sharing memory.
+ Automatic bin size estimation for np.histogram.
+ Speed optimization of A @ A.T and dot(A, A.T).
+ New function np.moveaxis for reordering array axes.
* full changelog at https://github.com/numpy/numpy/blob/master/doc/release/1.11.0-notes.rst
-------------------------------------------------------------------
Wed Mar 30 14:18:43 UTC 2016 - stecue@gmail.com
- Add numpy-1.10.4-cblas.patch to build against system cblas.
Numpy assumes either libblas.so or libcblas.so to contain all CBLAS
and BLAS functions. However the cblas-devel in Leap and Tumbleweed
contains only the CBLAS interface and libblas.so is also needed.
-------------------------------------------------------------------
Fri Jan 8 09:37:38 UTC 2016 - toddrme2178@gmail.com
@ -394,9 +418,11 @@ Wed Feb 4 17:10:04 CET 2009 - matejcik@suse.cz
- package taken directly from devel:languages:python repository,
original changelog follows:
-------------------------------------------------------------------
* Tue Dec 02 2008 - James Oakley <jfunk@funktronics.ca> - 1.2.1-1
- Update to 1.2.1
-------------------------------------------------------------------
* Mon Aug 11 2008 - James Oakley <jfunk@funktronics.ca> - 1.1.1-1
- Update to 1.1.1:
- Python 2.3.x fixes

14
python-numpy.spec
View File

@ -19,7 +19,7 @@
%define with_atlas 0
Name: python-numpy
Version: 1.10.4
Version: 1.11.0
Release: 0
Url: http://www.numpy.org/
Summary: NumPy array processing for numbers, strings, records and objects
@ -30,10 +30,16 @@ Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}
Patch0: numpy-buildfix.patch
# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure
Patch1: numpy-1.9.0-remove-__declspec.patch
# PATCH-FIX-OPENSUSE numpy-1.10.4-cblas.patch -- fix for building with system cblas.
Patch2: numpy-1.10.4-cblas.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: blas-devel
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
BuildRequires: cblas-devel
%endif
BuildRequires: lapack-devel
BuildRequires: python-devel >= 2.6
BuildRequires: python-setuptools
Requires: python >= %{py_ver}
Provides: numpy = %{version}
%if %{with_atlas} == 1
@ -83,6 +89,9 @@ Requires: gcc-gfortran
%if %{with_atlas} == 1
Requires: libatlas3-devel
%endif
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
Requires: cblas-devel
%endif
%description devel
This package contains files for developing applications using numpy.
@ -91,6 +100,9 @@ This package contains files for developing applications using numpy.
%setup -q -n numpy-%{version}
%patch0 -p1
%patch1 -p1
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
%patch2 -p1
%endif
# Fix non-executable scripts
sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py