hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable rocm support and gtest variant for ucx (#36693)

Browse source
This commit is contained in:
afzpatel 2023-04-12 00:12:44 -04:00 committed by GitHub
parent 4ba49f3814
commit 9ddfdec193
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
var/spack/repos/builtin/packages/ucx/package.py
View file

@ -115,6 +115,7 @@ class Ucx(AutotoolsPackage, CudaPackage):
variant("ud", default=False, description="Compile with IB Unreliable Datagram support") variant("ud", default=False, description="Compile with IB Unreliable Datagram support")
variant("verbs", default=False, description="Build OpenFabrics support") variant("verbs", default=False, description="Build OpenFabrics support")
variant("xpmem", default=False, description="Enable XPMEM support") variant("xpmem", default=False, description="Enable XPMEM support")
variant("gtest", default=False, description="Build and install Googletest")
depends_on("binutils+ld", when="%aocc", type="build") depends_on("binutils+ld", when="%aocc", type="build")
depends_on("binutils", when="+backtrace_detail") depends_on("binutils", when="+backtrace_detail")
@ -129,6 +130,7 @@ class Ucx(AutotoolsPackage, CudaPackage):
depends_on("rdma-core", when="+rdmacm") depends_on("rdma-core", when="+rdmacm")
depends_on("rdma-core", when="+verbs") depends_on("rdma-core", when="+verbs")
depends_on("xpmem", when="+xpmem") depends_on("xpmem", when="+xpmem")
depends_on("hip", when="+rocm")
conflicts("+gdrcopy", when="~cuda", msg="gdrcopy currently requires cuda support") conflicts("+gdrcopy", when="~cuda", msg="gdrcopy currently requires cuda support")
conflicts("+rocm", when="+gdrcopy", msg="gdrcopy > 2.0 does not support rocm") conflicts("+rocm", when="+gdrcopy", msg="gdrcopy > 2.0 does not support rocm")
@ -138,6 +140,19 @@ class Ucx(AutotoolsPackage, CudaPackage):
# See https://github.com/openucx/ucx/pull/8629, wrong int type # See https://github.com/openucx/ucx/pull/8629, wrong int type
patch("commit-2523555.patch", when="@1.13.1") patch("commit-2523555.patch", when="@1.13.1")
def patch(self):
if self.spec.satisfies("+rocm"):
filter_file("$$with_rocm", "${with_rocm[@]}", "configure", string=True)
filter_file(
"-I$with_rocm/include/hip -I$with_rocm/include",
"$ROCM_CPPFLAGS",
"configure",
string=True,
)
filter_file(
"-L$with_rocm/hip/lib -L$with_rocm/lib", "$ROCM_LDFLAGS", "configure", string=True
)
@when("@1.9-dev") @when("@1.9-dev")
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
Executable("./autogen.sh")() Executable("./autogen.sh")()
@ -155,10 +170,10 @@ def configure_args(self):
args += self.with_or_without("openmp") args += self.with_or_without("openmp")
args += self.enable_or_disable("optimizations") args += self.enable_or_disable("optimizations")
args += self.enable_or_disable("params-check", variant="parameter_checking") args += self.enable_or_disable("params-check", variant="parameter_checking")
args += self.enable_or_disable("gtest")
args += self.with_or_without("pic") args += self.with_or_without("pic")
args += self.with_or_without("cuda", activation_value="prefix") args += self.with_or_without("cuda", activation_value="prefix")
args += self.with_or_without("rocm") # todo, prefix, avoid /opt/rocm guess.
args += self.with_or_without("cm") args += self.with_or_without("cm")
args += self.enable_or_disable("cma") args += self.enable_or_disable("cma")
@ -219,9 +234,28 @@ def configure_args(self):
if "%aocc" in spec: if "%aocc" in spec:
args.append("LDFLAGS=-fuse-ld=bfd") args.append("LDFLAGS=-fuse-ld=bfd")
if "+rocm" in spec:
rocm_flags = " ".join(
[
"-I" + self.spec["hip"].prefix.include,
"-I" + self.spec["hip"].prefix.include.hip,
"-I" + self.spec["hsa-rocr-dev"].prefix.include.hsa,
"-L" + self.spec["hip"].prefix.lib,
"-L" + self.spec["hsa-rocr-dev"].prefix.lib,
]
)
args.append("--with-rocm=" + rocm_flags)
else:
args.append("--without-rocm")
return args return args
@run_after("install") @run_after("install")
def drop_examples(self): def drop_examples(self):
if self.spec.satisfies("~examples"): if self.spec.satisfies("~examples"):
shutil.rmtree(join_path(self.spec.prefix, "share", "ucx", "examples")) shutil.rmtree(join_path(self.spec.prefix, "share", "ucx", "examples"))
@run_after("install")
def install_gtest(self):
if self.spec.satisfies("+gtest"):
install_tree("test", self.spec.prefix.test)