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

fix ck build for 5.6.1 (#40304)

Browse Source 
* initial commit to fix ck build for 5.6.1
* disable mlir for miopen-hip
* use satisfies for checking specs and add nlohmann-json dependency for 5.4 onwards
This commit is contained in:
afzpatel 2023-10-11 17:43:21 -04:00 committed by GitHub
parent df01a11e07
commit 01747b50df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/composable-kernel/package.py
View File

@ -64,9 +64,14 @@ def cmake_args(self):
] ]
if "auto" not in self.spec.variants["amdgpu_target"]: if "auto" not in self.spec.variants["amdgpu_target"]:
args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target")) args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target"))
if self.spec.satisfies("@5.6.1:"):
args.append(self.define("INSTANCES_ONLY", "ON"))
return args return args
def build(self, spec, prefix): def build(self, spec, prefix):
with working_dir(self.build_directory): with working_dir(self.build_directory):
# only instances is necessary to build and install # only instances is necessary to build and install
make("instances") if self.spec.satisfies("@5.6.1:"):
make()
else:
make("instances")

2
var/spack/repos/builtin/packages/miopen-hip/package.py
View File

@ -160,6 +160,7 @@ class MiopenHip(CMakePackage):
depends_on("nlohmann-json", type="link") depends_on("nlohmann-json", type="link")
depends_on("composable-kernel@" + ver, when="@" + ver) depends_on("composable-kernel@" + ver, when="@" + ver)
for ver in ["5.4.0", "5.4.3", "5.5.0"]: for ver in ["5.4.0", "5.4.3", "5.5.0"]:
depends_on("nlohmann-json", type="link")
depends_on("rocmlir@" + ver, when="@" + ver) depends_on("rocmlir@" + ver, when="@" + ver)
def setup_build_environment(self, env): def setup_build_environment(self, env):
@ -216,6 +217,7 @@ def cmake_args(self):
if self.spec.satisfies("@5.5.1:"): if self.spec.satisfies("@5.5.1:"):
args.append(self.define("MIOPEN_USE_COMPOSABLEKERNEL", "ON")) args.append(self.define("MIOPEN_USE_COMPOSABLEKERNEL", "ON"))
args.append(self.define("MIOPEN_ENABLE_AI_KERNEL_TUNING", "OFF")) args.append(self.define("MIOPEN_ENABLE_AI_KERNEL_TUNING", "OFF"))
args.append(self.define("MIOPEN_USE_MLIR", "OFF"))
args.append( args.append(
"-DNLOHMANN_JSON_INCLUDE={0}".format(self.spec["nlohmann-json"].prefix.include) "-DNLOHMANN_JSON_INCLUDE={0}".format(self.spec["nlohmann-json"].prefix.include)
) )