c73e3af979
* Adds support for array parameter declaration in fortran... * Added ``bitwise_count`` UFuncs * Add binding for random pyx files * Use AVX512-FP16 SVML content for float16 umath functions * allow int sequences as shape arguments in numpy.memmap * Add .mT attribute for arrays * Create complex scalars from real and imaginary parts * add copy parameter for api.reshape function * make use of locals() in a comprehension fully compatible... * Add array API standard v2022.12 support to numpy.array_api * Change string to bool conversions to be consistent with... * Allow np.info on non-hashable objects with a dtype * let zeros, empty, and empty_like accept dtype classes * Bump C-ABI to 2 but accept older NumPy if compiled against... * Use high accuracy SVML for double precision umath functions * expose PyUFunc_GiveFloatingpointErrors in the dtype API * PyObject_IsTrue and PyObject_Not error handling in setflags * array2string does not add signs for positive integers. * Vectorize np.partition and np.argpartition using AVX-512 * Create helper for conversion to arrays * Add size check for threaded array assignment * Finalize ``fastCopyAndTranpose`` and other old C-funcs/members... * assert_array_less should report max violations instead of... * Introduce tracer for enabled CPU targets on each optimized... * Extend np.add ufunc to work with unicode and byte dtypes * Add find/rfind ufuncs for unicode and byte dtypes * Make ``intp`` ``ssize_t`` and introduce characters nN * Add isdigit/isspace/isdecimal/isnumeric ufuncs for string... * DType API slot for descriptor finalization before array... OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=161
47 lines
2.2 KiB
Diff
47 lines
2.2 KiB
Diff
From 79e7c3c3262374de778145946b612135fb7cd581 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Vogt <fvogt@suse.de>
|
|
Date: Thu, 28 Mar 2024 13:15:54 +0100
|
|
Subject: [PATCH] feature module: Fix handling of multiple conflicts per
|
|
attribute
|
|
|
|
- Attributes without match were never actually added to the list
|
|
- Only the last conflict actually had an effect, earlier results were
|
|
discarded
|
|
---
|
|
vendored-meson/meson/mesonbuild/modules/features/module.py | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/vendored-meson/meson/mesonbuild/modules/features/module.py b/vendored-meson/meson/mesonbuild/modules/features/module.py
|
|
index 0be6af06c..a6f357b3f 100644
|
|
--- a/vendored-meson/meson/mesonbuild/modules/features/module.py
|
|
+++ b/vendored-meson/meson/mesonbuild/modules/features/module.py
|
|
@@ -371,15 +371,12 @@ class Module(NewExtensionModule):
|
|
values: List[ConflictAttr] = getattr(fet, attr)
|
|
accumulate_values = test_result[attr] # type: ignore
|
|
for conflict in values:
|
|
- if not conflict.match:
|
|
- accumulate_values.append(conflict.val)
|
|
- continue
|
|
conflict_vals: List[str] = []
|
|
# select the acc items based on the match
|
|
new_acc: List[str] = []
|
|
for acc in accumulate_values:
|
|
# not affected by the match so we keep it
|
|
- if not conflict.match.match(acc):
|
|
+ if not (conflict.match and conflict.match.match(acc)):
|
|
new_acc.append(acc)
|
|
continue
|
|
# no filter so we totaly escape it
|
|
@@ -396,7 +393,7 @@ class Module(NewExtensionModule):
|
|
continue
|
|
conflict_vals.append(conflict.mjoin.join(filter_val))
|
|
new_acc.append(conflict.val + conflict.mjoin.join(conflict_vals))
|
|
- test_result[attr] = new_acc # type: ignore
|
|
+ accumulate_values = test_result[attr] = new_acc # type: ignore
|
|
|
|
test_args = compiler.has_multi_arguments
|
|
args = test_result['args']
|
|
--
|
|
2.44.0
|
|
|