diff options
| author | Wileam Y. Phan <50928756+wyphan@users.noreply.github.com> | 2023-01-10 05:51:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-10 11:51:23 +0100 |
| commit | 0f7f600d1fd0f80ec72c8a4c70cae617937921b8 (patch) | |
| tree | 56621a619fd87266397b77f114de065592c6f286 /var | |
| parent | 9283a94ee4c3d6ec80356d9be565ce80f2e82ba3 (diff) | |
| download | spack-0f7f600d1fd0f80ec72c8a4c70cae617937921b8.tar.gz spack-0f7f600d1fd0f80ec72c8a4c70cae617937921b8.tar.bz2 spack-0f7f600d1fd0f80ec72c8a4c70cae617937921b8.tar.xz spack-0f7f600d1fd0f80ec72c8a4c70cae617937921b8.zip | |
Add CUDA 12.0 (#34664)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cuda/package.py | 20 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hypre/package.py | 3 |
2 files changed, 22 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 2375e318af..80f2cb2a16 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -23,7 +23,22 @@ from spack.package import * # - package key must be in the form '{os}-{arch}' where 'os' is in the # format returned by platform.system() and 'arch' by platform.machine() +preferred_ver = "11.8.0" _versions = { + "12.0.0": { + "Linux-aarch64": ( + "cd13e9c65d4c8f895a968706f46064d536be09f9706bce081cc864b7e4fa4544", + "https://developer.download.nvidia.com/compute/cuda/12.0.0/local_installers/cuda_12.0.0_525.60.13_linux_sbsa.run", + ), + "Linux-x86_64": ( + "905e9b9516900839fb76064719db752439f38b8cb730b49335d8bd53ddfad392", + "https://developer.download.nvidia.com/compute/cuda/12.0.0/local_installers/cuda_12.0.0_525.60.13_linux.run", + ), + "Linux-ppc64le": ( + "117fe045c71668e45d41c6119b6f27875370c78e33fc56795b6fe014c796ec60", + "https://developer.download.nvidia.com/compute/cuda/12.0.0/local_installers/cuda_12.0.0_525.60.13_linux_ppc64le.run", + ), + }, "11.8.0": { "Linux-aarch64": ( "e6e9a8d31163c9776b5e313fd7590877c5684e1ecddee741154f95704d4ed27c", @@ -441,7 +456,10 @@ class Cuda(Package): key = "{0}-{1}".format(platform.system(), platform.machine()) pkg = packages.get(key) if pkg: - version(ver, sha256=pkg[0], url=pkg[1], expand=False) + if ver == preferred_ver: + version(ver, sha256=pkg[0], url=pkg[1], expand=False, preferred=True) + else: + version(ver, sha256=pkg[0], url=pkg[1], expand=False) # macOS Mojave drops NVIDIA graphics card support -- official NVIDIA # drivers do not exist for Mojave. See diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index ebd1501805..fff664a636 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -110,6 +110,9 @@ class Hypre(AutotoolsPackage, CudaPackage, ROCmPackage): when="+umpire+rocm amdgpu_target={0}".format(gfx), ) + # Uses deprecated cuSPARSE functions/types (e.g. csrsv2Info_t). + depends_on("cuda@:11", when="+cuda") + # Conflicts conflicts("+cuda", when="+int64") conflicts("+rocm", when="+int64") |