From 8bc897cee13328301ad4bd748a1cbb55a35bcdd5 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 16 Sep 2024 14:00:26 -0500 Subject: [PATCH] hipfft: update @master dependency wrt rocfft (#46376) * add master branch to rocfft and ensure its dependency on that branch for hip and rocm-cmake * ensure hipfft@master uses rocm-cmake@master --- var/spack/repos/builtin/packages/hipfft/package.py | 1 + var/spack/repos/builtin/packages/rocfft/package.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index ec06a50214e..890fabab897 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -83,6 +83,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage): "6.1.1", "6.1.2", "6.2.0", + "master", ]: depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") depends_on(f"rocfft@{ver}", when=f"+rocm @{ver}") diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index 552b00c3817..a42735f6dec 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -20,6 +20,7 @@ class Rocfft(CMakePackage): libraries = ["librocfft"] license("MIT") + version("master", branch="master") version("6.2.0", sha256="c9886ec2c713c502dcde4f5fed3d6e1a7dd019023fb07e82d3b622e66c6f2c36") version("6.1.2", sha256="6f54609b0ecb8ceae8b7acd4c8692514c2c2dbaf0f8b199fe990fd4711428193") version("6.1.1", sha256="d517a931d49a1e59df4e494ab2b68e301fe7ebf39723863985567467f111111c") @@ -88,6 +89,7 @@ class Rocfft(CMakePackage): "6.1.1", "6.1.2", "6.2.0", + "master", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")