diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-17 00:26:50 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-18 23:48:33 +0200 |
| commit | 34c28dc92cb4f28e32e633297e4b8a737228aae5 (patch) | |
| tree | dbe99c4d0d76eca3b08797a751d1b81ce05fd928 /mesonbuild/modules/unstable_cuda.py | |
| parent | 84a3e459a8618956eb3364900d2bd522a70b7fe7 (diff) | |
| download | meson-34c28dc92cb4f28e32e633297e4b8a737228aae5.zip meson-34c28dc92cb4f28e32e633297e4b8a737228aae5.tar.gz meson-34c28dc92cb4f28e32e633297e4b8a737228aae5.tar.bz2 | |
holders: remove unholder
Diffstat (limited to 'mesonbuild/modules/unstable_cuda.py')
| -rw-r--r-- | mesonbuild/modules/unstable_cuda.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mesonbuild/modules/unstable_cuda.py b/mesonbuild/modules/unstable_cuda.py index af65af3..a80f9ca 100644 --- a/mesonbuild/modules/unstable_cuda.py +++ b/mesonbuild/modules/unstable_cuda.py @@ -16,8 +16,7 @@ import typing as T import re from ..mesonlib import version_compare -from ..interpreter import CompilerHolder -from ..compilers import CudaCompiler +from ..compilers import CudaCompiler, Compiler from . import ModuleObject @@ -83,7 +82,7 @@ class CudaModule(ModuleObject): @permittedKwargs(['detected']) def nvcc_arch_flags(self, state: 'ModuleState', - args: T.Tuple[T.Union[CompilerHolder, CudaCompiler, str]], + args: T.Tuple[T.Union[Compiler, CudaCompiler, str]], kwargs: T.Dict[str, T.Any]) -> T.List[str]: nvcc_arch_args = self._validate_nvcc_arch_args(args, kwargs) ret = self._nvcc_arch_flags(*nvcc_arch_args)[0] @@ -91,7 +90,7 @@ class CudaModule(ModuleObject): @permittedKwargs(['detected']) def nvcc_arch_readable(self, state: 'ModuleState', - args: T.Tuple[T.Union[CompilerHolder, CudaCompiler, str]], + args: T.Tuple[T.Union[Compiler, CudaCompiler, str]], kwargs: T.Dict[str, T.Any]) -> T.List[str]: nvcc_arch_args = self._validate_nvcc_arch_args(args, kwargs) ret = self._nvcc_arch_flags(*nvcc_arch_args)[1] @@ -105,16 +104,12 @@ class CudaModule(ModuleObject): @staticmethod def _detected_cc_from_compiler(c): - if isinstance(c, CompilerHolder): - c = c.compiler if isinstance(c, CudaCompiler): return c.detected_cc return '' @staticmethod def _version_from_compiler(c): - if isinstance(c, CompilerHolder): - c = c.compiler if isinstance(c, CudaCompiler): return c.version if isinstance(c, str): |