From 93329d7f9946c0f372fbbb5d51c9572bb692a5de Mon Sep 17 00:00:00 2001 From: afzpatel <122491982+afzpatel@users.noreply.github.com> Date: Tue, 25 Feb 2025 07:48:49 -0500 Subject: [PATCH] add ck variant to miopen-hip (#49143) --- .../repos/builtin/packages/miopen-hip/package.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 3a768683b87..f09cd060a6a 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -43,6 +43,11 @@ class MiopenHip(CMakePackage): version("5.3.3", sha256="7efc98215d23a2caaf212378c37e9a6484f54a4ed3e9660719286e4f287d3715") version("5.3.0", sha256="c5819f593d71beeda2eb24b89182912240cc40f83b2b8f9de695a8e230aa4ea6") + variant( + "ck", + default=True, + description="Enable MIOpen to use composable kernels for various operation", + ) variant("asan", default=False, description="Build with address-sanitizer enabled or disabled") conflicts("+asan", when="os=rhel9") @@ -143,10 +148,8 @@ class MiopenHip(CMakePackage): "6.3.1", "6.3.2", ]: - depends_on("nlohmann-json", type="link") - depends_on(f"composable-kernel@{ver}", when=f"@{ver}") + depends_on(f"composable-kernel@{ver}", when=f"@{ver} +ck") for ver in ["5.4.0", "5.4.3", "5.5.0"]: - depends_on("nlohmann-json", type="link") depends_on(f"rocmlir@{ver}", when=f"@{ver}") for ver in [ "6.0.0", @@ -162,14 +165,15 @@ class MiopenHip(CMakePackage): "6.3.2", ]: depends_on(f"roctracer-dev@{ver}", when=f"@{ver}") - for ver in ["6.1.0", "6.1.1", "6.1.2"]: - depends_on("googletest") for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"rocrand@{ver}", when=f"@{ver}") for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hipblas@{ver}", when=f"@{ver}") depends_on(f"hipblaslt@{ver}", when=f"@{ver}") + depends_on("nlohmann-json", type="link") + depends_on("googletest", when="@6.1:") + def setup_build_environment(self, env): lib_dir = self.spec["zlib-api"].libs.directories[0] env.prepend_path("LIBRARY_PATH", lib_dir) @@ -224,7 +228,7 @@ def cmake_args(self): args.append(self.define("MIOPEN_USE_MLIR", "ON")) args.append(self.define("MIOPEN_ENABLE_AI_KERNEL_TUNING", "OFF")) if self.spec.satisfies("@5.5.1:"): - args.append(self.define("MIOPEN_USE_COMPOSABLEKERNEL", "ON")) + args.append(self.define_from_variant("MIOPEN_USE_COMPOSABLEKERNEL", "ck")) args.append(self.define("MIOPEN_ENABLE_AI_KERNEL_TUNING", "OFF")) args.append(self.define("MIOPEN_USE_MLIR", "OFF")) if self.spec.satisfies("@5.7.0:"):