Skip to content

Commit c8de2c4

Browse files
z-ericaz-erica
committed
main/python-numpy: update to 2.2.6
1 parent 750b0c8 commit c8de2c4

3 files changed

Lines changed: 119 additions & 28 deletions

File tree

‎main/python-numpy/patches/no-include-highway.patch‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,34 @@ don't include it if we're not using it
22

33
also a workaround for loongarch, highway.h fails to include
44

5-
--- a/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp
6-
+++ b/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp
5+
diff -ruN a/numpy/_core/src/npysort/highway_qsort.hpp.rej b/numpy/_core/src/npysort/highway_qsort.hpp.rej
6+
--- a/numpy/_core/src/npysort/highway_qsort.hpp.rej 1970-01-01 01:00:00.000000000 +0100
7+
+++ b/numpy/_core/src/npysort/highway_qsort.hpp.rej 2025-05-15 12:07:28.398020432 +0200
8+
@@ -0,0 +1,21 @@
9+
+@@ -2,14 +2,20 @@
10+
+ #define NUMPY_SRC_COMMON_NPYSORT_HWY_SIMD_QSORT_HPP
11+
+
12+
+ #define VQSORT_ONLY_STATIC 1
13+
++#ifdef __loongarch__
14+
++#define NPY_DISABLE_HIGHWAY_SORT
15+
++#else
16+
+ #include "hwy/highway.h"
17+
+ #include "hwy/contrib/sort/vqsort-inl.h"
18+
++#endif
19+
+
20+
+ #include "common.hpp"
21+
+
22+
++#ifndef NPY_DISABLE_HIGHWAY_SORT
23+
+ #if !VQSORT_COMPILER_COMPATIBLE
24+
+ #define NPY_DISABLE_HIGHWAY_SORT
25+
+ #endif
26+
++#endif
27+
+
28+
+ #ifndef NPY_DISABLE_HIGHWAY_SORT
29+
+ namespace np { namespace highway { namespace qsort_simd {
30+
diff -ruN a/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp b/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp
31+
--- a/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp 2025-04-19 21:30:11.000000000 +0200
32+
+++ b/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp 2025-05-15 12:07:28.398020432 +0200
733
@@ -3,8 +3,10 @@
834
#include "loops_utils.h"
935

@@ -15,26 +41,3 @@ also a workaround for loongarch, highway.h fails to include
1541

1642
/*
1743
* Vectorized approximate sine/cosine algorithms: The following code is a
18-
--- a/numpy/_core/src/npysort/highway_qsort.hpp
19-
+++ b/numpy/_core/src/npysort/highway_qsort.hpp
20-
@@ -2,14 +2,20 @@
21-
#define NUMPY_SRC_COMMON_NPYSORT_HWY_SIMD_QSORT_HPP
22-
23-
#define VQSORT_ONLY_STATIC 1
24-
+#ifdef __loongarch__
25-
+#define NPY_DISABLE_HIGHWAY_SORT
26-
+#else
27-
#include "hwy/highway.h"
28-
#include "hwy/contrib/sort/vqsort-inl.h"
29-
+#endif
30-
31-
#include "common.hpp"
32-
33-
+#ifndef NPY_DISABLE_HIGHWAY_SORT
34-
#if !VQSORT_COMPILER_COMPATIBLE
35-
#define NPY_DISABLE_HIGHWAY_SORT
36-
#endif
37-
+#endif
38-
39-
#ifndef NPY_DISABLE_HIGHWAY_SORT
40-
namespace np { namespace highway { namespace qsort_simd {

‎main/python-numpy/template.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgname = "python-numpy"
2-
pkgver = "2.2.4"
3-
pkgrel = 1
2+
pkgver = "2.2.6"
3+
pkgrel = 0
44
build_style = "python_pep517"
55
make_build_args = []
66
hostmakedepends = [
@@ -20,7 +20,7 @@
2020
license = "BSD-3-Clause"
2121
url = "https://numpy.org"
2222
source = f"https://github.com/numpy/numpy/releases/download/v{pkgver}/numpy-{pkgver}.tar.gz"
23-
sha256 = "9ba03692a45d3eef66559efe1d1096c4b9b75c0986b5dff5530c378fb8331d4f"
23+
sha256 = "e29554e2bef54a90aa5cc07da6ce955accb83f21ab5de01a62c8478897b264fd"
2424
hardening = ["!int"]
2525

2626
if self.profile().arch in ["aarch64", "loongarch64"]:

‎q‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
main/python-numpy/patches/no-include-highway.patch --- 1/2 --- Text
2+
2   2 
3+
3 also a workaround for loongarch, highway.h fails to include  3 also a workaround for loongarch, highway.h fails to include
4+
4   4 
5+
.   5 diff -ruN a/numpy/_core/src/npysort/highway_qsort.hpp.rej b/numpy/_core/src/npy
6+
.   . sort/highway_qsort.hpp.rej
7+
5 --- a/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp  6 --- a/numpy/_core/src/npysort/highway_qsort.hpp.rej 1970-01-01 01:00:00.0000
8+
.   . 00000 +0100
9+
.   7 +++ b/numpy/_core/src/npysort/highway_qsort.hpp.rej 2025-05-15 12:07:28.3980
10+
.   . 20432 +0200
11+
.   8 @@ -0,0 +1,21 @@
12+
.   9 +@@ -2,14 +2,20 @@
13+
.  10 + #define NUMPY_SRC_COMMON_NPYSORT_HWY_SIMD_QSORT_HPP
14+
.  11 + 
15+
.  12 + #define VQSORT_ONLY_STATIC 1
16+
.  13 ++#ifdef __loongarch__
17+
.  14 ++#define NPY_DISABLE_HIGHWAY_SORT
18+
.  15 ++#else
19+
.  16 + #include "hwy/highway.h"
20+
.  17 + #include "hwy/contrib/sort/vqsort-inl.h"
21+
.  18 ++#endif
22+
.  19 + 
23+
.  20 + #include "common.hpp"
24+
.  21 + 
25+
.  22 ++#ifndef NPY_DISABLE_HIGHWAY_SORT
26+
.  23 + #if !VQSORT_COMPILER_COMPATIBLE
27+
.  24 + #define NPY_DISABLE_HIGHWAY_SORT
28+
.  25 + #endif
29+
.  26 ++#endif
30+
.  27 + 
31+
.  28 + #ifndef NPY_DISABLE_HIGHWAY_SORT
32+
.  29 + namespace np { namespace highway { namespace qsort_simd {
33+
.  30 diff -ruN a/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp b/numpy/_cor
34+
.  .. e/src/umath/loops_trigonometric.dispatch.cpp
35+
6 +++ b/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp 31 --- a/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp 2025-04-19 21:3
36+
.  .. 0:11.000000000 +0200
37+
.  32 +++ b/numpy/_core/src/umath/loops_trigonometric.dispatch.cpp 2025-05-15 12:0
38+
.  .. 7:28.398020432 +0200
39+
7 @@ -3,8 +3,10 @@ 33 @@ -3,8 +3,10 @@
40+
8  #include "loops_utils.h" 34  #include "loops_utils.h"
41+
9  35 
42+
43+
main/python-numpy/patches/no-include-highway.patch --- 2/2 --- Text
44+
15 41 
45+
16 42  /*
46+
17 43  * Vectorized approximate sine/cosine algorithms: The following code is a
47+
18  --- a/numpy/_core/src/npysort/highway_qsort.hpp
48+
19  +++ b/numpy/_core/src/npysort/highway_qsort.hpp
49+
20  @@ -2,14 +2,20 @@
50+
21   #define NUMPY_SRC_COMMON_NPYSORT_HWY_SIMD_QSORT_HPP
51+
22   
52+
23   #define VQSORT_ONLY_STATIC 1
53+
24  +#ifdef __loongarch__
54+
25  +#define NPY_DISABLE_HIGHWAY_SORT
55+
26  +#else
56+
27   #include "hwy/highway.h"
57+
28   #include "hwy/contrib/sort/vqsort-inl.h"
58+
29  +#endif
59+
30   
60+
31   #include "common.hpp"
61+
32   
62+
33  +#ifndef NPY_DISABLE_HIGHWAY_SORT
63+
34   #if !VQSORT_COMPILER_COMPATIBLE
64+
35   #define NPY_DISABLE_HIGHWAY_SORT
65+
36   #endif
66+
37  +#endif
67+
38   
68+
39   #ifndef NPY_DISABLE_HIGHWAY_SORT
69+
40   namespace np { namespace highway { namespace qsort_simd {
70+
71+
main/python-numpy/template.py --- 1/2 --- Python
72+
1 pkgname = "python-numpy" 1 pkgname = "python-numpy"
73+
2 pkgver = "2.2.4" 2 pkgver = "2.2.5"
74+
3 pkgrel = 1 3 pkgrel = 0
75+
4 build_style = "python_pep517" 4 build_style = "python_pep517"
76+
5 make_build_args = [] 5 make_build_args = []
77+
6 hostmakedepends = [ 6 hostmakedepends = [
78+
79+
main/python-numpy/template.py --- 2/2 --- Python
80+
20 license = "BSD-3-Clause" 20 license = "BSD-3-Clause"
81+
21 url = "https://numpy.org" 21 url = "https://numpy.org"
82+
22 source = f"https://github.com/numpy/numpy/releases/download/v{pkgver}/numpy-{pk 22 source = f"https://github.com/numpy/numpy/releases/download/v{pkgver}/numpy-{pk
83+
.. gver}.tar.gz" .. gver}.tar.gz"
84+
23 sha256 = "9ba03692a45d3eef66559efe1d1096c4b9b75c0986b5dff5530c378fb8331d4f" 23 sha256 = "a9c0d994680cd991b1cb772e8b297340085466a6fe964bc9d4e80f5e2f43c291"
85+
24 hardening = ["!int"] 24 hardening = ["!int"]
86+
25  25 
87+
26 if self.profile().arch in ["aarch64", "loongarch64"]: 26 if self.profile().arch in ["aarch64", "loongarch64"]:
88+

0 commit comments

Comments
 (0)