diff options
| author | Pacho Ramos <pacho@gentoo.org> | 2019-12-25 16:36:54 +0100 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2019-12-25 17:57:12 +0100 |
| commit | 00d6926266e8a86f6d7f49f1e78a3a674d449a7c (patch) | |
| tree | 09c906735f482b63c4a86acd933dd51655cd6b3b /dev-python/numpy-python2/files | |
| parent | d1bdcff7a8f4b69a133bbb3d30c449a12da998c6 (diff) | |
| download | gentoo-00d6926266e8a86f6d7f49f1e78a3a674d449a7c.tar.gz gentoo-00d6926266e8a86f6d7f49f1e78a3a674d449a7c.tar.bz2 gentoo-00d6926266e8a86f6d7f49f1e78a3a674d449a7c.zip | |
dev-python/numpy-python2: Package supporting py2 for smoother transition
As discussed in https://bugs.gentoo.org/703240 I will maintain a
numpy-python2 package to allow easier transition of reverse deps allowing to
still port them to python 3.8.
The idea of this package is to drop it as soon as possible, as a
consequence:
- python2-only packages depending on this should have a bug opened and
blocking bug #703754 to allow us to track upstream progress on python3
porting. As a consequence, if the package upstream is dead or not planning
to port to python3 ever, it should be treecleaned instead of adding a
dependency on this package.
- python3 packages also needing python2 support. During a transition period,
it's possible that we will need to temporally allow some packages (usually
libraries) to support python2 until other reverse deps of that libs are
handled. You should then open a bug report blocking bug #703756 to follow
the progress on porting them completely to python3. As a consequence, if
your package supports both, you must try to simply remove python2 support
over depending on this package, while only adding a dep on numpy-python2 if
it is really hard to handle all reverse deps immediately. In that case, a
bug report need to be opened as explained.
Closes: https://bugs.gentoo.org/703240
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
Diffstat (limited to 'dev-python/numpy-python2/files')
| -rw-r--r-- | dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch new file mode 100644 index 000000000000..979b56bd6dc5 --- /dev/null +++ b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch @@ -0,0 +1,76 @@ +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index 65d7de316..a85640d30 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -364,29 +364,7 @@ def get_info(name, notfound_action=0): + 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 +- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead +- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto +- 'atlas_3_10_blas': atlas_3_10_blas_info, +- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, +- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead +- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto +- 'mkl': mkl_info, +- # openblas which may or may not have embedded lapack +- 'openblas': openblas_info, # use blas_opt instead +- # openblas with embedded lapack +- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead +- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead +- 'blis': blis_info, # use blas_opt instead +- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead +- 'blas_mkl': blas_mkl_info, # use blas_opt instead +- 'accelerate': accelerate_info, # use blas_opt instead +- 'x11': x11_info, ++ cl = {'x11': x11_info, + 'fft_opt': fft_opt_info, + 'fftw': fftw_info, + 'fftw2': fftw2_info, +@@ -731,10 +709,7 @@ class system_info(object): + return [b for b in [a.strip() for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): +- if hasattr(self, '_lib_names'): +- return self.get_libs(key, default=self._lib_names) +- else: +- return self.get_libs(key, '') ++ return self.get_libs(key, '') + + def library_extensions(self): + c = customized_ccompiler() +@@ -1685,7 +1660,7 @@ class blas_info(system_info): + lib = self.has_cblas(info) + if lib is not None: + info['language'] = 'c' +- info['libraries'] = [lib] ++ info['libraries'] = lib + info['define_macros'] = [('HAVE_CBLAS', None)] + self.set_info(**info) + +@@ -1717,16 +1692,16 @@ class blas_info(system_info): + # check for cblas lib, and if not present check for blas lib. + try: + c.link_executable(obj, os.path.join(tmpdir, "a.out"), +- libraries=["cblas"], ++ libraries=info["libraries"], + library_dirs=info['library_dirs'], + extra_postargs=info.get('extra_link_args', [])) +- res = "cblas" ++ res = info["libraries"] + except distutils.ccompiler.LinkError: + c.link_executable(obj, os.path.join(tmpdir, "a.out"), + libraries=["blas"], + library_dirs=info['library_dirs'], + extra_postargs=info.get('extra_link_args', [])) +- res = "blas" ++ res = ["blas"] + except distutils.ccompiler.CompileError: + res = None + finally: |
