From 8ff25c0bcafac73a450a466c559ba59018e26437 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 3 Jan 2024 23:06:23 -0500 Subject: [PATCH] cuda module: fix type signature for oneshot function It is only ever invoked once. It has a statically known signature based on how it's used, so there's no good reason to allow it to accept any defaults -- and defaulting to None messes with type safety. Saturate is always given, so don't claim it is only sometimes. --- mesonbuild/modules/cuda.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/modules/cuda.py b/mesonbuild/modules/cuda.py index 7cfd3a04f..b062bbf38 100644 --- a/mesonbuild/modules/cuda.py +++ b/mesonbuild/modules/cuda.py @@ -157,11 +157,11 @@ class CudaModule(NewExtensionModule): return cuda_version, arch_list, detected - def _filter_cuda_arch_list(self, cuda_arch_list, lo=None, hi=None, saturate=None): + def _filter_cuda_arch_list(self, cuda_arch_list, lo: str, hi: T.Optional[str], saturate: str) -> T.List[str]: """ Filter CUDA arch list (no codenames) for >= low and < hi architecture bounds, and deduplicate. - If saturate is provided, architectures >= hi are replaced with saturate. + Architectures >= hi are replaced with saturate. """ filtered_cuda_arch_list = [] @@ -170,8 +170,6 @@ class CudaModule(NewExtensionModule): if lo and version_compare(arch, '<' + lo): continue if hi and version_compare(arch, '>=' + hi): - if not saturate: - continue arch = saturate if arch not in filtered_cuda_arch_list: filtered_cuda_arch_list.append(arch)