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

Bump-up rocm-opencl with 6.1.0 & 6.1.1 and adding hsa library path in LD_LIBRARY_PATH (#44171)

Browse Source 
* Adding hsa library path in LD_LIBRARY_PATH
* Prepending instead of setting LD_LIBRARY_PATH to hsa-rocr-dev/lib
* adding rocm-opencl 6.1.0 & 6.1.1 updates
This commit is contained in:
renjithravindrankannath 2024-05-31 12:30:55 -07:00 committed by GitHub
parent 1f5bfe80ed
commit 0cd038273e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,6 +412,8 @@ def set_variables(self, env):
env.set("ROCM_PATH", paths["rocm-path"])
if self.spec.satisfies("@5.4:"):
env.set("HIPIFY_CLANG_PATH", paths["hipify-clang"])
if self.spec.satisfies("@6.1:"):
env.prepend_path("LD_LIBRARY_PATH", self.spec["hsa-rocr-dev"].prefix.lib)
# hipcc recognizes HIP_PLATFORM == hcc and HIP_COMPILER == clang, even
# though below we specified HIP_PLATFORM=rocclr and HIP_COMPILER=clang

24
var/spack/repos/builtin/packages/rocm-opencl/package.py
View File

@ -35,6 +35,8 @@ def url_for_version(self, version):
license("MIT")
version("master", branch="main")
version("6.1.1", sha256="2db02f335c9d6fa69befcf7c56278e5cecfe3db0b457eaaa41206c2585ef8256")
version("6.1.0", sha256="49b23eef621f4e8e528bb4de8478a17436f42053a2f7fde21ff221aa683205c7")
version("6.0.2", sha256="cb8ac610c8d4041b74fb3129c084f1e7b817ce1a5a9943feca1fa7531dc7bdcc")
version("6.0.0", sha256="798b55b5b5fb90dd19db54f136d8d8e1da9ae1e408d5b12b896101d635f97e50")
version("5.7.1", sha256="c78490335233a11b4d8a5426ace7417c555f5e2325de10422df06c0f0f00f7eb")
@ -87,12 +89,12 @@ def url_for_version(self, version):
patch(
"https://github.com/ROCm/clr/commit/c4f773db0b4ccbbeed4e3d6c0f6bff299c2aa3f0.patch?full_index=1",
sha256="5bb9b0e08888830ccf3a0a658529fe25f4ee62b5b8890f349bf2cc914236eb2f",
when="@5.7:",
when="@5.7:6.0",
)
patch(
"https://github.com/ROCm/clr/commit/7868876db742fb4d44483892856a66d2993add03.patch?full_index=1",
sha256="7668b2a710baf4cb063e6b00280fb75c4c3e0511575e8298a9c7ae5143f60b33",
when="@5.7:",
when="@5.7:6.0",
)
# Patch to set package installation path for OpenCL.
@ -116,15 +118,29 @@ def url_for_version(self, version):
"5.7.1",
"6.0.0",
"6.0.2",
"6.1.0",
"6.1.1",
"master",
]:
depends_on(f"comgr@{ver}", type="build", when=f"@{ver}")
depends_on(f"hsa-rocr-dev@{ver}", type="link", when=f"@{ver}")
for ver in ["6.0.0", "6.0.2"]:
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1"]:
depends_on(f"aqlprofile@{ver}", type="link", when=f"@{ver}")
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
for ver in [
"5.5.0",
"5.5.1",
"5.6.0",
"5.6.1",
"5.7.0",
"5.7.1",
"6.0.0",
"6.0.2",
"6.1.0",
"6.1.1",
]:
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
@classmethod