diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-10-27 17:21:04 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-10-27 17:21:04 +0000 |
| commit | bc744442d1659f023ca57b441f8f1fea4905c33b (patch) | |
| tree | cf6bf5cf692e7ae38bfa0d13ad770141d47481fe /dev-python/numpy/files | |
| parent | Fix libnl dependency (bug #342461). (diff) | |
| download | gentoo-2-bc744442d1659f023ca57b441f8f1fea4905c33b.tar.gz gentoo-2-bc744442d1659f023ca57b441f8f1fea4905c33b.tar.bz2 gentoo-2-bc744442d1659f023ca57b441f8f1fea4905c33b.zip | |
Included fixes for atlas, #386531; thanks My Th for the patch
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/numpy/files')
| -rw-r--r-- | dev-python/numpy/files/numpy-1.6.1-atlas.patch | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/dev-python/numpy/files/numpy-1.6.1-atlas.patch b/dev-python/numpy/files/numpy-1.6.1-atlas.patch index 0f0e1ffdaead..b10f653ea33b 100644 --- a/dev-python/numpy/files/numpy-1.6.1-atlas.patch +++ b/dev-python/numpy/files/numpy-1.6.1-atlas.patch @@ -1,22 +1,17 @@ ---- numpy/distutils/system_info.py.orig 2011-08-08 11:40:37.514881710 -0500 -+++ numpy/distutils/system_info.py 2011-08-08 11:41:36.386872112 -0500 -@@ -1015,9 +1015,6 @@ - else: - info['language'] = 'f77' - -- atlas_version, atlas_extra_info = get_atlas_version(**atlas) -- dict_append(info, **atlas_extra_info) -- - self.set_info(**info) - - class atlas_blas_info(atlas_info): -@@ -1042,9 +1039,6 @@ - dict_append(info,include_dirs=[h]) - info['language'] = 'c' - -- atlas_version, atlas_extra_info = get_atlas_version(**atlas) -- dict_append(atlas, **atlas_extra_info) -- - dict_append(info,**atlas) - - self.set_info(**info) +--- numpy/distutils/system_info.py 2011-10-10 20:45:44.261316565 +0300 ++++ numpy/distutils/system_info.py 2011-10-10 20:50:22.977932228 +0300 +@@ -255,13 +255,7 @@ + 1 - display warning message + 2 - raise error + """ +- cl = {'atlas':atlas_info, # use lapack_opt or blas_opt instead +- 'atlas_threads':atlas_threads_info, # ditto +- 'atlas_blas':atlas_blas_info, +- 'atlas_blas_threads':atlas_blas_threads_info, +- 'lapack_atlas':lapack_atlas_info, # use lapack_opt instead +- 'lapack_atlas_threads':lapack_atlas_threads_info, # ditto +- 'mkl':mkl_info, ++ cl = {'mkl':mkl_info, + 'lapack_mkl':lapack_mkl_info, # use lapack_opt instead + 'blas_mkl':blas_mkl_info, # use blas_opt instead + 'x11':x11_info, |