From 26b98f6a10fd93f6fcb299a6722fdfc2953dc2a6 Mon Sep 17 00:00:00 2001 From: Rohit Goswami Date: Sun, 19 May 2024 00:02:58 +0000 Subject: [PATCH] MAINT: Use syrk as an exception --- driver/level3/meson.build | 4 ++-- meson.build | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/driver/level3/meson.build b/driver/level3/meson.build index d0602bb10..25150b178 100644 --- a/driver/level3/meson.build +++ b/driver/level3/meson.build @@ -128,7 +128,7 @@ driver_kops = [ }, { 'base': '?syrk', 'sources': { - 'symm_k.c': {'mode': ['s', 'd', # 'q'], + 'syrk_k.c': {'mode': ['s', 'd', # 'q'], 'c', 'z'], # 'x'], 'exts': ['_UN', '_UT', '_LN', '_LT']}, @@ -188,7 +188,7 @@ foreach _kop : driver_kops _ext_cargs = [] # Check ext_mappings first - if ext_mappings.has_key(ext) + if ext_mappings.has_key(ext) and (not ext_mappings.has_key('except') or base not in ext_mappings['except']) extmap = ext_mappings[ext] if extmap.has_key('def') foreach _d : extmap['def'] diff --git a/meson.build b/meson.build index 950da12c8..065a8b187 100644 --- a/meson.build +++ b/meson.build @@ -272,7 +272,7 @@ ext_mappings = { # '_V': {'def': ['XCONJ'], 'undef': ['CONJ']}, '_D': {'def': ['CONJ', 'XCONJ']}, '_L': {'def': ['LOWER']}, - '_LN': {'def': ['LEFT'], 'undef': ['TRANSA']}, + '_LN': {'def': ['LEFT'], 'undef': ['TRANSA'], 'except': ['?syrk']}, # Handle HEMV and HEMVREV better '_V': {'def': ['HEMV', 'HEMVREV', 'XCONJ'], 'undef': ['LOWER', 'CONJ']}, '_M': {'def': ['HEMV', 'HEMVREV', 'LOWER']}, @@ -305,11 +305,8 @@ ext_mappings = { '_LL': {'def': ['LOWER', 'NN'], 'undef': ['RSIDE']}, '_RU': {'def': ['RSIDE', 'NN'], 'undef': ['LOWER']}, '_RL': {'def': ['RSIDE', 'NN', 'LOWER']}, - '_UN': {'undef': ['TRANS', 'LOWER']}, - '_UT': {'def': ['TRANS'], 'undef': ['LOWER']}, - # TODO(rg): Need to handle the key conflict here for syrk - '_LN': {'def': ['LOWER'], 'undef': ['TRANS']}, - '_LT': {'def': ['TRANS', 'LOWER']}, + '_UN': {'undef': ['TRANS', 'LOWER'], 'except': ['?syrk']}, + '_UT': {'def': ['TRANS'], 'undef': ['LOWER'], 'except': ['?syrk']}, } ext_mappings_l2 = [