From cfd11eba92625a225c38c15bb11267b4192b0f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Sok=C3=B3=C5=82?= Date: Thu, 18 Jul 2024 15:05:51 +0200 Subject: [PATCH] BUG: Fix `except` dict feature --- driver/level3/meson.build | 2 +- meson.build | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/driver/level3/meson.build b/driver/level3/meson.build index fac513d18..419a0b847 100644 --- a/driver/level3/meson.build +++ b/driver/level3/meson.build @@ -379,7 +379,7 @@ foreach _kop : driver_kops _ext_cargs = [] # Check ext_mappings first - if ext_mappings.has_key(ext) and (not ext_mappings.has_key('except') or base not in ext_mappings['except']) + if ext_mappings.has_key(ext) and not (ext_mappings[ext].has_key('except') and base in ext_mappings[ext]['except']) extmap = ext_mappings[ext] if extmap.has_key('def') foreach _d : extmap['def'] diff --git a/meson.build b/meson.build index 1b95f837d..cccb29c93 100644 --- a/meson.build +++ b/meson.build @@ -396,10 +396,10 @@ ext_mappings_l3 = [ # symm # syrk - {'ext': '_UN', 'def': [], 'undef': ['LOWER', 'TRANS'], 'for': ['s', 'd', 'c', 'z']}, - {'ext': '_UT', 'def': ['TRANS'], 'undef': ['LOWER'], 'for': ['s', 'd', 'c', 'z']}, - {'ext': '_LN', 'def': ['LOWER'], 'undef': ['TRANS', 'CONJ'], 'for': ['s', 'd', 'c', 'z'], 'except': ['?trmm_kernel']}, - {'ext': '_LT', 'def': ['TRANS', 'LOWER'], 'for': ['s', 'd', 'c', 'z'], 'except': ['?trmm_kernel']}, + {'ext': '_UN', 'def': [], 'undef': ['LOWER', 'TRANS', 'CONJ'], 'for': ['s', 'd', 'c', 'z']}, + {'ext': '_UT', 'def': ['TRANS'], 'undef': ['LOWER', 'CONJ'], 'for': ['s', 'd', 'c', 'z']}, + {'ext': '_LN', 'def': ['LOWER'], 'undef': ['TRANS', 'CONJ'], 'for': ['s', 'd', 'c', 'z']}, + {'ext': '_LT', 'def': ['TRANS', 'LOWER'], 'undef': ['CONJ'], 'for': ['s', 'd', 'c', 'z']}, {'ext': '_RU', 'def': ['RSIDE', 'NC'], 'undef': ['LOWER'], 'for': ['c', 'z']}, {'ext': '_RL', 'def': ['RSIDE', 'NC', 'LOWER'], 'for': ['c', 'z']}, ]