misc: Typo and additions

Author: JDBetteridge

devito/arch/archinfo.py

@@ -1,7 +1,8 @@
 """Collection of utilities to detect properties of the underlying architecture."""
 
+from contextlib import suppress
 from functools import cached_property
-from subprocess import PIPE, Popen, DEVNULL, run
+from subprocess import PIPE, Popen, DEVNULL, run, CalledProcessError
 from pathlib import Path
 import ctypes
 import re
@@ -11,6 +12,7 @@
 
 import cpuinfo
 import numpy as np
+from packaging.version import parse, InvalidVersion
 import psutil
 
 from devito.logger import warning
@@ -553,6 +555,30 @@ def get_cuda_path():
     return None
 
 
+@memoized_func
+def get_cuda_version():
+    cuda_home = get_cuda_path()
+    if cuda_home is None:
+        nvc_version_command = ['nvcc', '--version']
+    else:
+        nvc_version_command = [f'{cuda_home}/bin/nvcc', '--version']
+
+    cuda_version = None
+    try:
+        out = run(nvc_version_command, capture_output=True, text=True)
+    except (FileNotFoundError, CalledProcessError):
+        pass
+    finally:
+        if out.returncode == 0:
+            start = out.stdout.find('release')
+            start = out.stdout.find(',', start)
+            stop = out.stdout.find('\n', start)
+            with suppress(InvalidVersion):
+                cuda_version = parse(out.stdout[start:stop])
+
+    return cuda_version
+
+
 @memoized_func
 def get_advisor_path():
     """

devito/arch/compiler.py

@@ -661,14 +661,15 @@ def __init_finalize__(self, **kwargs):
         # self.cflags += ['-ta=tesla,host']
 
     def __lookup_cmds__(self):
+        # Note: Using `nvc++` instead of `nvcc` because of issue #1219
         self.CC = 'nvc++'
         self.CXX = 'nvc++'
         self.MPICC = 'mpic++'
         self.MPICXX = 'mpicxx'
 
     def add_libraries(self, libs):
         # Urgh...
-        # NvidiaComiler inherits from Compiler inherits from GCCToolchain in codepy
+        # NvidiaCompiler inherits from Compiler inherits from GCCToolchain in codepy
         # And _GCC_ supports linking versioned shared objects with the syntax:
         # `gcc -L/path/to/versioned/lib -l:libfoo.so.2.0 ...`
         # But this syntax is not supported by the Nvidia compiler.