rocm-4.1.0 release-add git repo path, modify hipfft package recipe (#23119)

2 files changed, 24 insertions, 9 deletions

diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py
index 77b9724b30..ccb3eb2d85 100644
--- a/var/spack/repos/builtin/packages/hipfft/package.py
+++ b/var/spack/repos/builtin/packages/hipfft/package.py
@@ -8,20 +8,32 @@ from spack import *
 
 
 class Hipfft(CMakePackage):
-    """hipFFT is an FFT marshalling library. Currently,
-       hipFFT supports either rocFFT or cuFFT as backends."""
+    """hipFFT is an FFT marshalling library. Currently, hipFFT supports
+       either rocFFT or cuFFT as backends.hipFFT exports an interface that
+       does not require the client to change, regardless of the chosen backend.
+       It sits between the application and the backend FFT library, marshalling
+       inputs into the backend and results back to the application."""
 
     homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT"
-    url      = "https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-4.1.0.tar.gz"
+    git      = "https://github.com/ROCmSoftwarePlatform/hipFFT.git"
+    url      = "https://github.com/ROCmSoftwarePlatform/hipfft/archive/rocm-4.1.0.tar.gz"
 
-    maintainers = ['arjun-raj-kuppala', 'sreekolam']
+    maintainers = ['arjun-raj-kuppala', 'srekolam']
 
+    version('master', branch='master')
     version('4.1.0', sha256='885ffd4813f2c271150f1b8b386f0af775b38fc82b96ce6fd94eb4ba0c0180be')
 
-    depends_on('hip@4.1.0')
-    depends_on('hip-rocclr@4.1.0')
-    depends_on('rocfft@4.1.0')
-    depends_on('rocm-cmake@4.1.0', type='build')
+    depends_on('cmake@3:', type='build')
+
+    for ver in ['4.1.0']:
+        depends_on('rocm-cmake@' + ver, type='build', when='@' + ver)
+        depends_on('hip@' + ver, when='@' + ver)
+        depends_on('hip-rocclr@' + ver, when='@' + ver)
+        depends_on('rocfft@' + ver, when='@' + ver)
 
     def setup_build_environment(self, env):
         env.set('CXX', self.spec['hip'].hipcc)
+
+    def cmake_args(self):
+        args = ['-DBUILD_CLIENTS_SAMPLES=OFF']
+        return args
diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py
index edb60acaf7..78d580d9e1 100644
--- a/var/spack/repos/builtin/packages/rocminfo/package.py
+++ b/var/spack/repos/builtin/packages/rocminfo/package.py
@@ -11,10 +11,12 @@ class Rocminfo(CMakePackage):
     """Radeon Open Compute (ROCm) Runtime rocminfo tool"""
 
     homepage = "https://github.com/RadeonOpenCompute/rocminfo"
+    git      = "https://github.com/RadeonOpenCompute/rocminfo.git"
     url      = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-4.1.0.tar.gz"
 
     maintainers = ['srekolam', 'arjun-raj-kuppala']
 
+    version('master', branch='master')
     version('4.1.0', sha256='5b994ad02b6d250160770f6f7730835f3a52127193ac9a8dee40c53aec911f4f')
     version('4.0.0', sha256='0b3d692959dd4bc2d1665ab3a838592fcd08d2b5e373593b9192ca369e2c4aa7')
     version('3.10.0', sha256='ed02375be3be518b83aea7309ef5ca62dc9b6dbad0aae33e92995102d6d660be')
@@ -25,7 +27,8 @@ class Rocminfo(CMakePackage):
 
     depends_on('cmake@3:', type='build')
 
-    for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0']:
+    for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0',
+                'master']:
         depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver)
         depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver)