bump numpy-1.18.1
This commit is contained in:
parent
d4f7eb0077
commit
a32201282f
GPG Key ID:
E6DB12C8C550F3C0
@ -4,6 +4,7 @@
|
||||
* bump holidays-0.10.1
|
||||
* bump discord-py-1.3.1
|
||||
* bump praw-6.5.1
|
||||
* bump numpy-1.18.1
|
||||
|
||||
2020-02-01 homeassistant-0.105.0_beta4
|
||||
* expanded version patches on ESPHome:
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
AUX numpy-1.14.5-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f38306abb3d2852f4d513152531fb0796f50371c9031b7c685fd35801afbe2a5b649efd4d2cdca9c239f119893b1fde19bda3b SHA512 66a7d9988ab3e6f5b1788df7db9d81719c43ba641edc3450a4912c46aaf0ffb3ba6030dc458182adfb11eafac91f2ba6e1c5aa9b8eb077d6d8c776b2ec5ad2fc
|
||||
AUX numpy-1.14.5-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad
|
||||
AUX numpy-1.15.2-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f38306abb3d2852f4d513152531fb0796f50371c9031b7c685fd35801afbe2a5b649efd4d2cdca9c239f119893b1fde19bda3b SHA512 66a7d9988ab3e6f5b1788df7db9d81719c43ba641edc3450a4912c46aaf0ffb3ba6030dc458182adfb11eafac91f2ba6e1c5aa9b8eb077d6d8c776b2ec5ad2fc
|
||||
AUX numpy-1.15.2-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad
|
||||
AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae
|
||||
AUX numpy-1.17.4-no-hardcode-blas.patch 2769 BLAKE2B 800bd23df8f23f335a8298041403f7caca92128e759db85c354c0328447c2b0cada571694bb96d4e9231b12ab91c7f9533526a06427723a3db4a75f502aec443 SHA512 8f31fdcb5acec9f5a346b35625e526d120577fba95d9039d53c3ad2441a5fc6950251d6ef58ecc53110873d76ec9f9a12c65f60f909413f26f3734f8e0bcfb09
|
||||
AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
|
||||
DIST numpy-1.16.2.zip 5072757 BLAKE2B 36efa226e66569ca0a43fb891cb84a853503c70bb173d993ca59c710bfee02694b900b69d50bff133b23c18dfdd5d81d6ce2853bbda4a248217dc1271dd9113d SHA512 5edd460c0948f424d8deb72f44a33db8ac6a973859b25c824533330dccb4f844197a437e945cd382760bbb6983fd120b08c949ac437973a915246024a8ebc911
|
||||
DIST numpy-1.16.3.zip 5101064 BLAKE2B 92f9ede4b726ac70534c8072296989639c15760e1b681356fb3416ff0adce2a2252ba31f36c4552f651c6f19648f189078c9e98d068d6dad0cdc9d843fdb0936 SHA512 416fc4d5f7f3de56375d6dad1e2a8501682a2895518224d2f8fe3df57bdc1e7574c9b83ef371b8394e2bfc697601623ec1a9080838598deae7db1a0a4cd74efd
|
||||
DIST numpy-1.16.4.zip 5122740 BLAKE2B 702abad76a2d30fc99c18cd17d1d55ce62d7e45c5a1c70d01eb3d1c63bc5827d7f7f63255b92b9533792508dd3945e59daa5edf1dca2b0674b02b0abcbc61616 SHA512 5b2848ef38d79a9d416425a22602dd45aa665df996908015f32fb7477e37aa5968009cb27b3e1bdcf24ce7c0c39bafa3ff380cb45a766c1f530483f88921df21
|
||||
@ -7,6 +12,7 @@ DIST numpy-1.17.0.zip 6486301 BLAKE2B 74d6b2e044edf9b01942934649b91068a114a05932
|
||||
DIST numpy-1.17.1.zip 6491116 BLAKE2B e0a68295384ad2e6387049878332daf43693a8d9164a54bb6ca824ece93d107ce8f00c3318232a8ef54478c41a888fc271e0e357168ad0f95b24138a4e95eafb SHA512 7df8df2b6b148172832930b226b5477088a72f5adbff120d77fd9b77a8440c951f7f9784c346fb7dba9ac969d225346e18dfbe1625a5ce243c99635dc7ba0996
|
||||
DIST numpy-1.17.3.zip 6363960 BLAKE2B db7b87078b537f5f840929c6a9ea5cb02642823cb622c62ca02d75a43e5e910f5cbc6c749eada7e90ccdf76751f87e5c1c766cd4e36af0f8d3cb3bf714b4535f SHA512 00b3a7ea78edeb76f9374bd2de9fcff14abdc9284da5b5579ea81e88d00b18427172c53ea57fdac79f873de8a483139da18ea97b7066666a48d989133c85b394
|
||||
DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f SHA512 f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
|
||||
DIST numpy-1.18.1.zip 5430477 BLAKE2B 5a3325c438f5a6d39feb0efd8745d00f47ecf49cebd0dd0d3a45a2e6d0ccb7b1530b89aa0471d18a1010c4f0d7e554323bca91be653d483aa756732a64979736 SHA512 4e49523f7e6810a78e15c364b7a5e6fbb82df28e62dafaab2f194d580dabc44b7b3080b24274f2eea0fee4cec7d65ee08f39eda44edf210a1dead4f101e93f79
|
||||
DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
|
||||
DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
|
||||
DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
|
||||
@ -17,4 +23,5 @@ EBUILD numpy-1.17.0.ebuild 3700 BLAKE2B 7c9547e5f15bd4629f2712055e99d235cd9b9cca
|
||||
EBUILD numpy-1.17.1.ebuild 3700 BLAKE2B 7c9547e5f15bd4629f2712055e99d235cd9b9ccabd73d447cc2ff5f16664077375a4d0bdc710bf990c870e1f924b0b53836d0df172c2682f616fff7b96e4dd88 SHA512 1884f23ebe413424a58f8490bcb9b2f25dc58d3a2a0018d78459ca51c4e127a9a801156ff7fbd50147d4cff4d1f64cafd375625815fb6a2cf9d2e20e0db1860f
|
||||
EBUILD numpy-1.17.3-r1.ebuild 4078 BLAKE2B 430b7ae1a01e549a20ff8ce4ff500e0705dac04921ba0e37431abfd2a01e33b0906ab8041279028819ef5d6de7bc8082dcfdc4845058d4fcd785f53284afe924 SHA512 ab65afd707b1bd92b5dbb5182a9dac653f2f51638b3ef414cbc1f3cf3d398c0e4b0043cdd1614dade4a078e6e89e90f176d66798621b7bf3cc6b35de872fec93
|
||||
EBUILD numpy-1.17.4.ebuild 4085 BLAKE2B 6af0c8aee1a4036ba4bb6bf73b39cce77aca6a7404505ea0842bcd4d5ba42b272e9e35c5a08fe18bb94ff8dd0c4024c2bd4fd3db98f67d16a93b73c7254c62da SHA512 833558bcdf3abc6fb3e92d2d20ea6cf9c8b6d7e318f509c3bca6099d65cd3d31cff873a45cc3bcf84a3f669b7166968d190a568463d5b21a0963cb8506396161
|
||||
EBUILD numpy-1.18.1.ebuild 3624 BLAKE2B 903d92b51a841916dd84edf5be6d13d5229c953bbe55067dd265a3ceb40dae50d8bdb3b0b26fc49863296c23a106a1e36687ce80650c0bee26006156bd470f98 SHA512 3d72c6a20b64892cdbe7e918825eaf2bfb2ee952d102e9f6dacfd2904e14188b1b3870fe4bfee63aa038c23c5222532f2e96dff1d2686b3e7d156294057616e9
|
||||
MISC metadata.xml 461 BLAKE2B 8832954e31cde79a9535602fb4c7abdf6ec38271c3c5823d2018be1a14fc4b4d5cbe7dac755979b10e76ac8a7579debf1518646d3a55182979893af71bfa5171 SHA512 f687204c86bee2daec69b88f6d2508ecb92ba494d728a19c209d440b5168c52d4a5ce8707b96b8688d6560d7268c23a4ba19dc33477395fd41f7e63ab3ad3653
|
||||
|
||||
75
dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch
Normal file
75
dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch
Normal file
@ -0,0 +1,75 @@
|
||||
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
||||
index 93a8e6f..df3f3f8 100644
|
||||
--- a/numpy/distutils/system_info.py
|
||||
+++ b/numpy/distutils/system_info.py
|
||||
@@ -364,28 +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
|
||||
- 'x11': x11_info,
|
||||
+ cl = {'x11': x11_info,
|
||||
'fft_opt': fft_opt_info,
|
||||
'fftw': fftw_info,
|
||||
'fftw2': fftw2_info,
|
||||
@@ -730,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()
|
||||
@@ -1740,7 +1716,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)
|
||||
|
||||
@@ -1772,16 +1748,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:
|
||||
135
dev-python/numpy/files/numpy-1.14.5-py37.patch
Normal file
135
dev-python/numpy/files/numpy-1.14.5-py37.patch
Normal file
@ -0,0 +1,135 @@
|
||||
From dce7f20e95e6bd3fc07517c0b2daf3942a34ddf7 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Harris <charlesr.harris@gmail.com>
|
||||
Date: Wed, 14 Mar 2018 12:52:26 -0600
|
||||
Subject: [PATCH] MAINT: Fix test_utils.py for Python 3.7.
|
||||
|
||||
The contents of the module warnings registries was made more module
|
||||
specific in Python 3.7 and consequently the tests of the context
|
||||
managers clear_and_catch_warnings and suppress_warnings need updating.
|
||||
---
|
||||
numpy/testing/tests/test_utils.py | 43 +++++++++++++++++++++----------
|
||||
1 file changed, 29 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py
|
||||
index a97b627f9..33b3555b0 100644
|
||||
--- a/numpy/testing/tests/test_utils.py
|
||||
+++ b/numpy/testing/tests/test_utils.py
|
||||
@@ -1114,18 +1114,28 @@ class TestStringEqual(unittest.TestCase):
|
||||
lambda: assert_string_equal("foo", "hello"))
|
||||
|
||||
|
||||
-def assert_warn_len_equal(mod, n_in_context, py3_n_in_context=None):
|
||||
+def assert_warn_len_equal(mod, n_in_context, py34=None, py37=None):
|
||||
mod_warns = mod.__warningregistry__
|
||||
+ num_warns = len(mod_warns)
|
||||
# Python 3.4 appears to clear any pre-existing warnings of the same type,
|
||||
# when raising warnings inside a catch_warnings block. So, there is a
|
||||
# warning generated by the tests within the context manager, but no
|
||||
# previous warnings.
|
||||
if 'version' in mod_warns:
|
||||
- if py3_n_in_context is None:
|
||||
- py3_n_in_context = n_in_context
|
||||
- assert_equal(len(mod_warns) - 1, py3_n_in_context)
|
||||
- else:
|
||||
- assert_equal(len(mod_warns), n_in_context)
|
||||
+ # Python 3 adds a 'version' entry to the registry,
|
||||
+ # do not count it.
|
||||
+ num_warns -= 1
|
||||
+
|
||||
+ # Behavior of warnings is Python version dependent. Adjust the
|
||||
+ # expected result to compensate. In particular, Python 3.7 does
|
||||
+ # not make an entry for ignored warnings.
|
||||
+ if sys.version_info[:2] >= (3, 7):
|
||||
+ if py37 is not None:
|
||||
+ n_in_context = py37
|
||||
+ elif sys.version_info[:2] >= (3, 4):
|
||||
+ if py34 is not None:
|
||||
+ n_in_context = py34
|
||||
+ assert_equal(num_warns, n_in_context)
|
||||
|
||||
|
||||
def _get_fresh_mod():
|
||||
@@ -1134,6 +1144,8 @@ def _get_fresh_mod():
|
||||
try:
|
||||
my_mod.__warningregistry__.clear()
|
||||
except AttributeError:
|
||||
+ # will not have a __warningregistry__ unless warning has been
|
||||
+ # raised in the module at some point
|
||||
pass
|
||||
return my_mod
|
||||
|
||||
@@ -1147,21 +1159,23 @@ def test_clear_and_catch_warnings():
|
||||
warnings.warn('Some warning')
|
||||
assert_equal(my_mod.__warningregistry__, {})
|
||||
# Without specified modules, don't clear warnings during context
|
||||
+ # Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
|
||||
with clear_and_catch_warnings():
|
||||
warnings.simplefilter('ignore')
|
||||
warnings.warn('Some warning')
|
||||
- assert_warn_len_equal(my_mod, 1)
|
||||
+ assert_warn_len_equal(my_mod, 1, py37=0)
|
||||
# Confirm that specifying module keeps old warning, does not add new
|
||||
with clear_and_catch_warnings(modules=[my_mod]):
|
||||
warnings.simplefilter('ignore')
|
||||
warnings.warn('Another warning')
|
||||
- assert_warn_len_equal(my_mod, 1)
|
||||
+ assert_warn_len_equal(my_mod, 1, py37=0)
|
||||
# Another warning, no module spec does add to warnings dict, except on
|
||||
# Python 3.4 (see comments in `assert_warn_len_equal`)
|
||||
+ # Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
|
||||
with clear_and_catch_warnings():
|
||||
warnings.simplefilter('ignore')
|
||||
warnings.warn('Another warning')
|
||||
- assert_warn_len_equal(my_mod, 2, 1)
|
||||
+ assert_warn_len_equal(my_mod, 2, py34=1, py37=0)
|
||||
|
||||
|
||||
def test_suppress_warnings_module():
|
||||
@@ -1178,6 +1192,7 @@ def test_suppress_warnings_module():
|
||||
np.apply_along_axis(warn, 0, [0])
|
||||
|
||||
# Test module based warning suppression:
|
||||
+ assert_warn_len_equal(my_mod, 0)
|
||||
with suppress_warnings() as sup:
|
||||
sup.record(UserWarning)
|
||||
# suppress warning from other module (may have .pyc ending),
|
||||
@@ -1189,8 +1204,7 @@ def test_suppress_warnings_module():
|
||||
# got filtered)
|
||||
assert_(len(sup.log) == 1)
|
||||
assert_(sup.log[0].message.args[0] == "Some warning")
|
||||
-
|
||||
- assert_warn_len_equal(my_mod, 0)
|
||||
+ assert_warn_len_equal(my_mod, 0, py37=0)
|
||||
sup = suppress_warnings()
|
||||
# Will have to be changed if apply_along_axis is moved:
|
||||
sup.filter(module=my_mod)
|
||||
@@ -1204,11 +1218,11 @@ def test_suppress_warnings_module():
|
||||
assert_warn_len_equal(my_mod, 0)
|
||||
|
||||
# Without specified modules, don't clear warnings during context
|
||||
+ # Python 3.7 does not add ignored warnings.
|
||||
with suppress_warnings():
|
||||
warnings.simplefilter('ignore')
|
||||
warnings.warn('Some warning')
|
||||
- assert_warn_len_equal(my_mod, 1)
|
||||
-
|
||||
+ assert_warn_len_equal(my_mod, 1, py37=0)
|
||||
|
||||
def test_suppress_warnings_type():
|
||||
# Initial state of module, no warnings
|
||||
@@ -1232,10 +1246,11 @@ def test_suppress_warnings_type():
|
||||
assert_warn_len_equal(my_mod, 0)
|
||||
|
||||
# Without specified modules, don't clear warnings during context
|
||||
+ # Python 3.7 does not add ignored warnings.
|
||||
with suppress_warnings():
|
||||
warnings.simplefilter('ignore')
|
||||
warnings.warn('Some warning')
|
||||
- assert_warn_len_equal(my_mod, 1)
|
||||
+ assert_warn_len_equal(my_mod, 1, py37=0)
|
||||
|
||||
|
||||
def test_suppress_warnings_decorate_no_record():
|
||||
--
|
||||
2.18.0
|
||||
|
||||
76
dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch
Normal file
76
dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch
Normal file
@ -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:
|
||||
55
dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch
Normal file
55
dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch
Normal file
@ -0,0 +1,55 @@
|
||||
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
||||
index ba2b1f46c..09db18e69 100644
|
||||
--- a/numpy/distutils/system_info.py
|
||||
+++ b/numpy/distutils/system_info.py
|
||||
@@ -374,28 +374,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
|
||||
- 'flame': flame_info, # use lapack_opt instead
|
||||
- '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
|
||||
+ cl = {'flame': flame_info, # use lapack_opt instead
|
||||
'accelerate': accelerate_info, # use blas_opt instead
|
||||
'x11': x11_info,
|
||||
'fft_opt': fft_opt_info,
|
||||
@@ -796,10 +775,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()
|
||||
@@ -1842,7 +1818,7 @@ class blas_info(system_info):
|
||||
lib = self.get_cblas_libs(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)
|
||||
|
||||
47
dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
Normal file
47
dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
Normal file
@ -0,0 +1,47 @@
|
||||
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
||||
index ba2b1f46c..09db18e69 100644
|
||||
--- a/numpy/distutils/system_info.py
|
||||
+++ b/numpy/distutils/system_info.py
|
||||
@@ -374,28 +374,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
|
||||
- 'flame': flame_info, # use lapack_opt instead
|
||||
- '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
|
||||
+ cl = {'flame': flame_info, # use lapack_opt instead
|
||||
'accelerate': accelerate_info, # use blas_opt instead
|
||||
'x11': x11_info,
|
||||
'fft_opt': fft_opt_info,
|
||||
@@ -796,10 +775,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()
|
||||
|
||||
139
dev-python/numpy/numpy-1.18.1.ebuild
Normal file
139
dev-python/numpy/numpy-1.18.1.ebuild
Normal file
@ -0,0 +1,139 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
FORTRAN_NEEDED=lapack
|
||||
|
||||
inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
|
||||
|
||||
DOC_PV="1.16.4"
|
||||
DESCRIPTION="Fast array and numerical python library"
|
||||
HOMEPAGE="https://www.numpy.org"
|
||||
SRC_URI="
|
||||
mirror://pypi/${PN:0:1}/${PN}/${P}.zip
|
||||
doc? (
|
||||
https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
|
||||
https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
|
||||
https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
|
||||
)"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc lapack test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
lapack? (
|
||||
>=virtual/cblas-3.8
|
||||
>=virtual/lapack-3.8
|
||||
)"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="app-arch/unzip
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
lapack? ( virtual/pkgconfig )
|
||||
test? (
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
if use doc; then
|
||||
unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
|
||||
fi
|
||||
}
|
||||
|
||||
python_prepare_all() {
|
||||
if use lapack; then
|
||||
local incdir="${EPREFIX}"/usr/include
|
||||
local libdir="${EPREFIX}"/usr/$(get_libdir)
|
||||
cat >> site.cfg <<-EOF || die
|
||||
[blas]
|
||||
include_dirs = ${incdir}
|
||||
library_dirs = ${libdir}
|
||||
blas_libs = cblas,blas
|
||||
[lapack]
|
||||
library_dirs = ${libdir}
|
||||
lapack_libs = lapack
|
||||
EOF
|
||||
else
|
||||
export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
|
||||
fi
|
||||
|
||||
export CC="$(tc-getCC) ${CFLAGS}"
|
||||
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
|
||||
# with the subtle difference that we don't want to break Darwin where
|
||||
# -shared is not a valid linker argument
|
||||
if [[ ${CHOST} != *-darwin* ]]; then
|
||||
append-ldflags -shared
|
||||
fi
|
||||
|
||||
# only one fortran to link with:
|
||||
# linking with cblas and lapack library will force
|
||||
# autodetecting and linking to all available fortran compilers
|
||||
append-fflags -fPIC
|
||||
if use lapack; then
|
||||
NUMPY_FCONFIG="config_fc --noopt --noarch"
|
||||
# workaround bug 335908
|
||||
[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
|
||||
fi
|
||||
|
||||
# don't version f2py, we will handle it.
|
||||
sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
|
||||
|
||||
# disable fuzzed tests
|
||||
find numpy/*/tests -name '*.py' -exec sed -i \
|
||||
-e 's:def \(.*_fuzz\):def _\1:' {} + || die
|
||||
# very memory- and disk-hungry
|
||||
sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
export MAKEOPTS=-j1 #660754
|
||||
|
||||
local python_makeopts_jobs=""
|
||||
python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
|
||||
distutils-r1_python_compile \
|
||||
${python_makeopts_jobs} \
|
||||
${NUMPY_FCONFIG}
|
||||
}
|
||||
|
||||
python_test() {
|
||||
distutils_install_for_testing --single-version-externally-managed \
|
||||
--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
|
||||
|
||||
cd "${TMPDIR}" || die
|
||||
|
||||
"${EPYTHON}" -c "
|
||||
import numpy, sys
|
||||
r = numpy.test(label='full', verbose=3)
|
||||
sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install() {
|
||||
distutils-r1_python_install ${NUMPY_FCONFIG}
|
||||
python_optimize
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local DOCS=( THANKS.txt )
|
||||
|
||||
if use doc; then
|
||||
local HTML_DOCS=( "${WORKDIR}"/html/. )
|
||||
DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
|
||||
fi
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user