diff --git a/.gitignore b/.gitignore index 0204187..8dd2147 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ numpy-1.4.1.tar.gz /numpy-1.24.1.tar.gz /numpy-1.24.3.tar.gz /numpy-1.24.4.tar.gz +/numpy-1.26.0.tar.gz diff --git a/24772.patch b/24772.patch new file mode 100644 index 0000000..b1adbad --- /dev/null +++ b/24772.patch @@ -0,0 +1,24 @@ +From 01b83b4d4e54881f68eb6edca6fb65b133825002 Mon Sep 17 00:00:00 2001 +From: Charles Bousseau +Date: Thu, 21 Sep 2023 15:24:07 -0400 +Subject: [PATCH] align test_dispatcher s390x targets with + _umath_tests_mtargets + +--- + numpy/core/tests/test_cpu_dispatcher.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/numpy/core/tests/test_cpu_dispatcher.py b/numpy/core/tests/test_cpu_dispatcher.py +index 2f7eac7e8e9..41a60d5c395 100644 +--- a/numpy/core/tests/test_cpu_dispatcher.py ++++ b/numpy/core/tests/test_cpu_dispatcher.py +@@ -9,7 +9,8 @@ def test_dispatcher(): + targets = ( + "SSE2", "SSE41", "AVX2", + "VSX", "VSX2", "VSX3", +- "NEON", "ASIMD", "ASIMDHP" ++ "NEON", "ASIMD", "ASIMDHP", ++ "VX", "VXE" + ) + highest_sfx = "" # no suffix for the baseline + all_sfx = [] diff --git a/24776.patch b/24776.patch new file mode 100644 index 0000000..a69b891 --- /dev/null +++ b/24776.patch @@ -0,0 +1,22 @@ +From 8f8a4a4a54d63ce7d9ed8aca024561e6820d8970 Mon Sep 17 00:00:00 2001 +From: Sayed Adel +Date: Fri, 22 Sep 2023 11:30:49 +0400 +Subject: [PATCH] BUG: Fix SIMD f32 trunc test on s390x when baseline is none + +--- + numpy/core/tests/test_simd_module.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/numpy/core/tests/test_simd_module.py b/numpy/core/tests/test_simd_module.py +index 44dc58dac09..4fbaa9f3008 100644 +--- a/numpy/core/tests/test_simd_module.py ++++ b/numpy/core/tests/test_simd_module.py +@@ -86,6 +86,8 @@ def test_signed_overflow(self, sfx): + assert lanes == [0] * nlanes + + def test_truncate_f32(self): ++ if not npyv.simd_f32: ++ pytest.skip("F32 isn't support by the SIMD extension") + f32 = npyv.setall_f32(0.1)[0] + assert f32 != 0.1 + assert round(f32, 1) == 0.1 diff --git a/f2py_test.patch b/f2py_test.patch new file mode 100644 index 0000000..51c35c8 --- /dev/null +++ b/f2py_test.patch @@ -0,0 +1,15 @@ +diff --git c/numpy/f2py/tests/test_compile_function.py i/numpy/f2py/tests/test_compile_function.py +index 3c16f3198..e38fed898 100644 +--- c/numpy/f2py/tests/test_compile_function.py ++++ i/numpy/f2py/tests/test_compile_function.py +@@ -17,6 +17,10 @@ def setup_module(): + pytest.skip("Needs C compiler") + if not util.has_f77_compiler(): + pytest.skip("Needs FORTRAN 77 compiler") ++ if sys.version_info[:2] >= (3, 12): ++ pytest.skip( ++ "F2PY compilation tests do not work with meson." ++ ) + + + # extra_args can be a list (since gh-11937) or string. diff --git a/numpy.spec b/numpy.spec index c3393c3..c0816c8 100644 --- a/numpy.spec +++ b/numpy.spec @@ -19,8 +19,8 @@ %global modname numpy Name: numpy -Version: 1.24.4 -Release: 2%{?dist} +Version: 1.26.0 +Release: 1%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -29,12 +29,9 @@ License: BSD-3-Clause AND Apache-2.0 URL: http://www.numpy.org/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: https://numpy.org/doc/%(echo %{version} | cut -d. -f1-2)/numpy-html.zip -Patch0: https://github.com/numpy/numpy/commit/b0872b858e2e6ebc394e95c81a024dcf1573c690.patch -# Cython 3 support, rebased from upstream: -# https://github.com/numpy/numpy/commit/c7724ee776f3aa447d89170809aace0461ccacf0 -# https://github.com/numpy/numpy/commit/888fd7719965719321f160f79051aa5caf42b9ac -# Also, Cython unpinned to allow Cython 3 -Patch1: cython3.patch +Patch0: f2py_test.patch +Patch1: 24772.patch +Patch2: 24776.patch %description NumPy is a general-purpose array-processing package designed to @@ -62,9 +59,12 @@ Obsoletes: numpy < 1:1.10.1-3 BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-pip BuildRequires: python3-Cython +BuildRequires: python3-pyproject-metadata BuildRequires: gcc-gfortran gcc gcc-c++ BuildRequires: lapack-devel +BuildRequires: ninja-build %if %{with tests} BuildRequires: python3-hypothesis BuildRequires: python3-pytest @@ -112,9 +112,6 @@ This package provides the complete documentation for NumPy. %prep %autosetup -n %{name}-%{version} -p1 -# Force re-cythonization (ifed for PKG-INFO presence in setup.py) -rm PKG-INFO - # openblas is provided by flexiblas by default; otherwise, # Use openblas pthreads as recommended by upstream (see comment in site.cfg.example) cat >> site.cfg < /dev/null +ln -s f2py f2py3 +ln -s f2py f2py3.12 ln -s f2py3 f2py.numpy popd &> /dev/null @@ -151,13 +142,6 @@ popd &> /dev/null mkdir -p %{buildroot}%{_includedir} ln -s %{python3_sitearch}/%{name}/core/include/numpy/ %{buildroot}%{_includedir}/numpy -# distutils from setuptools don't have the patch that was created to avoid standard runpath here -# we strip it manually instead -# ERROR 0001: file '...' contains a standard runpath '/usr/lib64' in [/usr/lib64] -chrpath --delete %{buildroot}%{python3_sitearch}/%{name}/core/_multiarray_umath.*.so -chrpath --delete %{buildroot}%{python3_sitearch}/%{name}/linalg/lapack_lite.*.so -chrpath --delete %{buildroot}%{python3_sitearch}/%{name}/linalg/_umath_linalg.*.so - %check %if %{with tests} @@ -184,7 +168,6 @@ python3 runtests.py --no-build -- -ra -k 'not test_ppc64_ibm_double_double128 %{ %dir %{python3_sitearch}/%{name} %{python3_sitearch}/%{name}/*.py* %{python3_sitearch}/%{name}/core -%{python3_sitearch}/%{name}/distutils %{python3_sitearch}/%{name}/doc %{python3_sitearch}/%{name}/fft %{python3_sitearch}/%{name}/lib @@ -196,8 +179,7 @@ python3 runtests.py --no-build -- -ra -k 'not test_ppc64_ibm_double_double128 %{ %{python3_sitearch}/%{name}/compat %{python3_sitearch}/%{name}/matrixlib %{python3_sitearch}/%{name}/polynomial -%{python3_sitearch}/%{name}-*.egg-info -%exclude %{python3_sitearch}/%{name}/LICENSE.txt +%{python3_sitearch}/%{name}-*.dist-info %{_includedir}/numpy %{python3_sitearch}/%{name}/__init__.pxd %{python3_sitearch}/%{name}/__init__.cython-30.pxd @@ -206,6 +188,7 @@ python3 runtests.py --no-build -- -ra -k 'not test_ppc64_ibm_double_double128 %{ %{python3_sitearch}/%{name}/array_api/ %{python3_sitearch}/%{name}/_pyinstaller/ %{python3_sitearch}/%{name}/_typing/ +%{python3_sitearch}/%{name}/_utils/ %files -n python3-numpy-f2py %{_bindir}/f2py @@ -219,6 +202,9 @@ python3 runtests.py --no-build -- -ra -k 'not test_ppc64_ibm_double_double128 %{ %changelog +* Tue Sep 19 2023 Gwyn Ciesla - 1:1.26.0-1 +- 1.26.0 + * Mon Jul 31 2023 Miro Hrončok - 1:1.24.4-2 - Backport support for Cython 3 diff --git a/sources b/sources index 2abb024..cd3ba91 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (numpy-1.24.4.tar.gz) = 89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68 +SHA512 (numpy-1.26.0.tar.gz) = 0d500c623b274a219740c78ae2febb32a2f167016a9ff529678526e6b3e89a5b732c41defa23460a5da6f7f89d4a7d827f44fa9a1334c78e204b00ce164fb40c SHA512 (numpy-html.zip) = 9c38a65fd33be28cec9a27d2b23b50cb215fe7fd775f467a78a21f4649466868a24b6004ebf1b31e0eca62c2e5582e89923ff2bb4b3ae70dfa9292672e7b1eca