From 5d20f3efdf326527ce540e8f2f314ca33f78790b Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Thu, 21 May 2026 18:14:31 +0200 Subject: [PATCH] dev-python/numpy: remove unused patches Signed-off-by: Michael Mair-Keimberger --- .../numpy/files/numpy-2.3.2-arm-asimddp.patch | 30 -------- .../numpy/files/numpy-2.3.2-no-detect.patch | 72 ------------------- 2 files changed, 102 deletions(-) delete mode 100644 dev-python/numpy/files/numpy-2.3.2-arm-asimddp.patch delete mode 100644 dev-python/numpy/files/numpy-2.3.2-no-detect.patch diff --git a/dev-python/numpy/files/numpy-2.3.2-arm-asimddp.patch b/dev-python/numpy/files/numpy-2.3.2-arm-asimddp.patch deleted file mode 100644 index ac4c77d1a25b4..0000000000000 --- a/dev-python/numpy/files/numpy-2.3.2-arm-asimddp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 111fe76ebf9e3dc528a2d808626808bd9601938d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 18 Aug 2025 20:55:31 +0200 -Subject: [PATCH] BLD: wire up `ASIMDDP` feature to `ARM_FEATURES` -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add the `ASIMDDP` feature to the `ARM_FEATURES` dictionary, to fix -an error when it is explicitly listed in `cpu-baseline`. - -Fixes #29570 - -Signed-off-by: Michał Górny ---- - meson_cpu/arm/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson_cpu/arm/meson.build b/meson_cpu/arm/meson.build -index 7ffa3ef58ed0..5478e52cdcea 100644 ---- a/meson_cpu/arm/meson.build -+++ b/meson_cpu/arm/meson.build -@@ -60,6 +60,6 @@ SVE = mod_features.new( - # TODO: Add support for MSVC - ARM_FEATURES = { - 'NEON': NEON, 'NEON_FP16': NEON_FP16, 'NEON_VFPV4': NEON_VFPV4, -- 'ASIMD': ASIMD, 'ASIMDHP': ASIMDHP, 'ASIMDFHM': ASIMDFHM, -+ 'ASIMD': ASIMD, 'ASIMDHP': ASIMDHP, 'ASIMDDP': ASIMDDP, 'ASIMDFHM': ASIMDFHM, - 'SVE': SVE - } diff --git a/dev-python/numpy/files/numpy-2.3.2-no-detect.patch b/dev-python/numpy/files/numpy-2.3.2-no-detect.patch deleted file mode 100644 index 91ed2aa8f1e53..0000000000000 --- a/dev-python/numpy/files/numpy-2.3.2-no-detect.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 5591f1109b45a482bdaea3d3e44a80212a188edd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 28 Jul 2025 21:33:18 +0200 -Subject: [PATCH 1/2] BLD: provide explicit control over cpu-baseline detection -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a new `cpu-baseline-detect` feature flag that can be used to more -precisely control the use of CPU baseline detection. This can be used -by packages to more precisely control used SIMD code independently -of compiler flags specified. The option follows typical feature -semantics -- with `auto` preserving the current behavior of enabling -when relevant compiler flags are found, `enabled` forcing it on -based on the implicit compiler defaults, and `disabled` forcing it off. - -Signed-off-by: Michał Górny ---- - meson.options | 2 ++ - meson_cpu/meson.build | 22 ++++++++++++---------- - 2 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/meson.options b/meson.options -index b09992fe9b91..f17f9901664a 100644 ---- a/meson.options -+++ b/meson.options -@@ -28,6 +28,8 @@ option('disable-optimization', type: 'boolean', value: false, - description: 'Disable CPU optimized code (dispatch,simd,unroll...)') - option('cpu-baseline', type: 'string', value: 'min', - description: 'Minimal set of required CPU features') -+option('cpu-baseline-detect', type: 'feature', value: 'auto', -+ description: 'Detect CPU baseline from the compiler flags') - option('cpu-dispatch', type: 'string', value: 'max -xop -fma4', - description: 'Dispatched set of additional CPU features') - option('test-simd', type: 'array', -diff --git a/meson_cpu/meson.build b/meson_cpu/meson.build -index e5b6d0fbe7be..1c4c6eecb308 100644 ---- a/meson_cpu/meson.build -+++ b/meson_cpu/meson.build -@@ -46,20 +46,22 @@ if get_option('disable-optimization') - CPU_CONF_BASELINE = 'none' - CPU_CONF_DISPATCH = 'none' - else -- baseline_detect = false -+ baseline_detect = get_option('cpu-baseline-detect').enabled() - c_args = get_option('c_args') -- foreach arg : c_args -- foreach carch : ['-march', '-mcpu', '-xhost', '/QxHost'] -- if arg.contains(carch) -- message('Appending option "detect" to "cpu-baseline" due to detecting global architecture c_arg "' + arg + '"') -- baseline_detect = true -+ if get_option('cpu-baseline-detect').auto() -+ foreach arg : c_args -+ foreach carch : ['-march', '-mcpu', '-xhost', '/QxHost'] -+ if arg.contains(carch) -+ message('Appending option "detect" to "cpu-baseline" due to detecting global architecture c_arg "' + arg + '"') -+ baseline_detect = true -+ break -+ endif -+ endforeach -+ if baseline_detect - break - endif - endforeach -- if baseline_detect -- break -- endif -- endforeach -+ endif - # The required minimal set of required CPU features. - CPU_CONF_BASELINE = get_option('cpu-baseline') - if baseline_detect