From cfd31e38a8606a16f2965bfb61442e77793fae56 Mon Sep 17 00:00:00 2001 From: Olexa Bilaniuk Date: Sat, 24 Oct 2020 06:18:23 -0400 Subject: Add newer CUDA Toolkit version entries. Also, remove the possibility of passing in a compiler instance to min_driver_version. This is because the NVCC compiler instance is, as of CUDA Toolkit 11.0, no longer guaranteed to be versioned identically to the toolkit itself. --- mesonbuild/modules/unstable_cuda.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'mesonbuild/modules/unstable_cuda.py') diff --git a/mesonbuild/modules/unstable_cuda.py b/mesonbuild/modules/unstable_cuda.py index 0d693c3..919918c 100644 --- a/mesonbuild/modules/unstable_cuda.py +++ b/mesonbuild/modules/unstable_cuda.py @@ -34,16 +34,19 @@ class CudaModule(ExtensionModule): @noKwargs def min_driver_version(self, state, args, kwargs): argerror = InvalidArguments('min_driver_version must have exactly one positional argument: ' + - 'an NVCC compiler object, or its version string.') + 'a CUDA Toolkit version string. Beware that, since CUDA 11.0, ' + + 'the CUDA Toolkit\'s components (including NVCC) are versioned ' + + 'independently from each other (and the CUDA Toolkit as a whole).') - if len(args) != 1: + if len(args) != 1 or not isinstance(args[0], str): raise argerror - else: - cuda_version = self._version_from_compiler(args[0]) - if cuda_version == 'unknown': - raise argerror + cuda_version = args[0] driver_version_table = [ + {'cuda_version': '>=11.1.0', 'windows': '456.38', 'linux': '455.23'}, + {'cuda_version': '>=11.0.3', 'windows': '451.82', 'linux': '450.51.06'}, + {'cuda_version': '>=11.0.2', 'windows': '451.48', 'linux': '450.51.05'}, + {'cuda_version': '>=11.0.1', 'windows': '451.22', 'linux': '450.36.06'}, {'cuda_version': '>=10.2.89', 'windows': '441.22', 'linux': '440.33'}, {'cuda_version': '>=10.1.105', 'windows': '418.96', 'linux': '418.39'}, {'cuda_version': '>=10.0.130', 'windows': '411.31', 'linux': '410.48'}, -- cgit v1.1