From 884325bae4a95958904ac75f5f03631c5548f0ab Mon Sep 17 00:00:00 2001 From: Laszlo Valko Date: Sun, 4 Oct 2020 00:28:22 +0200 Subject: [PATCH] Restored numpy-1.16.5. --- dev-python/numpy/Manifest | 7 +- ...ch => numpy-1.15.4-no-hardcode-blas.patch} | 43 +++++++++-- ....5-setup.py-install-skip-build-fails.patch | 23 ++++++ ...y-1.19.0.ebuild => numpy-1.16.5-r1.ebuild} | 74 +++++++++++-------- 4 files changed, 107 insertions(+), 40 deletions(-) rename dev-python/numpy/files/{numpy-1.17.4-no-hardcode-blasv2.patch => numpy-1.15.4-no-hardcode-blas.patch} (53%) create mode 100644 dev-python/numpy/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch rename dev-python/numpy/{numpy-1.19.0.ebuild => numpy-1.16.5-r1.ebuild} (65%) diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 43a09f3..d4a161d 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,7 +1,8 @@ -AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad -DIST numpy-1.19.0.zip 7296082 BLAKE2B e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c SHA512 24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850 +AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae +AUX numpy-1.16.5-setup.py-install-skip-build-fails.patch 916 BLAKE2B 0745e076d4338b2591111c89183e6779c7461e73f4d9ec81b561fa6577da5840c268ce2ce5502d846d2a2e43ef74d4ce28be1dbd3fafee9ea955f81b8d3479db SHA512 f1708b76a7b1e308153b01f73bdf314d9a1fd7f57505bf0ed2da708097fdbc7735574520b99d32c76130e5bfef2bb74a45c683ef5f6b791dee153e29a8e87db2 +DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898 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 -EBUILD numpy-1.19.0.ebuild 3736 BLAKE2B 73a8de08857af2175b7ff99280f98dfae1b93c34dbca52c7bdbbd065591be69186ba9e70392acd8e534d4580d5c0740eeeaa6b56c6c975010b79f69b0b939d5f SHA512 8a366082d916ed7d24558cb7886ed51aa7f138f1b1a65ca024012602f8cf209499b1531831bcdf7d6da57cc6809cac2f0340b3e1350660d983575c2ee75d42e5 +EBUILD numpy-1.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch similarity index 53% rename from dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch rename to dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch index 850f70f..979b56b 100644 --- a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch +++ b/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch @@ -1,8 +1,8 @@ diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index ba2b1f46c..09db18e69 100644 +index 65d7de316..a85640d30 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0): +@@ -364,29 +364,7 @@ def get_info(name, notfound_action=0): 1 - display warning message 2 - raise error """ @@ -18,7 +18,6 @@ index ba2b1f46c..09db18e69 100644 - '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 @@ -28,11 +27,13 @@ index ba2b1f46c..09db18e69 100644 - '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, +- 'accelerate': accelerate_info, # use blas_opt instead +- 'x11': x11_info, ++ cl = {'x11': x11_info, 'fft_opt': fft_opt_info, -@@ -796,10 +775,7 @@ class system_info(object): + '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'): @@ -44,4 +45,32 @@ index ba2b1f46c..09db18e69 100644 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: diff --git a/dev-python/numpy/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch b/dev-python/numpy/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch new file mode 100644 index 0000000..aa141de --- /dev/null +++ b/dev-python/numpy/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch @@ -0,0 +1,23 @@ +From b8e741c66f71071c3406e592e1537570731bcb35 Mon Sep 17 00:00:00 2001 +From: mattip +Date: Sun, 26 May 2019 08:55:53 +0300 +Subject: [PATCH] BUG: setup.py install --skip-build fails + +--- + numpy/distutils/command/install_clib.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py +index 662aa00bda9..6a73f7e3308 100644 +--- a/numpy/distutils/command/install_clib.py ++++ b/numpy/distutils/command/install_clib.py +@@ -19,6 +19,9 @@ def finalize_options(self): + + def run (self): + build_clib_cmd = get_cmd("build_clib") ++ if not build_clib_cmd.build_clib: ++ # can happen if the user specified `--skip-build` ++ build_clib_cmd.finalize_options() + build_dir = build_clib_cmd.build_clib + + # We need the compiler to get the library name -> filename association diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.16.5-r1.ebuild similarity index 65% rename from dev-python/numpy/numpy-1.19.0.ebuild rename to dev-python/numpy/numpy-1.16.5-r1.ebuild index 8146019..76d73af 100644 --- a/dev-python/numpy/numpy-1.19.0.ebuild +++ b/dev-python/numpy/numpy-1.16.5-r1.ebuild @@ -1,15 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" -PYTHON_COMPAT=( python2_7 python3_{6..9} ) +PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)" FORTRAN_NEEDED=lapack -DISTUTILS_USE_SETUPTOOLS=rdepend - inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs DOC_PV="1.16.4" @@ -24,33 +22,28 @@ SRC_URI=" )" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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 - ) -" -BDEPEND=" - ${RDEPEND} - app-arch/unzip - >=dev-python/cython-0.29.15[${PYTHON_USEDEP}] + virtual/cblas + virtual/lapack + )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip + dev-python/setuptools[${PYTHON_USEDEP}] lapack? ( virtual/pkgconfig ) test? ( - >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}] - ) -" + dev-python/pytest[${PYTHON_USEDEP}] + )" PATCHES=( - "${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch + "${FILESDIR}"/${PN}-1.15.4-no-hardcode-blas.patch + "${FILESDIR}"/numpy-1.16.5-setup.py-install-skip-build-fails.patch ) -distutils_enable_tests pytest - src_unpack() { default if use doc; then @@ -58,18 +51,36 @@ src_unpack() { fi } +pc_incdir() { + $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ + sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libdir() { + $(tc-getPKG_CONFIG) --libs-only-L $@ | \ + sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libs() { + $(tc-getPKG_CONFIG) --libs-only-l $@ | \ + sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ + -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ + | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' +} + python_prepare_all() { if use lapack; then + append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" 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 + include_dirs = $(pc_incdir cblas):${incdir} + library_dirs = $(pc_libdir cblas blas):${libdir} + blas_libs = $(pc_libs cblas blas) [lapack] - library_dirs = ${libdir} - lapack_libs = lapack + library_dirs = $(pc_libdir lapack):${libdir} + lapack_libs = $(pc_libs lapack) EOF else export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None @@ -111,7 +122,11 @@ python_prepare_all() { python_compile() { export MAKEOPTS=-j1 #660754 - distutils-r1_python_compile ${NUMPY_FCONFIG} + local python_makeopts_jobs="" + python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" + distutils-r1_python_compile \ + ${python_makeopts_jobs} \ + ${NUMPY_FCONFIG} } python_test() { @@ -130,11 +145,10 @@ python_install() { # https://github.com/numpy/numpy/issues/16005 local mydistutilsargs=( build_src ) distutils-r1_python_install ${NUMPY_FCONFIG} - python_optimize } python_install_all() { - local DOCS=( LICENSE.txt README.md THANKS.txt ) + local DOCS=( THANKS.txt ) if use doc; then local HTML_DOCS=( "${WORKDIR}"/html/. )