cuda: use target-specific paths under CUDA Toolkit on Linux

Author: MaxandreOgeret

mesonbuild/dependencies/cuda.py

@@ -11,7 +11,6 @@
 
 from .. import mesonlib
 from .. import mlog
-from ..environment import detect_cpu_family
 from .base import DependencyException, SystemDependency
 from .detect import packages
 
@@ -27,8 +26,11 @@ class CudaDependency(SystemDependency):
     supported_languages = ['cpp', 'c', 'cuda'] # see also _default_language
 
     def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
-        compilers = environment.coredata.compilers[self.get_for_machine_from_kwargs(kwargs)]
+        for_machine = self.get_for_machine_from_kwargs(kwargs)
+        compilers = environment.coredata.compilers[for_machine]
+        machine = environment.machines[for_machine]
         language = self._detect_language(compilers)
+
         if language not in self.supported_languages:
             raise DependencyException(f'Language \'{language}\' is not supported by the CUDA Toolkit. Supported languages are {self.supported_languages}.')
 
@@ -50,14 +52,21 @@ def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> No
         if not os.path.isabs(self.cuda_path):
             raise DependencyException(f'CUDA Toolkit path must be absolute, got \'{self.cuda_path}\'.')
 
+        # Cuda target directory relative to cuda path.
+        if machine.is_linux():
+            # E.g. targets/x86_64-linux
+            self.target_path = os.path.join('targets', f"{machine.cpu_family}-{machine.system}")
+        else:
+            self.target_path = "."
+
         # nvcc already knows where to find the CUDA Toolkit, but if we're compiling
         # a mixed C/C++/CUDA project, we still need to make the include dir searchable
         if self.language != 'cuda' or len(compilers) > 1:
-            self.incdir = os.path.join(self.cuda_path, 'include')
+            self.incdir = os.path.join(self.cuda_path, self.target_path, 'include')
             self.compile_args += [f'-I{self.incdir}']
 
         arch_libdir = self._detect_arch_libdir()
-        self.libdir = os.path.join(self.cuda_path, arch_libdir)
+        self.libdir = os.path.join(self.cuda_path, self.target_path, arch_libdir)
         mlog.debug('CUDA library directory is', mlog.bold(self.libdir))
 
         self.is_found = self._find_requested_libraries()
@@ -211,19 +220,16 @@ def _strip_patch_version(cls, version: str) -> str:
         return '.'.join(version.split('.')[:2])
 
     def _detect_arch_libdir(self) -> str:
-        arch = detect_cpu_family(self.env.coredata.compilers.host)
         machine = self.env.machines[self.for_machine]
+        arch = machine.cpu_family
         msg = '{} architecture is not supported in {} version of the CUDA Toolkit.'
         if machine.is_windows():
             libdirs = {'x86': 'Win32', 'x86_64': 'x64'}
             if arch not in libdirs:
                 raise DependencyException(msg.format(arch, 'Windows'))
             return os.path.join('lib', libdirs[arch])
         elif machine.is_linux():
-            libdirs = {'x86_64': 'lib64', 'ppc64': 'lib', 'aarch64': 'lib64', 'loongarch64': 'lib64'}
-            if arch not in libdirs:
-                raise DependencyException(msg.format(arch, 'Linux'))
-            return libdirs[arch]
+            return "lib"
         elif machine.is_darwin():
             libdirs = {'x86_64': 'lib64'}
             if arch not in libdirs: