diff options
author | Sam James <sam@gentoo.org> | 2023-08-01 07:48:20 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-08-01 07:48:20 +0100 |
commit | ed65e92b6991f1ae2e4bc6f6064cdb6e3e527452 (patch) | |
tree | 29300c723243d19d76962cd2b47e3bfad244450e /dev-python | |
parent | app-misc/nnn: Stabilize 4.8 amd64, #911521 (diff) | |
download | gentoo-ed65e92b6991f1ae2e4bc6f6064cdb6e3e527452.tar.gz gentoo-ed65e92b6991f1ae2e4bc6f6064cdb6e3e527452.tar.bz2 gentoo-ed65e92b6991f1ae2e4bc6f6064cdb6e3e527452.zip |
dev-python/numpy: drop 1.24.3, 1.25.0-r2
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-python')
-rw-r--r-- | dev-python/numpy/Manifest | 1 | ||||
-rw-r--r-- | dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch | 151 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.24.3.ebuild | 175 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.25.0-r2.ebuild | 148 |
4 files changed, 0 insertions, 475 deletions
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 6166c42d838a..42faf69137c6 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -2,7 +2,6 @@ DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 59e2b913f90de76589d8fbb2f07e2d389012c7 DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac SHA512 145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820 DIST numpy-1.24.3.tar.gz 10909904 BLAKE2B 3b14f8b6a7bd484de43c3b0e57f161388d6226e05ed9bc3d1edfaafc713b9597c7574b9b9c20b4e3a6bd291d32a607d95c72d6e25fa346ffdaf97c94767bc315 SHA512 d4b5841cbe68ee6653f99018e4e0182f2e5519a1cd69c14e0a95aa180f878e6a6786ccf0a7c78bf0d511c53e7535d7144fee428572dec7a4b60b25c8a1c0c9e1 DIST numpy-1.24.4.tar.gz 10911229 BLAKE2B 2f054b4ede249653707c3df8ccf6df31b747c0625891ae6e01134f84b02d1300e1d7a88b5741e0e0f05218673d95374f263e5bfddbf17c9510aa93bac002eafc SHA512 89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68 -DIST numpy-1.25.0.tar.gz 10426700 BLAKE2B 9a6c9b7e1172a21ec7cc3b2a0b292308ed7a859072ba73cac3c472cd60f45acd66032f24df19bddef8aa0aee7a243e21d3fa04b68f1383efc6af834cdc04b589 SHA512 e464d82bba0487f520ec7a820492343af5172e807e0f746688bbaff636a31947da62704ef0f35c74a46fb42332f4644f3c497d544789d22e5c01ca0823f82909 DIST numpy-1.25.1.tar.gz 10428993 BLAKE2B ee3edaf5416ac858b995f0cb8df75962af01619969a2c70fa10b4e0d0a1c96a3b441ee470a463cdb7c60910d8823af1c41d37933f87bcaa0a724655d052ed20a SHA512 69cc5426f657a21a6a1fb3bb043b8acec90b87969f90177abb6d7294ca96d04f723ddf90fa40822704b16147a390abafbcda9702e40405ea6b6e22377aade71d DIST numpy-1.25.2-patches.tar.xz 7212 BLAKE2B 718331b2d9f8380df239bf2ad9c24d79924e08797825d7c8655124a55e059790f96641633cdb42c597646764ca9efcaf277d5f5b75f042f533c28f2a81d5a5a8 SHA512 bcc0c55710b8d874e1dd9a57fad5698e09e3c96254922db32a8beeae9a5a54532cb0660d3ce43ca68e70fa7227bca9e0d12a0298aa6972ad2cbcecfe4aee3e85 DIST numpy-1.25.2.tar.gz 10805282 BLAKE2B f138eaf237f3e8052cafbe9fc98b4b62fb0748079df8599fc0950624c856294157410a2ec6fe381eaa8386b1530a39f7037ae1887c9fcfe2e77a3d7ad1ca0171 SHA512 6846d558c227329b6e700965ffa4c7886a7ca5f35234a56d734bc8201d19f7ac87d8ea081094bca13685130dce7bfb98ee4aa3a9dbd538288f10f1d9d82fb699 diff --git a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch b/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch deleted file mode 100644 index 4f3ef21c93b3..000000000000 --- a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch +++ /dev/null @@ -1,151 +0,0 @@ -https://github.com/numpy/numpy/commit/de0b2d5c6dee9303c4a055e7591978ed5a06e403 - -From de0b2d5c6dee9303c4a055e7591978ed5a06e403 Mon Sep 17 00:00:00 2001 -From: matoro <matoro@users.noreply.github.com> -Date: Sun, 18 Jun 2023 19:39:06 -0400 -Subject: [PATCH] BLD: Port long double identification to C for meson - -This ports the old Python code for identifying the long double -representation to C, so that it can be easily invoked by meson. The -original implementation is at https://github.com/numpy/numpy/blob/eead09a3d02c09374942cdc787c0b5e4fe9e7472/numpy/core/setup_common.py#L264-L434 - -The C portion of the code has been tested and confirmed to work on -systems with the following formats, either natively or via an -alternative ABI: INTEL_EXTENDED_16_BYTES_LE, IEEE_QUAD_BE, -IEEE_QUAD_LE, IBM_DOUBLE_DOUBLE_BE, IBM_DOUBLE_DOUBLE_LE, -IEEE_DOUBLE_BE, INTEL_EXTENDED_12_BYTES_LE. - -The original meson port includes an error condition with the comment -"This should not be possible, 12 bits of "content" should still result -in sizeof() being 16." As far as I can tell this is incorrect, as -compiling on an x86_64 system with 32-bit ABI (gcc -m32) does indeed -have sizeof(long double)==12. This is reflected in the C code. - -Closes gh-23972, closes -https://github.com/mesonbuild/meson/issues/11068. ---- - numpy/core/meson.build | 110 ++++++++++++++++++++++++++++++++--------- - 1 file changed, 87 insertions(+), 23 deletions(-) - -diff --git a/numpy/core/meson.build b/numpy/core/meson.build -index 3427de408f1..92b393e4bc1 100644 ---- a/numpy/core/meson.build -+++ b/numpy/core/meson.build -@@ -361,29 +361,93 @@ foreach intrin: optional_intrinsics - endif - endforeach - --# long double representation detection (see setup_common.py) --# TODO: this is still incomplete, and different from how it's done in the --# numpy.distutils based build, see https://github.com/mesonbuild/meson/issues/11068 --longdouble_size = cc.sizeof('long double') --if longdouble_size == 8 -- if host_machine.endian() == 'little' -- longdouble_format = 'IEEE_DOUBLE_LE' -- else -- longdouble_format = 'IEEE_DOUBLE_BE' -- endif --elif longdouble_size == 12 -- error('This should not be possible, 12 bits of "content" should still result in sizeof() being 16. Please report this error!' -- ) --elif longdouble_size == 16 -- if host_machine.endian() == 'little' -- # FIXME: this varies, there's multiple formats here! Not yet implemented. -- # TBD how we deal with the mess of old long double formats. -- longdouble_format = 'INTEL_EXTENDED_16_BYTES_LE' -- else -- error('No idea what this is ....') -- endif --else -- error('Unknown long double size: ' + londouble_size) -+# This is a port of the old python code for identifying the long double -+# representation to C. The old Python code is in this range: -+# https://github.com/numpy/numpy/blob/eead09a3d02c09374942cdc787c0b5e4fe9e7472/numpy/core/setup_common.py#L264-L434 -+# This port is in service of solving gh-23972 -+# as well as https://github.com/mesonbuild/meson/issues/11068 -+longdouble_format = meson.get_compiler('c').run( -+''' -+#include <stdio.h> -+#include <string.h> -+ -+#define repcmp(z) (memcmp((const char *)&foo.x, z, sizeof(foo.x)) == 0) -+ -+const struct { -+ char before[16]; -+ long double x; -+ char after[8]; -+} foo = {{'\0'}, -123456789.0, {'\0'}}; -+ -+int main(void) { -+ switch (sizeof(foo.x)) { -+ case 8: { -+ if (repcmp( -+ ((const char[]){0000, 0000, 0000, 0124, 0064, 0157, 0235, 0301}))) { -+ fprintf(stdout, "IEEE_DOUBLE_LE"); -+ return 0; -+ } -+ if (repcmp( -+ ((const char[]){0301, 0235, 0157, 0064, 0124, 0000, 0000, 0000}))) { -+ fprintf(stdout, "IEEE_DOUBLE_BE"); -+ return 0; -+ } -+ fprintf(stdout, "UNKNOWN"); -+ return 1; -+ } -+ case 12: { -+ if (repcmp(((const char[]){0000, 0000, 0000, 0000, 0240, 0242, 0171, 0353, -+ 0031, 0300, 0000, 0000}))) { -+ fprintf(stdout, "INTEL_EXTENDED_12_BYTES_LE"); -+ return 0; -+ } -+ if (repcmp(((const char[]){0300, 0031, 0000, 0000, 0353, 0171, 0242, 0240, -+ 0000, 0000, 0000, 0000}))) { -+ fprintf(stdout, "MOTOROLA_EXTENDED_12_BYTES_BE"); -+ return 0; -+ } -+ fprintf(stdout, "UNKNOWN"); -+ return 1; -+ } -+ case 16: { -+ if (repcmp( -+ ((const char[]){0000, 0000, 0000, 0000, 0240, 0242, 0171, 0353, -+ 0031, 0300, 0000, 0000, 0000, 0000, 0000, 0000}))) { -+ fprintf(stdout, "INTEL_EXTENDED_16_BYTES_LE"); -+ return 0; -+ } -+ if (repcmp( -+ ((const char[]){0300, 0031, 0326, 0363, 0105, 0100, 0000, 0000, -+ 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) { -+ fprintf(stdout, "IEEE_QUAD_BE"); -+ return 0; -+ } -+ if (repcmp( -+ ((const char[]){0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, -+ 0000, 0000, 0100, 0105, 0363, 0326, 0031, 0300}))) { -+ fprintf(stdout, "IEEE_QUAD_LE"); -+ return 0; -+ } -+ if (repcmp( -+ ((const char[]){0000, 0000, 0000, 0124, 0064, 0157, 0235, 0301, -+ 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) { -+ fprintf(stdout, "IBM_DOUBLE_DOUBLE_LE"); -+ return 0; -+ } -+ if (repcmp( -+ ((const char[]){0301, 0235, 0157, 0064, 0124, 0000, 0000, 0000, -+ 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) { -+ fprintf(stdout, "IBM_DOUBLE_DOUBLE_BE"); -+ return 0; -+ } -+ fprintf(stdout, "UNKNOWN"); -+ return 1; -+ } -+ } -+} -+''').stdout() -+if longdouble_format == 'UNKNOWN' or longdouble_format == 'UNDEFINED' -+ error('Unknown long double format of size: ' + cc.sizeof('long double').to_string()) - endif - cdata.set10('HAVE_LDOUBLE_' + longdouble_format, true) - - diff --git a/dev-python/numpy/numpy-1.24.3.ebuild b/dev-python/numpy/numpy-1.24.3.ebuild deleted file mode 100644 index 66d2ac04315a..000000000000 --- a/dev-python/numpy/numpy-1.24.3.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi -inherit toolchain-funcs - -DOC_PV=${PV} -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE=" - https://numpy.org/ - https://github.com/numpy/numpy/ - https://pypi.org/project/numpy/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="lapack" - -RDEPEND=" - lapack? ( - >=virtual/cblas-3.8 - >=virtual/lapack-3.8 - ) -" -BDEPEND=" - ${RDEPEND} - <dev-python/cython-3[${PYTHON_USEDEP}] - >=dev-python/cython-0.29.30[${PYTHON_USEDEP}] - lapack? ( - virtual/pkgconfig - ) - test? ( - $(python_gen_cond_dep ' - >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}] - ' 'python*') - dev-python/charset-normalizer[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch -) - -distutils_enable_tests pytest - -python_prepare_all() { - # Allow use with setuptools 60.x - # See numpy-1.22.1-revert-setuptools-upper-bound.patch for details - export SETUPTOOLS_USE_DISTUTILS=stdlib - - 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 - - distutils-r1_python_prepare_all -} - -python_compile() { - local -x MAKEOPTS=-j1 #660754 - - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - local EPYTEST_DESELECT=( - # very disk- and memory-hungry - numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays - numpy/lib/tests/test_io.py::test_large_zip - - # precision problems - numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals - - # runs the whole test suite recursively, that's just crazy - numpy/core/tests/test_mem_policy.py::test_new_policy - - # very slow, unlikely to be practically useful - numpy/typing/tests/test_typing.py - ) - - if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then - # Degenerate case. arm32 chroot on arm64. - # bug #774108 - EPYTEST_DESELECT+=( - numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features - ) - fi - - if use x86 ; then - EPYTEST_DESELECT+=( - # https://github.com/numpy/numpy/issues/18388 - numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow - # https://github.com/numpy/numpy/issues/18387 - numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto - # more precision problems - numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16 - ) - fi - - case "${ABI}" in - alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) - EPYTEST_DESELECT+=( - # too large for 32-bit platforms - numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array - ) - ;; - *) - ;; - esac - - distutils_install_for_testing --single-version-externally-managed \ - --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} - - cd "${TEST_DIR}/lib" || die - epytest -k "not _fuzz" -n "$(makeopts_jobs)" -} - -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 ) - distutils-r1_python_install_all -} diff --git a/dev-python/numpy/numpy-1.25.0-r2.ebuild b/dev-python/numpy/numpy-1.25.0-r2.ebuild deleted file mode 100644 index 61b8eb41ef9c..000000000000 --- a/dev-python/numpy/numpy-1.25.0-r2.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( python3_{10..12} pypy3 ) -PYTHON_REQ_USE="threads(+)" -FORTRAN_NEEDED=lapack - -inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE=" - https://numpy.org/ - https://github.com/numpy/numpy/ - https://pypi.org/project/numpy/ -" - -LICENSE="BSD" -SLOT="0" -IUSE="lapack" -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~s390 ~sparc ~x86" -fi - -RDEPEND=" - lapack? ( - >=virtual/cblas-3.8 - >=virtual/lapack-3.8 - ) -" -BDEPEND=" - ${RDEPEND} - >=dev-util/meson-1.1.0 - <dev-python/cython-3[${PYTHON_USEDEP}] - >=dev-python/cython-0.29.30[${PYTHON_USEDEP}] - lapack? ( - virtual/pkgconfig - ) - test? ( - $(python_gen_cond_dep ' - >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}] - ' 'python*') - dev-python/charset-normalizer[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.25.0_rc1-meson-pyproject.toml.patch - "${FILESDIR}"/${PN}-1.25.0-skip-python3.12-irrelevant-tests.patch - "${FILESDIR}"/${PN}-1.25.0-fix-long-double-check.patch -) - -distutils_enable_tests pytest - -python_prepare_all() { - append-flags -fno-strict-aliasing - - distutils-r1_python_prepare_all - - # TODO: Please drop once 1.25.0_rc1-meson-pyproject.toml.patch is gone - sed -i -e "s:version = \"2.0.0.dev0\":version = \"${PV}\":" pyproject.toml || die -} - -python_configure_all() { - DISTUTILS_ARGS=( - -Dblas=$(usev lapack cblas) - -Dlapack=$(usev lapack lapack) - ) -} - -python_test() { - local EPYTEST_DESELECT=( - # very disk-and-memory-hungry - lib/tests/test_io.py::test_large_zip - - # precision problems - core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals - - # runs the whole test suite recursively, that's just crazy - core/tests/test_mem_policy.py::test_new_policy - - typing/tests/test_typing.py - ) - - if [[ ${EPYTHON} == pypy3 ]]; then - EPYTEST_DESELECT+=( - # TODO: crashed - lib/tests/test_histograms.py::TestHistogram::test_big_arrays - ) - fi - - if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then - # Degenerate case. arm32 chroot on arm64. - # bug #774108 - EPYTEST_DESELECT+=( - core/tests/test_cpu_features.py::Test_ARM_Features::test_features - ) - fi - - if use x86 ; then - EPYTEST_DESELECT+=( - # https://github.com/numpy/numpy/issues/18388 - core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow - # https://github.com/numpy/numpy/issues/18387 - random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto - # more precision problems - core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16 - ) - fi - - if [[ $(tc-endian) == "big" ]] ; then - # https://github.com/numpy/numpy/issues/11831 and bug #707116 - EPYTEST_DESELECT+=( - 'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]' - 'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]' - 'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]' - 'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]' - ) - fi - - case "${ABI}" in - alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) - EPYTEST_DESELECT+=( - # too large for 32-bit platforms - core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array - 'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]' - 'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]' - lib/tests/test_histograms.py::TestHistogram::test_big_arrays - ) - ;; - *) - ;; - esac - - rm -rf numpy || die - epytest -n "$(makeopts_jobs)" --pyargs numpy -} - -python_install_all() { - local DOCS=( LICENSE.txt README.md THANKS.txt ) - distutils-r1_python_install_all -} |