diff --git a/allow-numpy-1.24.patch b/allow-numpy-1.24.patch new file mode 100644 index 0000000..5175d5a --- /dev/null +++ b/allow-numpy-1.24.patch @@ -0,0 +1,15 @@ +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/setup.py ++++ b/setup.py +@@ -23,7 +23,7 @@ min_python_version = "3.7" + max_python_version = "3.11" # exclusive + min_numpy_build_version = "1.11" + min_numpy_run_version = "1.18" +-max_numpy_run_version = "1.24" ++max_numpy_run_version = "1.25" + min_llvmlite_version = "0.39.0dev0" + max_llvmlite_version = "0.40" + diff --git a/numba-0.56.2.tar.gz b/numba-0.56.2.tar.gz deleted file mode 100644 index ba809fb..0000000 --- a/numba-0.56.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3492f0a5d09e257fc521f5377a6c6b907eec1920d14739f0b2458b9d29946a5a -size 2417234 diff --git a/numba-0.56.4.tar.gz b/numba-0.56.4.tar.gz new file mode 100644 index 0000000..f6e7b70 --- /dev/null +++ b/numba-0.56.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32d9fef412c81483d7efe0ceb6cf4d3310fde8b624a9cecca00f790573ac96ee +size 2418748 diff --git a/python-numba.changes b/python-numba.changes index 79728ea..269cb3b 100644 --- a/python-numba.changes +++ b/python-numba.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Jan 1 11:41:11 UTC 2023 - Matej Cepl + +- Update to 0.56.4: + - This is a bugfix release to fix a regression in the CUDA + target in relation to the .view() method on CUDA device + arrays that is present when using NumPy version 1.23.0 or + later. + - This is a bugfix release to remove the version restriction + applied to the setuptools package and to fix a bug in the + CUDA target in relation to copying zero length device arrays + to zero length host arrays. +- Add allow-numpy-1.24.patch to allow work with numpy 1.24 + ------------------------------------------------------------------- Mon Oct 10 10:07:52 UTC 2022 - John Vandenberg diff --git a/python-numba.spec b/python-numba.spec index 30cba8d..12e81ab 100644 --- a/python-numba.spec +++ b/python-numba.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define plainpython python # upper bound is exclusive: min-numpy_ver <= numpy < max_numpy_ver %define min_numpy_ver 1.18 -%define max_numpy_ver 1.24 +%define max_numpy_ver 1.25 %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -31,7 +31,7 @@ %bcond_with test %endif Name: python-numba%{psuffix} -Version: 0.56.2 +Version: 0.56.4 Release: 0 Summary: NumPy-aware optimizing compiler for Python using LLVM License: BSD-2-Clause @@ -42,6 +42,9 @@ Patch2: fix-cli-test.patch Patch3: skip-failing-tests.patch # PATCH-FIX-OPENSUSE update-tbb-backend-calls-2021.6.patch, based on gh#numba/numba#7608 Patch4: update-tbb-backend-calls-2021.6.patch +# PATCH-FIX-UPSTREAM allow-numpy-1.24.patch bsc#[0-9]+ mcepl@suse.com +# Allow working with numpy 1.24 and higher +Patch5: allow-numpy-1.24.patch BuildRequires: %{python_module devel >= 3.7} BuildRequires: %{python_module numpy-devel >= %{min_numpy_ver} with %python-numpy-devel < %{max_numpy_ver}} BuildRequires: %{python_module setuptools} diff --git a/skip-failing-tests.patch b/skip-failing-tests.patch index c22ed9e..96e6cb6 100644 --- a/skip-failing-tests.patch +++ b/skip-failing-tests.patch @@ -1,8 +1,11 @@ -Index: numba-0.54.0/numba/tests/test_parfors.py -=================================================================== ---- numba-0.54.0.orig/numba/tests/test_parfors.py -+++ numba-0.54.0/numba/tests/test_parfors.py -@@ -1146,6 +1146,7 @@ class TestParforNumPy(TestParforsBase): +--- + numba/tests/test_parfors.py | 5 +++-- + numba/tests/test_parfors_passes.py | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/numba/tests/test_parfors.py ++++ b/numba/tests/test_parfors.py +@@ -1174,6 +1174,7 @@ class TestParforNumPy(TestParforsBase): self.check_variants(test_impl2, data_gen) self.count_parfors_variants(test_impl2, data_gen) @@ -10,7 +13,7 @@ Index: numba-0.54.0/numba/tests/test_parfors.py def test_ndarray_fill(self): def test_impl(x): x.fill(7.0) -@@ -3890,7 +3891,7 @@ class TestParforsVectorizer(TestPrangeBa +@@ -4396,7 +4397,7 @@ class TestParforsVectorizer(TestPrangeBa # to check vsqrtpd operates on zmm match_vsqrtpd_on_zmm = re.compile('\n\s+vsqrtpd\s+.*zmm.*\n') @@ -19,7 +22,7 @@ Index: numba-0.54.0/numba/tests/test_parfors.py def test_vectorizer_fastmath_asm(self): """ This checks that if fastmath is set and the underlying hardware is suitable, and the function supplied is amenable to fastmath based -@@ -3933,7 +3934,7 @@ class TestParforsVectorizer(TestPrangeBa +@@ -4439,7 +4440,7 @@ class TestParforsVectorizer(TestPrangeBa # check no zmm addressing is present self.assertTrue('zmm' not in v) @@ -28,10 +31,8 @@ Index: numba-0.54.0/numba/tests/test_parfors.py def test_unsigned_refusal_to_vectorize(self): """ This checks that if fastmath is set and the underlying hardware is suitable, and the function supplied is amenable to fastmath based -Index: numba-0.54.0/numba/tests/test_parfors_passes.py -=================================================================== ---- numba-0.54.0.orig/numba/tests/test_parfors_passes.py -+++ numba-0.54.0/numba/tests/test_parfors_passes.py +--- a/numba/tests/test_parfors_passes.py ++++ b/numba/tests/test_parfors_passes.py @@ -516,6 +516,7 @@ class TestConvertLoopPass(BaseTest): str(raises.exception), ) diff --git a/update-tbb-backend-calls-2021.6.patch b/update-tbb-backend-calls-2021.6.patch index 93c4013..4b07df2 100644 --- a/update-tbb-backend-calls-2021.6.patch +++ b/update-tbb-backend-calls-2021.6.patch @@ -1,7 +1,9 @@ -Index: numba-0.56.2/numba/np/ufunc/tbbpool.cpp -=================================================================== ---- numba-0.56.2.orig/numba/np/ufunc/tbbpool.cpp -+++ numba-0.56.2/numba/np/ufunc/tbbpool.cpp +--- + numba/np/ufunc/tbbpool.cpp | 29 ++++++++++++++++++++++++----- + 1 file changed, 24 insertions(+), 5 deletions(-) + +--- a/numba/np/ufunc/tbbpool.cpp ++++ b/numba/np/ufunc/tbbpool.cpp @@ -12,6 +12,7 @@ Implement parallel vectorize workqueue o #undef _XOPEN_SOURCE #endif