zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cuda: add v12.5.0 (#44971)

Browse Source 
Co-authored-by: Harmen Stoppels <me@harmenstoppels.nl>
This commit is contained in:
Kun Wu 2024-07-01 12:45:04 -05:00 committed by GitHub
parent 61d6fc70e8
commit c6da4d586b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/build_systems/cuda.py
View File

@ -136,14 +136,14 @@ def cuda_flags(arch_list):
conflicts("%gcc@11.2:", when="+cuda ^cuda@:11.5")
conflicts("%gcc@12:", when="+cuda ^cuda@:11.8")
conflicts("%gcc@13:", when="+cuda ^cuda@:12.3")
conflicts("%gcc@14:", when="+cuda ^cuda@:12.4")
conflicts("%gcc@14:", when="+cuda ^cuda@:12.5")
conflicts("%clang@12:", when="+cuda ^cuda@:11.4.0")
conflicts("%clang@13:", when="+cuda ^cuda@:11.5")
conflicts("%clang@14:", when="+cuda ^cuda@:11.7")
conflicts("%clang@15:", when="+cuda ^cuda@:12.0")
conflicts("%clang@16:", when="+cuda ^cuda@:12.1")
conflicts("%clang@17:", when="+cuda ^cuda@:12.3")
conflicts("%clang@18:", when="+cuda ^cuda@:12.4")
conflicts("%clang@18:", when="+cuda ^cuda@:12.5")
# https://gist.github.com/ax3l/9489132#gistcomment-3860114
conflicts("%gcc@10", when="+cuda ^cuda@:11.4.0")

10
var/spack/repos/builtin/packages/cuda/package.py
View File

@ -25,6 +25,16 @@
preferred_ver = "11.8.0"
_versions = {
"12.5.0": {
"Linux-aarch64": (
"e7b864c9ae27cef77cafc78614ec33cbb0a27606af9375deffa09c4269a07f04",
"https://developer.download.nvidia.com/compute/cuda/12.5.0/local_installers/cuda_12.5.0_555.42.02_linux_sbsa.run",
),
"Linux-x86_64": (
"90fcc7df48226434065ff12a4372136b40b9a4cbf0c8602bb763b745f22b7a99",
"https://developer.download.nvidia.com/compute/cuda/12.5.0/local_installers/cuda_12.5.0_555.42.02_linux.run",
),
},
"12.4.1": {
"Linux-aarch64": (
"b0fbc77effa225498974625b6b08b3f6eff4a37e379f5b60f1d3827b215ad19b",

7
var/spack/repos/builtin/packages/vtk-m/package.py
View File

@ -152,6 +152,13 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
# https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3160
patch("mr3160-rocthrust-fix.patch", when="@2.1:")
# Disable Thrust patch that is no longer needed in modern Thrust
patch(
"https://github.com/Kitware/VTK-m/commit/4a4466e7c8cd44d2be2bd3fe6f359faa8e9547aa.patch?full_index=1",
sha256="58dc104ba05ec99c359eeec3ac094cdb071053a4250f4ad9d72ef6a356c4346e",
when="@1.6.0: +cuda ^cuda@12.5:",
)
def cmake_args(self):
spec = self.spec
options = []