From dea3164ec043e8701bcd2ce8f3eab4302db4b7a6 Mon Sep 17 00:00:00 2001
From: Renjith Ravindran Kannath <Renjith.RavindranKannath@amd.com>
Date: Tue, 29 Aug 2023 10:23:16 -0700
Subject: [PATCH] Style and audit corrections for 5.6

---
 var/spack/repos/builtin/packages/hip/package.py  | 16 ++++++++--------
 .../repos/builtin/packages/miopen-hip/package.py |  4 ----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py
index c336fc10b3a..2f7160ecb61 100644
--- a/var/spack/repos/builtin/packages/hip/package.py
+++ b/var/spack/repos/builtin/packages/hip/package.py
@@ -115,7 +115,7 @@ class Hip(CMakePackage):
 
     depends_on("cuda", when="+cuda")
 
-    depends_on("cmake@3.16.8:", type="build", when="@4.5.0:")
+    depends_on("cmake@3.16.8:", type=("build"), when="@4.5.0:")
     depends_on("cmake@3.4.3:", type="build")
     depends_on("perl@5.10:", type=("build", "run"))
 
@@ -175,7 +175,7 @@ class Hip(CMakePackage):
         for ver in ["5.4.0", "5.4.3", "5.5.0", "5.5.1", "5.6.0"]:
             depends_on("hipify-clang", when="@" + ver)
 
-        for ver in ["5.5.0", "5.5.1","5.6.0"]:
+        for ver in ["5.5.0", "5.5.1", "5.6.0"]:
             depends_on("rocm-core@" + ver, when="@" + ver)
         # hipcc likes to add `-lnuma` by default :(
         # ref https://github.com/ROCm-Developer-Tools/HIP/pull/2202
@@ -273,7 +273,7 @@ class Hip(CMakePackage):
         )
     # Add hip-clr sources thru the below
     for d_version, d_shasum in [
-        ("5.6.0", "8dcd99110737a294f67a805639cf372890c8ca16c7603caaa793e71e84478fe4"),
+        ("5.6.0", "8dcd99110737a294f67a805639cf372890c8ca16c7603caaa793e71e84478fe4")
     ]:
         resource(
             name="clr",
@@ -289,7 +289,7 @@ class Hip(CMakePackage):
 
     # Add hipcc sources thru the below
     for d_version, d_shasum in [
-        ("5.6.0", "fdb7fdc9e4648376120330f034ee8353038d34c8a015f9eb0c208c56eeddd097"),
+        ("5.6.0", "fdb7fdc9e4648376120330f034ee8353038d34c8a015f9eb0c208c56eeddd097")
     ]:
         resource(
             name="hipcc",
@@ -304,7 +304,7 @@ class Hip(CMakePackage):
         )
     # Add hiptests sources thru the below
     for d_version, d_shasum in [
-        ("5.6.0", "8cf4509bf9c0747dab8ed8fec1365a9156792034b517207a0b2d63270429fd2e"),
+        ("5.6.0", "8cf4509bf9c0747dab8ed8fec1365a9156792034b517207a0b2d63270429fd2e")
     ]:
         resource(
             name="hip-tests",
@@ -615,8 +615,8 @@ def patch(self):
             elif self.spec.satisfies("@4.5.0:5.5"):
                 files = []
                 filter_file(match, substitute, *files, **kwargs)
-            # This guy is used during the cmake phase, so we have to fix the
-            # shebang already here in case it is too long.
+                # This guy is used during the cmake phase, so we have to fix the
+                # shebang already here in case it is too long.
                 filter_shebang("hipconfig")
         if self.spec.satisfies("@4.5.0:5.5"):
             perl = self.spec["perl"].command
@@ -698,7 +698,7 @@ def cmake_args(self):
         if "@5.6.0:" in self.spec:
             args.append(self.define("ROCCLR_PATH", self.stage.source_path + "/clr/rocclr"))
             args.append(self.define("AMD_OPENCL_PATH", self.stage.source_path + "/clr/opencl"))
-            args.append(self.define("HIPCC_BIN_DIR",  self.stage.source_path + "/hipcc/bin")),
+            args.append(self.define("HIPCC_BIN_DIR", self.stage.source_path + "/hipcc/bin")),
             args.append(self.define("CLR_BUILD_HIP", True)),
             args.append(self.define("CLR_BUILD_OCL", False)),
         return args
diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py
index 27aaa288cb2..c114287c6a8 100644
--- a/var/spack/repos/builtin/packages/miopen-hip/package.py
+++ b/var/spack/repos/builtin/packages/miopen-hip/package.py
@@ -20,7 +20,6 @@ class MiopenHip(CMakePackage):
     maintainers("srekolam", "renjithravindrankannath")
     libraries = ["libMIOpen"]
 
-    version("5.6.0", sha256="d620ddab5b488bdf81242654fefa337c6b71dc410c2ff26d30a4ee86a8d22d11")
     version("5.5.1", sha256="2cd75071b8ee876c69a94f028b6c8a9346d6d2fde7d4b64e6d635f3b6c994262")
     version("5.5.0", sha256="791087242551669e546225e36123c21663f0dad14dbcfd6d0ce0e7bad0ab0de1")
     version("5.4.3", sha256="37ffe2ed3d7942da8ea2f6bdb85c7a2f58e3ccd31767db158a322769d3604efd")
@@ -145,7 +144,6 @@ class MiopenHip(CMakePackage):
         "5.4.3",
         "5.5.0",
         "5.5.1",
-        "5.6.0",
     ]:
         depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
         depends_on("hip@" + ver, when="@" + ver)
@@ -157,9 +155,7 @@ class MiopenHip(CMakePackage):
 
     for ver in ["5.4.0", "5.4.3", "5.5.0", "5.5.1"]:
         depends_on("rocmlir@" + ver, when="@" + ver)
-    for ver in ["5.6.0"]:
         depends_on("nlohmann-json", type="link")
-        depends_on("composable-kernel")
 
     def setup_build_environment(self, env):
         if "@3.9.0:" in self.spec: