Bump up the version for ROCm-6.3.0 (#47966)
* Bump up the version for ROCm-6.3.0 * changes for aqlprofile, rocprofiler-dev and omnitrace * add rocfft patch, correct Clang_DIR and add aqlprofile yum package * add rpp and rocm-openmp-extras changes * hipblaslt changes * add rvs rocm 6.3 * bump rocdecode and rocpydecode * add rocdecode libva arg * add llvm-amdgpu dependency for hipblaslt * restrict half in miopen-hip * fix for rocblas and hipblaslt * fix hipblas-common target_include * fix sha256 for rocm-tensile Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> --------- Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
This commit is contained in:
afzpatel
GitHub
parent
93c09ed3b4
commit
fd865efe87
@ -16,10 +16,11 @@ class Amdsmi(CMakePackage):
|
||||
url = "https://github.com/ROCm/amdsmi/archive/refs/tags/rocm-6.1.2.tar.gz"
|
||||
|
||||
tags = ["rocm"]
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["libamd_smi"]
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="7234c46648938239385cd5db57516ed53985b8c09d2f0828ae8f446386d8bd1e")
|
||||
version("6.2.4", sha256="5ebe8d0f176bf4a73b0e7000d9c47cb7f65ecca47011d3f9b08b93047dcf7ac5")
|
||||
version("6.2.1", sha256="136941e3f13e0d373ee3698bd60d4fc36353a2df6406e5a50b6ac78f1b639698")
|
||||
version("6.2.0", sha256="49e4b15af62bf9800c02a24c75c6cd99dc8b146d69cc7f00ecbbcd60f6106315")
|
||||
|
||||
@ -9,6 +9,20 @@
|
||||
from spack.package import *
|
||||
|
||||
_versions = {
|
||||
"6.3.0": {
|
||||
"apt": (
|
||||
"af03118e2606aeae0da636af17221fe124d5b955ebf40f0e2518f4a427a0c9bc",
|
||||
"https://repo.radeon.com/rocm/apt/6.3/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.60300-39~20.04_amd64.deb",
|
||||
),
|
||||
"yum": (
|
||||
"0aef66582b4de4f39c4781da2450c68eff00842ffc6713b141e9ba41630e452d",
|
||||
"https://repo.radeon.com/rocm/rhel8/6.3/main/hsa-amd-aqlprofile-1.0.0.60300-39.el8.x86_64.rpm",
|
||||
),
|
||||
"zyp": (
|
||||
"6086231326d0a9de1033278995ca0fe635b8081dfd856019ec17c75b08fc6188",
|
||||
"https://repo.radeon.com/rocm/zyp/6.3/main/hsa-amd-aqlprofile-1.0.0.60300-sles155.39.x86_64.rpm",
|
||||
),
|
||||
},
|
||||
"6.2.4": {
|
||||
"apt": (
|
||||
"614ad0c01b7f18eaa9e8a33fb73b9d8445c8785841ed41b406e129101dea854d",
|
||||
@ -246,6 +260,7 @@ class Aqlprofile(Package):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -24,12 +24,13 @@ def url_for_version(self, version):
|
||||
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["libamd_comgr"]
|
||||
|
||||
license("NCSA")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c")
|
||||
version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528")
|
||||
version("6.2.1", sha256="4840f109d8f267c28597e936c869c358de56b8ad6c3ed4881387cf531846e5a7")
|
||||
version("6.2.0", sha256="12ce17dc920ec6dac0c5484159b3eec00276e4a5b301ab1250488db3b2852200")
|
||||
@ -66,8 +67,6 @@ def url_for_version(self, version):
|
||||
depends_on("z3", type="link")
|
||||
depends_on("ncurses", type="link")
|
||||
|
||||
depends_on("rocm-cmake@3.5.0:", type="build")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
@ -87,6 +86,7 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
# llvm libs are linked statically, so this *could* be a build dep
|
||||
@ -95,6 +95,7 @@ def url_for_version(self, version):
|
||||
# aomp may not build rocm-device-libs as part of llvm-amdgpu, so make
|
||||
# that a conditional dependency
|
||||
depends_on(f"rocm-device-libs@{ver}", when=f"@{ver} ^llvm-amdgpu ~rocm-device-libs")
|
||||
depends_on(f"rocm-cmake@{ver}", when=f"@{ver}", type="build")
|
||||
|
||||
for ver in [
|
||||
"5.5.0",
|
||||
@ -111,6 +112,7 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -19,6 +19,7 @@ class ComposableKernel(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="develop")
|
||||
version("6.3.0", sha256="274f87fc27ec2584c76b5bc7ebdbe172923166b6b93e66a24f98475b44be272d")
|
||||
version("6.2.4", sha256="5598aea4bce57dc95b60f2029831edfdade80b30a56e635412cc02b2a6729aa6")
|
||||
version("6.2.1", sha256="708ff25218dc5fa977af4a37105b380d7612a70c830fa7977b40b3df8b8d3162")
|
||||
version("6.2.0", sha256="4a3024f4f93c080db99d560a607ad758745cd2362a90d0e8f215331686a6bc64")
|
||||
@ -59,6 +60,7 @@ class ComposableKernel(CMakePackage):
|
||||
|
||||
for ver in [
|
||||
"master",
|
||||
"6.3.0",
|
||||
"6.2.4",
|
||||
"6.2.1",
|
||||
"6.2.0",
|
||||
@ -103,6 +105,8 @@ def cmake_args(self):
|
||||
if self.spec.satisfies("@5.6.0:"):
|
||||
if self.run_tests:
|
||||
args.append(self.define("BUILD_TESTING", "ON"))
|
||||
elif self.spec.satisfies("@:6.1"):
|
||||
args.append(self.define("INSTANCES_ONLY", "ON"))
|
||||
args.append(self.define("CK_BUILD_JIT_LIB", "ON"))
|
||||
args.append(self.define("CMAKE_POSITION_INDEPENDENT_CODE", "ON"))
|
||||
if self.spec.satisfies("@:5.7"):
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
from spack.package import *
|
||||
|
||||
|
||||
class Dlpack(Package):
|
||||
class Dlpack(CMakePackage):
|
||||
"""DLPack is an RFC for common tensor and operator guidelines
|
||||
in deep learning systems."""
|
||||
|
||||
@ -17,6 +17,7 @@ class Dlpack(Package):
|
||||
license("Apache-2.0")
|
||||
|
||||
version("master", branch="master")
|
||||
version("1.0", sha256="f8cfdcb634ff3cf0e3d9a3426e019e1c6469780a3b0020c9bc4ecc09cf9abcb1")
|
||||
version("0.8", sha256="cf965c26a5430ba4cc53d61963f288edddcd77443aa4c85ce722aaf1e2f29513")
|
||||
version("0.5", sha256="9209ac194a175aaab4381313891fba047cb173b2bdd15ac934f83f567f9cd514")
|
||||
version("0.4", sha256="d0a533189ecd45a033b72e276fccaa2122cfd76de125e0a5e126bdea0fec2d24")
|
||||
@ -26,6 +27,3 @@ class Dlpack(Package):
|
||||
|
||||
depends_on("c", type="build") # generated
|
||||
depends_on("cxx", type="build") # generated
|
||||
|
||||
def install(self, spec, prefix):
|
||||
install_tree("include", prefix.include)
|
||||
|
||||
@ -17,6 +17,7 @@ class HipTensor(CMakePackage, ROCmPackage):
|
||||
maintainers("srekolam", "afzpatel")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="9a4acef722e838ec702c6b111ebc1fff9d5686ae5c79a9f5a82e5fac2a5e406a")
|
||||
version("6.2.4", sha256="54c378b440ede7a07c93b5ed8d16989cc56283a56ea35e41f3666bb05b6bc984")
|
||||
version("6.2.1", sha256="592dbe73f5f95ba512f7fbe9975a68dbea85846be74da15344d74952b286f243")
|
||||
version("6.2.0", sha256="adb7459416864fb2664064f5bea5fb669839247b702209a6415b396813626b31")
|
||||
@ -42,12 +43,13 @@ class HipTensor(CMakePackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"composable-kernel@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-cmake@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"hipcc@{ver}", when=f"@{ver}")
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
|
||||
@ -22,12 +22,13 @@ class Hip(CMakePackage):
|
||||
url = "https://github.com/ROCm/HIP/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["libamdhip64"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="d8dba8cdf05463afb7879de2833983cafa6a006ba719815a35b96d9b92fc7fc4")
|
||||
version("6.2.4", sha256="76e4583ae3d31786270fd92abbb2e3dc5e665b22fdedb5ceff0093131d4dc0ca")
|
||||
version("6.2.1", sha256="a8b86666a59867cae67409c4a45e0b8f29a6328c9739e6512c2b5612376f30cf")
|
||||
version("6.2.0", sha256="7ca261eba79793427674bf2372c92ac5483cc0fac5278f8ad611de396fad8bee")
|
||||
@ -96,6 +97,28 @@ class Hip(CMakePackage):
|
||||
"6.2.4",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver} +rocm-device-libs", when=f"@{ver}")
|
||||
@ -119,6 +142,7 @@ class Hip(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hipify-clang@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -137,6 +161,7 @@ class Hip(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -144,10 +169,10 @@ class Hip(CMakePackage):
|
||||
# ref https://github.com/ROCm/HIP/pull/2202
|
||||
depends_on("numactl", when="@3.7.0:")
|
||||
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"hipcc@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}")
|
||||
|
||||
# roc-obj-ls requirements
|
||||
@ -209,6 +234,7 @@ class Hip(CMakePackage):
|
||||
)
|
||||
# Add hip-clr sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("6.3.0", "829e61a5c54d0c8325d02b0191c0c8254b5740e63b8bfdb05eec9e03d48f7d2c"),
|
||||
("6.2.4", "0a3164af7f997a4111ade634152957378861b95ee72d7060eb01c86c87208c54"),
|
||||
("6.2.1", "e9cff3a8663defdbda833d49c9e7160171eca14dc285ffe4061378607d6c890d"),
|
||||
("6.2.0", "620e4c6a7f05651cc7a170bc4700fef8cae002420307a667c638b981d00b25e8"),
|
||||
@ -265,6 +291,7 @@ class Hip(CMakePackage):
|
||||
)
|
||||
# Add hipother sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("6.3.0", "a28eb1e8fe239b41e744584d45d676925ca210968ecb21bfa60678cf8e86eeb7"),
|
||||
("6.2.4", "b7ebcf8a2679e50d27c49ebec0dbea5a67573f8b8c3f4a29108c84b28b5bedee"),
|
||||
("6.2.1", "5d99e498c1fece44a421574282fc89c6a2499979eaa9f850e5caa7fa3a8938b8"),
|
||||
("6.2.0", "1f854b0c07d71b10450080e3bbffe47adaf10a9745a9212797d991756a100174"),
|
||||
@ -286,6 +313,7 @@ class Hip(CMakePackage):
|
||||
|
||||
# Add hiptests sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("6.3.0", "8081d4ab1a43ffa1cebd646668d83008b799ab98c14daf7b455922355a439c8a"),
|
||||
("6.2.4", "1478b49583d09cb3a96e26ec3bf8dc5ff3e3ec72fa133bb6d7768595d825051e"),
|
||||
("6.2.1", "90fcf0169889533b882d289f9cb8a7baf9bd46a3ce36752b915083931dc839f1"),
|
||||
("6.2.0", "314837dbac78be71844ceb959476470c484fdcd4fb622ff8de9277783e0fcf1c"),
|
||||
@ -534,7 +562,7 @@ def patch(self):
|
||||
"clr/hipamd/hip-config.cmake.in",
|
||||
string=True,
|
||||
)
|
||||
if self.spec.satisfies("@5.7: +rocm"):
|
||||
if self.spec.satisfies("@5.7:6.2 +rocm"):
|
||||
filter_file(
|
||||
'"${ROCM_PATH}/llvm"',
|
||||
self.spec["llvm-amdgpu"].prefix,
|
||||
|
||||
19
var/spack/repos/builtin/packages/hipblas-common/package.py
Normal file
19
var/spack/repos/builtin/packages/hipblas-common/package.py
Normal file
@ -0,0 +1,19 @@
|
||||
# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
|
||||
# Spack Project Developers. See the top-level COPYRIGHT file for details.
|
||||
#
|
||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||
|
||||
from spack.package import *
|
||||
|
||||
|
||||
class HipblasCommon(CMakePackage):
|
||||
"""Common files shared by hipBLAS and hipBLASLt"""
|
||||
|
||||
homepage = "https://github.com/ROCm/hipBLAS-common"
|
||||
url = "https://github.com/ROCm/hipBLAS-common/archive/refs/tags/rocm-6.3.0.tar.gz"
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.3.0", sha256="240bb1b0f2e6632447e34deae967df259af1eec085470e58a6d0aa040c8530b0")
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
|
||||
index 9394dce..caa6eb6 100755
|
||||
--- a/library/src/CMakeLists.txt
|
||||
+++ b/library/src/CMakeLists.txt
|
||||
@@ -138,7 +138,7 @@ target_include_directories( hipblas
|
||||
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/hipblas>
|
||||
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
- $<BUILD_INTERFACE:${HIPBLAS-COMMON_INCLUDE_DIRS}>
|
||||
+ ${HIPBLAS-COMMON_INCLUDE_DIRS}
|
||||
PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
@ -18,13 +18,14 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
url = "https://github.com/ROCm/hipBLAS/archive/rocm-6.0.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["libhipblas"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="72604c1896e42e65ea2b3e905159af6ec5eede6a353678009c47d0a24f462c92")
|
||||
version("6.2.4", sha256="3137ba35e0663d6cceed70086fc6397d9e74803e1711382be62809b91beb2f32")
|
||||
version("6.2.1", sha256="b770b6ebd27d5c12ad01827195e996469bfc826e8a2531831df475fc8d7f6b2e")
|
||||
version("6.2.0", sha256="33688a4d929b13e1fd800aff7e0833a9f7abf3913754b6b15995595e0d434e94")
|
||||
@ -76,10 +77,11 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
patch("remove-hipblas-clients-file-installation.patch", when="@5.5:5.7.1")
|
||||
patch("remove-hipblas-clients-file-installation-6.0.patch", when="@6.0:")
|
||||
patch("modify-hipblas-common-dependency.patch", when="@6.3:")
|
||||
|
||||
depends_on("rocm-cmake@5.2.0:", type="build", when="@5.2.0:5.7")
|
||||
depends_on("rocm-cmake@4.5.0:", type="build")
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"rocm-cmake@{ver}", when=f"+rocm @{ver}")
|
||||
depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"+rocm @{ver}")
|
||||
|
||||
@ -104,6 +106,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
@ -113,6 +116,8 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
depends_on(f"rocblas amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}")
|
||||
depends_on(f"rocsolver amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}")
|
||||
|
||||
depends_on("hipblas-common@6.3.0", when="@6.3.0")
|
||||
|
||||
@classmethod
|
||||
def determine_version(cls, lib):
|
||||
match = re.search(r"lib\S*\.so\.\d+\.\d+\.(\d)(\d\d)(\d\d)", lib)
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
|
||||
index 865dcd9..0ca1815 100644
|
||||
--- a/library/CMakeLists.txt
|
||||
+++ b/library/CMakeLists.txt
|
||||
@@ -72,6 +72,7 @@ include(src/CMakeLists.txt)
|
||||
# Create hipBLASLt library
|
||||
add_library(hipblaslt ${hipblaslt_source} ${hipblaslt_headers_public})
|
||||
add_library(roc::hipblaslt ALIAS hipblaslt)
|
||||
+target_include_directories( hipblaslt PRIVATE ${MSGPACK_DIR}/include )
|
||||
|
||||
# Target compile definitions
|
||||
if(NOT BUILD_CUDA)
|
||||
@@ -154,7 +155,7 @@ if( LEGACY_HIPBLAS_DIRECT )
|
||||
)
|
||||
else()
|
||||
target_include_directories(hipblaslt
|
||||
- PUBLIC $<BUILD_INTERFACE:${HIPBLAS-COMMON_INCLUDE_DIRS}>
|
||||
+ PUBLIC ${HIPBLAS-COMMON_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
|
||||
diff --git a/tensilelite/Tensile/Common.py b/tensilelite/Tensile/Common.py
|
||||
index 6b5cdc8..9f28e46 100644
|
||||
--- a/tensilelite/Tensile/Common.py
|
||||
+++ b/tensilelite/Tensile/Common.py
|
||||
@@ -277,6 +277,8 @@ globalParameters["LazyLibraryLoading"] = False # Load library and code object fi
|
||||
globalParameters["UseUserArgs"] = False
|
||||
|
||||
globalParameters["RotatingBufferSize"] = 0 # Size in MB
|
||||
+globalParameters["LLVMPath"] = os.environ.get("LLVM_PATH")
|
||||
+globalParameters["ROCmSMIPath"] = os.environ.get("ROCM_SMI_PATH")
|
||||
globalParameters["RotatingMode"] = 0 # Default is 0, allocated in order A0B0C0D0..ANBNCNDN. 1 is in order A0 pad B0 pad .... AN pad BN pad.
|
||||
# Mode 0 requires memcpy everytime when the problem changes to reset the data, but mode 1 doesn't.
|
||||
|
||||
@@ -1576,7 +1578,7 @@ def assignGlobalParameters( config ):
|
||||
if os.name == "nt":
|
||||
globalParameters["ROCmAgentEnumeratorPath"] = locateExe(globalParameters["ROCmBinPath"], "hipinfo.exe")
|
||||
else:
|
||||
- globalParameters["ROCmAgentEnumeratorPath"] = locateExe(globalParameters["ROCmBinPath"], "rocm_agent_enumerator")
|
||||
+ globalParameters["ROCmAgentEnumeratorPath"] = os.environ.get("ROCM_AGENT_ENUMERATOR_PATH")
|
||||
|
||||
if "CxxCompiler" in config:
|
||||
globalParameters["CxxCompiler"] = config["CxxCompiler"]
|
||||
@@ -1602,8 +1604,7 @@ def assignGlobalParameters( config ):
|
||||
compiler = "clang++" if globalParameters["CxxCompiler"] == "hipcc" else "amdclang++"
|
||||
globalParameters["AssemblerPath"] = locateExe(os.path.join(globalParameters["ROCmPath"], bin_path), compiler)
|
||||
|
||||
- globalParameters["ROCmSMIPath"] = locateExe(globalParameters["ROCmBinPath"], "rocm-smi")
|
||||
- globalParameters["ROCmLdPath"] = locateExe(os.path.join(globalParameters["ROCmPath"], "llvm/bin"), "ld.lld")
|
||||
+ globalParameters["ROCmLdPath"] = locateExe(os.path.join(globalParameters["LLVMPath"], "bin"), "ld.lld")
|
||||
|
||||
globalParameters["ExtractKernelPath"] = locateExe(os.path.join(globalParameters["ROCmPath"], "hip/bin"), "extractkernel")
|
||||
|
||||
@ -17,6 +17,7 @@ class Hipblaslt(CMakePackage):
|
||||
maintainers("srekolam", "afzpatel", "renjithravindrankannath")
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="e570996037ea42eeca4c9b8b0b77a202d40be1a16068a6245595c551d80bdcad")
|
||||
version("6.2.4", sha256="b8a72cb1ed4988b0569817c6387fb2faee4782795a0d8f49b827b32b52572cfd")
|
||||
version("6.2.1", sha256="9b062b1d6d945349c31828030c8c1d99fe57d14a1837196ff9aa67bf10ef43f1")
|
||||
version("6.2.0", sha256="aec9edc75ae4438aa712192c784e2bed683d2839b502b6aadb18f6012306749b")
|
||||
@ -38,13 +39,19 @@ class Hipblaslt(CMakePackage):
|
||||
)
|
||||
variant("asan", default=False, description="Build with address-sanitizer enabled or disabled")
|
||||
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hipblas@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"@{ver}")
|
||||
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
depends_on(f"hipblas@{ver}", when=f"@{ver}")
|
||||
|
||||
depends_on("hipblas-common@6.3.0", when="@6.3.0")
|
||||
depends_on("rocm-smi-lib@6.3.0", when="@6.3.0")
|
||||
|
||||
depends_on("msgpack-c")
|
||||
depends_on("py-joblib")
|
||||
depends_on("py-joblib", type=("build", "link"))
|
||||
depends_on("googletest@1.10.0:", type="test")
|
||||
depends_on("netlib-lapack@3.7.1:", type="test")
|
||||
depends_on("py-pyyaml", type="test")
|
||||
@ -55,9 +62,38 @@ class Hipblaslt(CMakePackage):
|
||||
# Below patch sets the proper path for clang++ and clang-offload-blunder.
|
||||
# Also adds hipblas and msgpack include directories for 6.1.0 release.
|
||||
patch("0001-Set-LLVM_Path-Add-Hiblas-Include-to-CmakeLists-6.1.Patch", when="@6.1:6.2")
|
||||
patch("0001-Set-LLVM-Path-6.3.Patch", when="@6.3:")
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
env.set("CXX", self.spec["hip"].hipcc)
|
||||
if self.spec.satisfies("@6.3.0:"):
|
||||
env.set(
|
||||
"TENSILE_ROCM_ASSEMBLER_PATH", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang++"
|
||||
)
|
||||
env.set(
|
||||
"TENSILE_ROCM_OFFLOAD_BUNDLER_PATH",
|
||||
f"{self.spec['llvm-amdgpu'].prefix}/bin/clang-offload-bundler",
|
||||
)
|
||||
env.set("ROCM_SMI_PATH", f"{self.spec['rocm-smi-lib'].prefix}/bin/rocm-smi")
|
||||
env.set(
|
||||
"ROCM_AGENT_ENUMERATOR_PATH",
|
||||
f"{self.spec['rocminfo'].prefix}/bin/rocm_agent_enumerator",
|
||||
)
|
||||
|
||||
def patch(self):
|
||||
if self.spec.satisfies("@6.3:"):
|
||||
filter_file(
|
||||
"${rocm_path}/llvm/bin",
|
||||
self.spec["llvm-amdgpu"].prefix.bin,
|
||||
"tensilelite/Tensile/Ops/gen_assembly.sh",
|
||||
string=True,
|
||||
)
|
||||
filter_file(
|
||||
"${rocm_path}/bin/amdclang++",
|
||||
f'{self.spec["llvm-amdgpu"].prefix}/bin/amdclang++',
|
||||
"library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh",
|
||||
string=True,
|
||||
)
|
||||
|
||||
def cmake_args(self):
|
||||
args = [
|
||||
|
||||
@ -24,6 +24,7 @@ def url_for_version(self, version):
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c")
|
||||
version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528")
|
||||
version("6.2.1", sha256="4840f109d8f267c28597e936c869c358de56b8ad6c3ed4881387cf531846e5a7")
|
||||
version("6.2.0", sha256="12ce17dc920ec6dac0c5484159b3eec00276e4a5b301ab1250488db3b2852200")
|
||||
@ -57,7 +58,7 @@ def patch(self):
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
with working_dir("bin"):
|
||||
filter_shebang("hipconfig")
|
||||
else:
|
||||
elif self.spec.satisfies("@:6.2"):
|
||||
with working_dir("amd/hipcc/bin"):
|
||||
filter_shebang("hipconfig")
|
||||
|
||||
|
||||
@ -17,7 +17,8 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
license("BSD-3-Clause")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
version("6.3.0", sha256="a609cde18cefa90a1970049cc5630f2ec263f12961aa85993897580da2ca0456")
|
||||
version("6.2.4", sha256="06f3655b110d3d2e2ecf0aca052d3ba3f2ef012c069e5d2d82f2b75d50555f46")
|
||||
version("6.2.1", sha256="e0203e72afac4da19cb1d62896fff404ec44517141b420bd38f6e962e52ef6fd")
|
||||
version("6.2.0", sha256="8dda8b77740e722fd4cf7223476313fc873bad75d50e6cb86ff284a91d76752d")
|
||||
@ -81,6 +82,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocprim@{ver}", when=f"+rocm @{ver}")
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
|
||||
@ -20,11 +20,12 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
|
||||
url = "https://github.com/ROCm/hipfft/archive/rocm-6.1.0.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("renjithravindrankannath", "srekolam")
|
||||
maintainers("renjithravindrankannath", "srekolam", "afzpatel")
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="08a0c800f531247281b4dbe8de9567a6fde4f432829a451a720d0b0a3c711059")
|
||||
version("6.2.4", sha256="308b81230498b01046f7fc3299a9e9c2c5456d80fd71a94f490ad97f51ed9de8")
|
||||
version("6.2.1", sha256="5f668fa8b5ed10d47d164d887699d3c14d900d78f6a31bf953f8fbbc08bc5fd1")
|
||||
version("6.2.0", sha256="8d19aebb1bbfea1f235ca08d34393ce39bea35dc9cbfa72a3cf7cdf1c56410e7")
|
||||
@ -88,6 +89,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
|
||||
@ -16,7 +16,8 @@ class Hipfort(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
|
||||
version("6.3.0", sha256="9e7f4420c75430cdb9046c0c4dbe656f22128b0672b2e261d50a6e92e47cc6d3")
|
||||
version("6.2.4", sha256="32daa4ee52c2d44790bff7a7ddde9d572e4785b2f54766a5e45d10228da0534b")
|
||||
version("6.2.1", sha256="5258f2dd63aeebe29ce566e654c47b8e2e1f5eb8ca3da92af09c54517b259f32")
|
||||
version("6.2.0", sha256="7f6db61a0ac7771e5c4604a6113b36736f6c7f05cabd7e1df8e832c98b87311d")
|
||||
@ -65,6 +66,7 @@ class Hipfort(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", type="build", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -15,11 +15,12 @@ class HipifyClang(CMakePackage):
|
||||
url = "https://github.com/ROCm/HIPIFY/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="9fced04f9e36350bdbabd730c446b55a898e2f4ba82078855bcf5dea3b5e8dc8")
|
||||
version("6.2.4", sha256="981af55ab4243f084b3e75007e827f7c94ac317fa84fe08d59c5872124a7d3c7")
|
||||
version("6.2.1", sha256="db5680d677222596cf9edfb84ae96b37db829a40a2e0243d26ff24a16e03ff74")
|
||||
version("6.2.0", sha256="11bfbde7c40e5cd5de02a47ec30dc6df4b233a12126bf7ee449432a30a3e6e1e")
|
||||
@ -51,7 +52,7 @@ class HipifyClang(CMakePackage):
|
||||
patch("0001-install-hipify-clang-in-bin-dir-and-llvm-clangs-head.patch", when="@5.1.0:5.5")
|
||||
patch("0002-install-hipify-clang-in-bin-dir-and-llvm-clangs-head.patch", when="@5.6:6.0")
|
||||
patch("0003-install-hipify-clang-in-bin-dir-and-llvm-clangs-head.patch", when="@6.1")
|
||||
patch("0001-use-source-permission-for-hipify-perl.patch", when="@6.2")
|
||||
patch("0001-use-source-permission-for-hipify-perl.patch", when="@6.2:")
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
for ver in [
|
||||
@ -73,6 +74,7 @@ class HipifyClang(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
@ -92,6 +94,7 @@ class HipifyClang(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -18,13 +18,14 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
|
||||
url = "https://github.com/ROCm/hipRAND/archive/rocm-6.1.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["libhiprand"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="7464c1e48f4e1a97a5e5978146641971d068886038810876b60acb5dfb6c4d39")
|
||||
version("6.2.4", sha256="b6010f5e0c63a139acd92197cc1c0d64a428f7a0ad661bce0cd1e553ad6fd6eb")
|
||||
version("6.2.1", sha256="0d4585b8adbc299f3fdc2c74bb20ffd4285027b861a759c3e62ce564589465da")
|
||||
version("6.2.0", sha256="daaf32506eaaf3c3b715ed631387c27992cfe0d938353a88ad6acedc735eb54b")
|
||||
@ -100,6 +101,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
|
||||
@ -23,13 +23,14 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
url = "https://github.com/ROCm/hipSOLVER/archive/rocm-6.1.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["libhipsolver"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="a0443f0b894cedd5af59af4fadcb3c38daa728ca32c13b9741fb19e2d828a089")
|
||||
version("6.2.4", sha256="4dc564498361cb1bac17dcfeaf0f2b9c85320797c75b05ee33160a133f5f4a15")
|
||||
version("6.2.1", sha256="614e3c0bc11bfa84acd81d46db63f3852a750adaaec094b7701ab7b996cc8e93")
|
||||
version("6.2.0", sha256="637577a9cc38e4865894dbcd7eb35050e3de5d45e6db03472e836b318602a84d")
|
||||
@ -106,6 +107,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
@ -119,7 +121,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
depends_on("googletest@1.10.0:", type="test")
|
||||
depends_on("netlib-lapack@3.7.1:", type="test")
|
||||
patch("001-suite-sparse-include-path.patch", when="@6.1.0")
|
||||
patch("0001-suite-sparse-include-path-6.1.1.patch", when="@6.1.1:")
|
||||
patch("0001-suite-sparse-include-path-6.1.1.patch", when="@6.1.1:6.2")
|
||||
|
||||
def check(self):
|
||||
exe = join_path(self.build_directory, "clients", "staging", "hipsolver-test")
|
||||
|
||||
@ -18,10 +18,11 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
|
||||
url = "https://github.com/ROCm/hipSPARSE/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["libhipsparse"]
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="550fd5a480490e631507e8c34b2b0cf9cbc2ad2a5bf84e8ea0a8fad96eecb25a")
|
||||
version("6.2.4", sha256="0ecc0ff1eeb99e9a9ac419e49e9be9ec4cd23a117d819710114ee2f35aefe88b")
|
||||
version("6.2.1", sha256="5a3241c857f705b1e5c64b3f5163575726e64a8d19f3957f7326622fda277710")
|
||||
version("6.2.0", sha256="e51b9871d764763519c14be2ec52c1e1ae3959b439afb4be6518b9f9a6f0ebaf")
|
||||
@ -67,6 +68,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
depends_on("git", type="build")
|
||||
depends_on("googletest", when="@6.3:")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
@ -87,6 +89,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"rocsparse@{ver}", when=f"+rocm @{ver}")
|
||||
|
||||
@ -20,10 +20,11 @@ class HsaRocrDev(CMakePackage):
|
||||
url = "https://github.com/ROCm/ROCR-Runtime/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["libhsa-runtime64"]
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="8fd6bcd6a5afd0ae5a59e33b786a525f575183d38c34049c2dab6b9270a1ca3b")
|
||||
version("6.2.4", sha256="b7aa0055855398d1228c39a6f4feb7d7be921af4f43d82855faf0b531394bb9b")
|
||||
version("6.2.1", sha256="dbe477b323df636f5e3221471780da156c938ec00dda4b50639aa8d7fb9248f4")
|
||||
version("6.2.0", sha256="c98090041fa56ca4a260709876e2666f85ab7464db9454b177a189e1f52e0b1a")
|
||||
@ -60,6 +61,7 @@ class HsaRocrDev(CMakePackage):
|
||||
depends_on("elf", type="link")
|
||||
depends_on("numactl")
|
||||
depends_on("pkgconfig")
|
||||
depends_on("libdrm", when="@6.3:")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
@ -80,9 +82,31 @@ class HsaRocrDev(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
# allow standalone rocm-device-libs (useful for aomp)
|
||||
depends_on(f"rocm-device-libs@{ver}", when=f"@{ver} ^llvm-amdgpu ~rocm-device-libs")
|
||||
@ -102,12 +126,18 @@ class HsaRocrDev(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
patch("0002-Remove-explicit-RPATH-again.patch", when="@3.7.0:5.6")
|
||||
|
||||
root_cmakelists_dir = "src"
|
||||
@property
|
||||
def root_cmakelists_dir(self):
|
||||
if self.spec.satisfies("@6.3:"):
|
||||
return "."
|
||||
else:
|
||||
return "src"
|
||||
|
||||
@classmethod
|
||||
def determine_version(cls, lib):
|
||||
|
||||
@ -25,6 +25,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage):
|
||||
license("Apache-2.0")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c")
|
||||
version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528")
|
||||
version("6.2.1", sha256="4840f109d8f267c28597e936c869c358de56b8ad6c3ed4881387cf531846e5a7")
|
||||
version("6.2.0", sha256="12ce17dc920ec6dac0c5484159b3eec00276e4a5b301ab1250488db3b2852200")
|
||||
@ -159,6 +160,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage):
|
||||
when="@master +rocm-device-libs",
|
||||
)
|
||||
for d_version, d_shasum in [
|
||||
("6.3.0", "8fd6bcd6a5afd0ae5a59e33b786a525f575183d38c34049c2dab6b9270a1ca3b"),
|
||||
("6.2.4", "b7aa0055855398d1228c39a6f4feb7d7be921af4f43d82855faf0b531394bb9b"),
|
||||
("6.2.1", "dbe477b323df636f5e3221471780da156c938ec00dda4b50639aa8d7fb9248f4"),
|
||||
("6.2.0", "c98090041fa56ca4a260709876e2666f85ab7464db9454b177a189e1f52e0b1a"),
|
||||
@ -268,8 +270,13 @@ def cmake_args(self):
|
||||
comgrinc_path = os.path.join(self.stage.source_path, "comgr/lib/comgr/include")
|
||||
elif self.spec.satisfies("@6.1:"):
|
||||
comgrinc_path = os.path.join(self.stage.source_path, "amd/comgr/include")
|
||||
if self.spec.satisfies("@5.6.0:"):
|
||||
if self.spec.satisfies("@5.6.0:6.2"):
|
||||
hsainc_path = os.path.join(self.stage.source_path, "hsa-runtime/src/inc")
|
||||
if self.spec.satisfies("@6.3:"):
|
||||
hsainc_path = os.path.join(
|
||||
self.stage.source_path, "hsa-runtime/runtime/hsa-runtime/inc"
|
||||
)
|
||||
if self.spec.satisfies("@5.6.0:"):
|
||||
args.append("-DSANITIZER_HSA_INCLUDE_PATH={0}".format(hsainc_path))
|
||||
args.append("-DSANITIZER_COMGR_INCLUDE_PATH={0}".format(comgrinc_path))
|
||||
args.append("-DSANITIZER_AMDGPU:Bool=ON")
|
||||
|
||||
@ -16,10 +16,11 @@ class Migraphx(CMakePackage):
|
||||
url = "https://github.com/ROCm/AMDMIGraphX/archive/rocm-6.1.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["libmigraphx"]
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="21550e5cecf1b26c02e1c4633c7c4c6eb5e37be8758d7a2641f10cfdf4203636")
|
||||
version("6.2.4", sha256="849cca3c7c98dc437e42ac17013f86ef0a5fd202cb87b7822778bd9a8f93d293")
|
||||
version("6.2.1", sha256="a9479fd6846bae4a888f712c2fecee6a252951ae8979d9990b100450e4cd6c30")
|
||||
version("6.2.0", sha256="7b36c1a0c44dd21f31ce6c9c4e7472923281aa7fdc693e75edd2670b101a6d48")
|
||||
@ -75,7 +76,9 @@ class Migraphx(CMakePackage):
|
||||
depends_on("nlohmann-json", type="link")
|
||||
depends_on("msgpack-c", type="link")
|
||||
depends_on("half@1.12.0", type="link", when="@:5.5")
|
||||
depends_on("half@2:", when="@5.6:")
|
||||
# miopen-hip@6.3 requires half@1
|
||||
depends_on("half@2:", when="@5.6:6.2")
|
||||
depends_on("half")
|
||||
depends_on("python@3.5:", type="build")
|
||||
depends_on("py-pybind11@2.6:", type="build", when="@4.1.0:")
|
||||
depends_on("pkgconfig", type="build", when="@5.3.0:")
|
||||
@ -100,6 +103,7 @@ class Migraphx(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -107,7 +111,7 @@ class Migraphx(CMakePackage):
|
||||
depends_on(f"rocblas@{ver}", when=f"@{ver}")
|
||||
depends_on(f"miopen-hip@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"rocmlir@{ver}", when=f"@{ver}")
|
||||
|
||||
@property
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
|
||||
index 60d6fe6..bba3ad6 100644
|
||||
--- a/driver/CMakeLists.txt
|
||||
+++ b/driver/CMakeLists.txt
|
||||
@@ -71,7 +71,11 @@ if(WIN32)
|
||||
endif()
|
||||
add_dependencies(MIOpenDriver generate_kernels)
|
||||
target_include_directories(MIOpenDriver PRIVATE ../src/kernels)
|
||||
-target_link_libraries(MIOpenDriver MIOpen Threads::Threads roc::rocrand)
|
||||
+target_link_libraries(MIOpenDriver MIOpen Threads::Threads roc::rocrand roc::hipblas roc::hipblaslt)
|
||||
+if(MIOPEN_USE_ROCTRACER)
|
||||
+ target_include_directories(MIOpenDriver PRIVATE ${ROCTRACER_INCLUDE_DIR})
|
||||
+ target_link_libraries(MIOpenDriver ${rocTracer})
|
||||
+endif()
|
||||
if(NOT MIOPEN_EMBED_DB STREQUAL "")
|
||||
target_link_libraries(MIOpenDriver $<BUILD_INTERFACE:miopen_data> )
|
||||
endif()
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 92e4f42..7e169a1 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -940,6 +940,13 @@ if(hipblaslt_FOUND)
|
||||
target_link_libraries( MIOpen PRIVATE roc::hipblaslt )
|
||||
endif()
|
||||
|
||||
+if(hipblas_FOUND)
|
||||
+ target_link_libraries( MIOpen PRIVATE roc::hipblas )
|
||||
+endif()
|
||||
+if(rocrand_FOUND)
|
||||
+ target_link_libraries( MIOpen PRIVATE roc::rocrand )
|
||||
+endif()
|
||||
+
|
||||
# For backward compatibility with ROCm 5.3
|
||||
# Build with library libMLIRMIOpen
|
||||
if(LIBMLIRMIOPEN)
|
||||
@@ -994,7 +1001,8 @@ if(NOT WIN32 AND NOT APPLE)
|
||||
endif()
|
||||
|
||||
if(MIOPEN_USE_ROCTRACER)
|
||||
- target_link_libraries(MIOpen PRIVATE roctx64)
|
||||
+ target_include_directories(MIOpen PRIVATE ${ROCTRACER_INCLUDE_DIR})
|
||||
+ target_link_libraries(MIOpen PRIVATE ${rocTracer})
|
||||
endif()
|
||||
|
||||
############################################################
|
||||
@ -17,11 +17,12 @@ class MiopenHip(CMakePackage):
|
||||
url = "https://github.com/ROCm/MIOpen/archive/rocm-6.1.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["libMIOpen"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.3.0", sha256="171834978d6316a5ec7607d4b10c7c69e5bfe9064edae8bdb9b207e578b41c1d")
|
||||
version("6.2.4", sha256="8e4836e007e5e66fa487288887a098aaeeb95f3c63a19c2b91f6e848c023a040")
|
||||
version("6.2.1", sha256="c7abe5ae7a332813a3c3da849e9a50b91221fe05c6bb622413e5b048b1f15982")
|
||||
version("6.2.0", sha256="f4473f724362732019d505a0e01c17b060b542350859cb1e4bd4e3898b609276")
|
||||
@ -61,13 +62,14 @@ class MiopenHip(CMakePackage):
|
||||
depends_on("boost@1.67.0:1.73.0")
|
||||
depends_on("bzip2")
|
||||
depends_on("sqlite")
|
||||
depends_on("half")
|
||||
depends_on("half@1")
|
||||
depends_on("zlib-api")
|
||||
|
||||
patch("miopen-hip-include-nlohmann-include-directory.patch", when="@5.4.0:5.7")
|
||||
patch("0002-add-include-dir-miopen-hip-6.0.0.patch", when="@6.0")
|
||||
patch("0001-link-with-roctracer-when-building-miopendriver-6.1.0.patch", when="@6.1")
|
||||
patch("0001-link-with-roctracer-when-building-miopendriver-6.2.0.patch", when="@6.2:")
|
||||
patch("0001-link-with-roctracer-when-building-miopendriver-6.2.0.patch", when="@6.2")
|
||||
patch("0003-link-with-hipblas-roctracer-rocrand-6.3.0.patch", when="@6.3")
|
||||
patch(
|
||||
"https://github.com/ROCm/MIOpen/commit/f60aa1ff89f8fb596b4a6a4c70aa7d557803db87.patch?full_index=1",
|
||||
sha256="7f382c872d89f22da1ad499e85ffe9881cc7404c8465e42877a210a09382e2ea",
|
||||
@ -93,6 +95,7 @@ class MiopenHip(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -134,18 +137,21 @@ class MiopenHip(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on("nlohmann-json", type="link")
|
||||
depends_on(f"composable-kernel@{ver}", when=f"@{ver}")
|
||||
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", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
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"]:
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"rocrand@{ver}", when=f"@{ver}")
|
||||
depends_on("hipblas@6.3.0", when="@6.3.0")
|
||||
depends_on("hipblaslt@6.3.0", when="@6.3.0")
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
lib_dir = self.spec["zlib-api"].libs.directories[0]
|
||||
|
||||
@ -27,6 +27,7 @@ def url_for_version(self, version):
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.3.0", sha256="bc16881eae11140025b8fbd00bc741763548d41345dbe954c8d8659f4dccfe9e")
|
||||
version("6.2.4", sha256="7e65dc83f1b85e089c1218dff57211e64f3586bcb4415bda4798e4a434cba216")
|
||||
version("6.2.1", sha256="591fe23ee1e2ab49f29aeeb835b5045e4ba00165c604ddfaa26bd8eb56cb367d")
|
||||
version("6.2.0", sha256="ce28ac3aef76f28869c4dad9ffd9ef090e0b54ac58088f1f1eef803641125b51")
|
||||
@ -228,6 +229,7 @@ def patch(self):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"miopen-hip@{ver}", when=f"@{ver}")
|
||||
for ver in [
|
||||
@ -248,6 +250,7 @@ def patch(self):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"migraphx@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -267,6 +270,7 @@ def patch(self):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
depends_on("python@3.5:", type="build")
|
||||
@ -282,6 +286,7 @@ def patch(self):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rpp@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -19,6 +19,7 @@ class Omniperf(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.3.0", sha256="f8e9703b5f78abba6f4a61f69ffc73225d1bb47b591cf33a26ed98060efd65d1")
|
||||
version("6.2.4", sha256="2230260fce0838583899f4969b936ca047b30985a0fffad276ea353232538770")
|
||||
version("6.2.1", sha256="56b795d471adad8ee9d7025544269e23929da31524d73db6f54396d3aca1445a")
|
||||
version("6.2.0", sha256="febe9011e0628ad62367fdc6c81bdb0ad4ed45803f79c794757ecea8bcfab58c")
|
||||
@ -29,7 +30,8 @@ class Omniperf(CMakePackage):
|
||||
depends_on("py-colorlover", type=("build", "run"))
|
||||
depends_on("py-pyyaml")
|
||||
depends_on("py-matplotlib")
|
||||
depends_on("py-pandas")
|
||||
depends_on("py-pandas@1.4.3:")
|
||||
depends_on("py-numpy@1.17.5")
|
||||
depends_on("py-pymongo")
|
||||
depends_on("py-tabulate")
|
||||
depends_on("py-tqdm")
|
||||
@ -39,13 +41,10 @@ class Omniperf(CMakePackage):
|
||||
depends_on("py-dash", type=("build", "run"))
|
||||
depends_on("py-dash-bootstrap-components", type=("build", "run"))
|
||||
|
||||
# VERSION.sha is not in the auto-generated ROCm release tarball
|
||||
patch("0001-remove-VERSION.sha-install.patch")
|
||||
|
||||
def cmake_args(self):
|
||||
args = [self.define("ENABLE_TESTS", self.run_tests)]
|
||||
return args
|
||||
|
||||
@run_after("install")
|
||||
def after_install(self):
|
||||
touch(join_path(self.spec.prefix.libexec.omniperf, "VERSION.sha"))
|
||||
@run_before("cmake")
|
||||
def before_cmake(self):
|
||||
touch(join_path(self.stage.source_path, "VERSION.sha"))
|
||||
|
||||
@ -13,13 +13,21 @@ class Omnitrace(CMakePackage):
|
||||
|
||||
homepage = "https://rocm.docs.amd.com/projects/omnitrace/en/latest/index.html"
|
||||
git = "https://github.com/ROCm/omnitrace.git"
|
||||
url = "https://github.com/ROCm/omnitrace/archive/refs/tags/rocm-6.2.0.tar.gz"
|
||||
url = "https://github.com/ROCm/rocprofiler-systems/archive/refs/tags/rocm-6.3.0.tar.gz"
|
||||
|
||||
maintainers("dgaliffiAMD", "afzpatel", "srekolam", "renjithravindrankannath", "jrmadsen")
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("amd-mainline", branch="amd-mainline", submodules=True)
|
||||
version("amd-staging", branch="amd-staging", submodules=True)
|
||||
version(
|
||||
"rocm-6.3.0",
|
||||
git="https://github.com/ROCm/rocprofiler-systems",
|
||||
tag="rocm-6.3.0",
|
||||
commit="71a5e271b5e07efd2948fb6e7b451db5e8e40cb8",
|
||||
submodules=True,
|
||||
)
|
||||
version(
|
||||
"1.12.0", tag="v1.12.0", commit="abff23ac4238da6d7891d9ac9f36a919e30bf759", submodules=True
|
||||
)
|
||||
@ -133,7 +141,7 @@ class Omnitrace(CMakePackage):
|
||||
depends_on("roctracer-dev@5", when="@1:1.10 +rocm")
|
||||
depends_on("rocprofiler-dev@5", when="@1.3.0:1.10 +rocm")
|
||||
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"rocm-smi-lib@{ver}", when=f"@rocm-{ver} +rocm")
|
||||
depends_on(f"hip@{ver}", when=f"@rocm-{ver} +rocm")
|
||||
depends_on(f"roctracer-dev@{ver}", when=f"@rocm-{ver} +rocm")
|
||||
@ -148,6 +156,9 @@ class Omnitrace(CMakePackage):
|
||||
depends_on("m4", when="@1.8:,rocm-6.2:0 +rocm")
|
||||
depends_on("texinfo", when="@1.8:,rocm-6.2:0 +rocm")
|
||||
depends_on("libunwind", when="@1.8:,rocm-6.2:0 +rocm")
|
||||
depends_on("autoconf", when="@rocm-6.3:0 +rocm")
|
||||
depends_on("automake", when="@rocm-6.3:0 +rocm")
|
||||
depends_on("libtool", when="@rocm-6.3:0 +rocm")
|
||||
|
||||
def cmake_args(self):
|
||||
spec = self.spec
|
||||
|
||||
@ -22,5 +22,5 @@ class PyDash(PythonPackage):
|
||||
depends_on("py-setuptools", type="build")
|
||||
depends_on("py-typing-extensions")
|
||||
depends_on("py-flask")
|
||||
depends_on("py-plotly")
|
||||
depends_on("py-plotly@5")
|
||||
depends_on("py-importlib-metadata")
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 966c5cc..4ed09e8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -166,7 +166,7 @@ message(STATUS "${COMPILER_EXE_NAME} HIP version: ${hip_version_string}")
|
||||
|
||||
## Check for ROCm version
|
||||
execute_process(
|
||||
- COMMAND bash "-c" "cat ${ROCM_PATH}/.info/version"
|
||||
+ COMMAND bash "-c" "cat $ENV{ROCMCORE_PATH}/.info/version"
|
||||
OUTPUT_VARIABLE rocm_version_string
|
||||
)
|
||||
string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" rocm_version_matches ${rocm_version_string})
|
||||
@@ -645,6 +645,7 @@ target_include_directories(rccl PRIVATE ${HIPIFY_DIR}/src/device/network/unpack)
|
||||
target_include_directories(rccl PRIVATE ${HIPIFY_DIR}/gensrc)
|
||||
target_include_directories(rccl PRIVATE ${HSA_INCLUDE_PATH})
|
||||
target_include_directories(rccl PRIVATE ${ROCM_SMI_INCLUDE_DIR})
|
||||
+target_include_directories(rccl PRIVATE $ENV{ROCMCORE_PATH}/include)
|
||||
if(DEMANGLE_DIR)
|
||||
target_include_directories(rccl PRIVATE ${DEMANGLE_DIR})
|
||||
endif()
|
||||
@ -19,8 +19,14 @@ class Rccl(CMakePackage):
|
||||
url = "https://github.com/ROCm/rccl/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["librccl"]
|
||||
version(
|
||||
"6.3.0",
|
||||
tag="rocm-6.3.0",
|
||||
commit="eef7b2918cef592a18b6e59859558e6a3f0f0614",
|
||||
submodules=True,
|
||||
)
|
||||
version("6.2.4", sha256="12a04743ed89a74b4a08aa046b6a549d385e15d6866042fd41eac8f085f50eea")
|
||||
version("6.2.1", sha256="0f5e35c7afbb21c1d49ff201b7d1ddf163d853c27c75c3eaf7b449f4dc1e2188")
|
||||
version("6.2.0", sha256="a29c94ea3b9c1a0121d7b1450cb01a697f9f9132169632312b9b0bf744d3c0e3")
|
||||
@ -54,7 +60,8 @@ class Rccl(CMakePackage):
|
||||
)
|
||||
|
||||
patch("0003-Fix-numactl-rocm-smi-path-issue.patch", when="@5.2.3:5.6")
|
||||
patch("0004-Set-rocm-core-path-for-version-file.patch", when="@6.0:")
|
||||
patch("0004-Set-rocm-core-path-for-version-file.patch", when="@6.0:6.2")
|
||||
patch("0004-Set-rocm-core-path-for-version-file-6.3.patch", when="@6.3")
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
depends_on("chrpath", when="@5.3.0:5", type="build")
|
||||
@ -79,6 +86,7 @@ class Rccl(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -100,6 +108,7 @@ class Rccl(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -124,6 +133,7 @@ def cmake_args(self):
|
||||
args = [
|
||||
self.define("NUMACTL_DIR", self.spec["numactl"].prefix),
|
||||
self.define("ROCM_SMI_DIR", self.spec["rocm-smi-lib"].prefix),
|
||||
self.define("ROCM_PATH", self.spec["hip"].prefix),
|
||||
]
|
||||
if "auto" not in self.spec.variants["amdgpu_target"]:
|
||||
args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target"))
|
||||
|
||||
@ -16,7 +16,7 @@ class Rdc(CMakePackage):
|
||||
url = "https://github.com/ROCm/rdc/archive/rocm-6.1.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["librdc"]
|
||||
|
||||
def url_for_version(self, version):
|
||||
@ -27,6 +27,7 @@ def url_for_version(self, version):
|
||||
return url.format(version)
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="419afd9c8e50a872fb0a922e29c8578664ed88e0b79bf558db0a1e864aa8fecf")
|
||||
version("6.2.4", sha256="cdebbc0c1a49f067fb8ff17bd91cd92f6f83b2aee142e5b576e5eb1742983a7f")
|
||||
version("6.2.1", sha256="63c0cffd772a43d0984505646023485ca2bc8512f5a87ece016f1d381cded075")
|
||||
version("6.2.0", sha256="dd12428426a4963d6eb3cfdd818acef7a3c4cddf32504df17f4c1004fa902bef")
|
||||
@ -77,6 +78,7 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-smi-lib@{ver}", type=("build", "link"), when=f"@{ver}")
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
@ -96,9 +98,10 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"amdsmi@{ver}", when=f"@{ver}")
|
||||
|
||||
def patch(self):
|
||||
|
||||
@ -17,6 +17,7 @@ class Rocal(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.3.0", sha256="162a0c15e6e7e09c0e13a9d01a493ba3199b77919addf396cd5d273ebf44d759")
|
||||
version("6.2.4", sha256="630813669e75a8ee179b89f489101931a26f7a7ee486fcbe1b0e3cb1803c582c")
|
||||
version("6.2.1", sha256="77d3e63e02afaee6f1ee1d877d88b48c6ea66a0afca96a1313d0f1c4f8e86b2a")
|
||||
version("6.2.0", sha256="c7c265375a40d4478a628258378726c252caac424f974456d488fce43890e157")
|
||||
@ -26,7 +27,7 @@ class Rocal(CMakePackage):
|
||||
depends_on("rapidjson")
|
||||
depends_on("ffmpeg@4.4:")
|
||||
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"mivisionx@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rpp@{ver}", when=f"@{ver}")
|
||||
@ -38,6 +39,12 @@ def patch(self):
|
||||
"rocAL/rocAL_hip/CMakeLists.txt",
|
||||
string=True,
|
||||
)
|
||||
filter_file(
|
||||
r"${ROCM_PATH}/lib/llvm/bin/clang++",
|
||||
"{0}/bin/clang++".format(self.spec["llvm-amdgpu"].prefix),
|
||||
"rocAL/rocAL_hip/CMakeLists.txt",
|
||||
string=True,
|
||||
)
|
||||
filter_file(
|
||||
r"${ROCM_PATH}/include/rocal",
|
||||
"{0}/include/rocal".format(self.spec.prefix),
|
||||
|
||||
@ -16,13 +16,14 @@ class Rocblas(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocBLAS/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["librocblas"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="051f53bb69a9aba55a0c66c32688bf6af80e29e4a6b56b380b3c427e7a6aff9d")
|
||||
version("6.2.4", sha256="8bacf74e3499c445f1bb0a8048df1ef3ce6f72388739b1823b5784fd1e8aa22a")
|
||||
version("6.2.1", sha256="cf3bd7b47694f95f387803191615e2ff5c1106175473be7a5b2e8eb6fb99179f")
|
||||
version("6.2.0", sha256="184e9b39dcbed57c25f351b047d44c613f8a2bbab3314a20c335f024a12ad4e5")
|
||||
@ -85,10 +86,11 @@ class Rocblas(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"@{ver}")
|
||||
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"rocm-smi-lib@{ver}", type="test", when=f"@{ver}")
|
||||
|
||||
depends_on("rocm-cmake@master", type="build", when="@master:")
|
||||
@ -112,12 +114,14 @@ class Rocblas(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", type="build", when=f"@{ver}")
|
||||
depends_on(f"rocminfo@{ver}", type="build", when=f"@{ver}")
|
||||
depends_on(f"rocm-cmake@{ver}", type="build", when=f"@{ver}")
|
||||
|
||||
depends_on("hipblaslt@6.3.0", when="@6.3.0")
|
||||
depends_on("python@3.6:", type="build")
|
||||
|
||||
with when("+tensile"):
|
||||
@ -151,6 +155,7 @@ class Rocblas(CMakePackage):
|
||||
("@6.2.0", "dbc2062dced66e4cbee8e0591d76e0a1588a4c70"),
|
||||
("@6.2.1", "dbc2062dced66e4cbee8e0591d76e0a1588a4c70"),
|
||||
("@6.2.4", "81ae9537671627fe541332c0a5d953bfd6af71d6"),
|
||||
("@6.3.0", "aca95d1743c243dd0dd0c8b924608bc915ce1ae7"),
|
||||
]:
|
||||
resource(
|
||||
name="Tensile",
|
||||
@ -216,9 +221,13 @@ def cmake_args(self):
|
||||
|
||||
if "+tensile" in self.spec:
|
||||
tensile_path = join_path(self.stage.source_path, "Tensile")
|
||||
if self.spec.satisfies("@:6.2"):
|
||||
tensile_compiler = "hipcc"
|
||||
else:
|
||||
tensile_compiler = "amdclang++"
|
||||
args += [
|
||||
self.define("Tensile_TEST_LOCAL_PATH", tensile_path),
|
||||
self.define("Tensile_COMPILER", "hipcc"),
|
||||
self.define("Tensile_COMPILER", tensile_compiler),
|
||||
self.define("Tensile_LOGIC", "asm_full"),
|
||||
self.define("BUILD_WITH_TENSILE_HOST", "@3.7.0:" in self.spec),
|
||||
self.define("Tensile_LIBRARY_FORMAT", "msgpack"),
|
||||
@ -245,7 +254,6 @@ def cmake_args(self):
|
||||
args.append(self.define("Tensile_CODE_OBJECT_VERSION", "V3"))
|
||||
else:
|
||||
args.append(self.define("Tensile_CODE_OBJECT_VERSION", "default"))
|
||||
|
||||
return args
|
||||
|
||||
@run_after("build")
|
||||
|
||||
@ -18,6 +18,7 @@ class Rocdecode(CMakePackage):
|
||||
maintainers("afzpatel", "srekolam", "renjithravindrankannath")
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="931f49ff86fa34929b03cec8e7becde78d0c49c1c3a23a13203fecd2b392b242")
|
||||
version("6.2.4", sha256="37aaa1299cfc517ddaf60b0e8a5cf06d672f59e8acc0da3862b40b810d4931cb")
|
||||
version("6.2.1", sha256="d4a636415d61fef94f97197cb9ebbff59e3a18dc4850612ee142e3e14a35e6d4")
|
||||
version("6.2.0", sha256="fe0d7c19a4e65b93405566511880b94f25ef68c830d0088f9458da9baea1d4f9")
|
||||
@ -36,7 +37,7 @@ class Rocdecode(CMakePackage):
|
||||
|
||||
depends_on("libva", type="build", when="@6.2:")
|
||||
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
|
||||
def patch(self):
|
||||
@ -46,9 +47,17 @@ def patch(self):
|
||||
"CMakeLists.txt",
|
||||
string=True,
|
||||
)
|
||||
filter_file(
|
||||
r"${ROCM_PATH}/lib/llvm/bin/clang++",
|
||||
"{0}/bin/clang++".format(self.spec["llvm-amdgpu"].prefix),
|
||||
"CMakeLists.txt",
|
||||
string=True,
|
||||
)
|
||||
|
||||
def cmake_args(self):
|
||||
args = []
|
||||
if "auto" not in self.spec.variants["amdgpu_target"]:
|
||||
args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target"))
|
||||
if self.spec.satisfies("@6.3.0:"):
|
||||
args.append(self.define("LIBVA_INCLUDE_DIR", self.spec["libva"].prefix.include))
|
||||
return args
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt
|
||||
index 4c96435..edf9691 100644
|
||||
--- a/clients/tests/CMakeLists.txt
|
||||
+++ b/clients/tests/CMakeLists.txt
|
||||
@@ -64,6 +64,10 @@ if( NOT hiprand_FOUND )
|
||||
find_package( hiprand REQUIRED )
|
||||
endif()
|
||||
|
||||
+if( NOT rocrand_FOUND )
|
||||
+ find_package( rocrand REQUIRED )
|
||||
+endif()
|
||||
+
|
||||
include( ROCMInstallTargets )
|
||||
|
||||
set( rocfft-test_source
|
||||
@@ -102,6 +106,7 @@ option( BUILD_FFTW "Download and build FFTW" OFF )
|
||||
# look for installed FFTW if we weren't asked to build it
|
||||
if( NOT BUILD_FFTW )
|
||||
find_package( FFTW 3.0 MODULE COMPONENTS FLOAT DOUBLE )
|
||||
+ set( FFTW_INCLUDES ${FFTW_INCLUDE_DIRS} )
|
||||
endif()
|
||||
|
||||
include( ExternalProject )
|
||||
@@ -171,6 +176,7 @@ endif()
|
||||
|
||||
set( rocfft-test_include_dirs
|
||||
$<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
|
||||
+ $<BUILD_INTERFACE:${rocrand_INCLUDE_DIRS}>
|
||||
$<BUILD_INTERFACE:${FFTW_INCLUDES}>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../library/src/include>
|
||||
${ROCM_CLANG_ROOT}/include
|
||||
@@ -212,6 +218,7 @@ target_link_libraries( rocfft-test
|
||||
hip::device
|
||||
roc::rocfft
|
||||
hip::hiprand
|
||||
+ roc::rocrand
|
||||
${ROCFFT_SQLITE_LIB}
|
||||
${rocfft-test_link_libs}
|
||||
)
|
||||
@ -16,11 +16,12 @@ class Rocfft(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocfft/archive/rocm-6.1.1.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["librocfft"]
|
||||
|
||||
license("MIT")
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="afc716c95d1c80097f7a965e0c3cf1fe246c9fdf10a8fd9a303202156bd3811d")
|
||||
version("6.2.4", sha256="8ddc4e779a84b73c21b054ae37fec69e5c2f248589c7fb1b84a2197baf6ce995")
|
||||
version("6.2.1", sha256="662d56cbc4c40a82e2f320bfc8e48a571a448e19c04a9ce30d3419b47fcf3574")
|
||||
version("6.2.0", sha256="c9886ec2c713c502dcde4f5fed3d6e1a7dd019023fb07e82d3b622e66c6f2c36")
|
||||
@ -94,6 +95,7 @@ class Rocfft(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -105,8 +107,10 @@ class Rocfft(CMakePackage):
|
||||
# This adds the include headers from the rocrand and fftw in the cmakelists.txt
|
||||
# issue is seen from 5.7.0 onwards
|
||||
patch(
|
||||
"0005-Fix-clients-tests-include-rocrand-fftw-include-dir-rocm-6.0.0.patch", when="@5.7.0:"
|
||||
"0005-Fix-clients-tests-include-rocrand-fftw-include-dir-rocm-6.0.0.patch",
|
||||
when="@5.7.0:6.2",
|
||||
)
|
||||
patch("0005-Fix-clients-tests-include-rocrand-fftw-include-dir-rocm-6.3.patch", when="@6.3")
|
||||
|
||||
# Set LD_LIBRARY_PATH for executing the binaries from build directoryfix missing type
|
||||
# https://github.com/ROCm/rocFFT/pull/449)
|
||||
|
||||
@ -15,9 +15,10 @@ class RocmBandwidthTest(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocm_bandwidth_test/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="6d1e444b962e7a40fb9f20c87631865d3e04e8c9027fd21b439bee9b62d0070c")
|
||||
version("6.2.4", sha256="4d25c62d81f60eba8042f57ca0905adc853a214333ffc70238d91e2f53606a79")
|
||||
version("6.2.1", sha256="042cfe3adc0f0ad0b8620e361b2846eb57c7b54837ed7a8c3a773e6fdc4e1af4")
|
||||
version("6.2.0", sha256="ca4caa4470c7ad0f1a4963072c1a25b0fd243844a72b26c83fcbca1e82091a41")
|
||||
@ -61,10 +62,32 @@ class RocmBandwidthTest(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.5.0",
|
||||
@ -81,6 +104,7 @@ class RocmBandwidthTest(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -16,11 +16,12 @@ class RocmCmake(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocm-cmake/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="45a1b96f85ae28a7f62895ddc4d6648500b883af250f52f6417bafb31b3cc75d")
|
||||
version("6.2.4", sha256="76bfac6fba31a9c4ec196d9b9b2d5ec51b8b68840b3fba8686aa42323d76a425")
|
||||
version("6.2.1", sha256="5ea05ad58186ac9bac40ab083c1e769a36ecaed950f82e88863169a25bc6ac8f")
|
||||
version("6.2.0", sha256="7b6aaa1bb616669636aa2cd5dbc7fdb7cd05642a8dcc61138e0efb7d0dc7e1a3")
|
||||
@ -60,6 +61,7 @@ class RocmCmake(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -16,10 +16,11 @@ class RocmCore(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocm-core/archive/refs/tags/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["librocm-core"]
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="4fa981335426195028dd6b3a05228a2ebe8e601023a1e99130bba1b14bf60178")
|
||||
version("6.2.4", sha256="46dcfb5d20d242cd0ce6d02ba64d92bdd3ea59c103cf47b665c7d7a4ea7dc7f1")
|
||||
version("6.2.1", sha256="35cb5f6dfb1847469930bf0fa0913499b6c3f59b2b573a9f598b0956104ba5e2")
|
||||
version("6.2.0", sha256="9bafaf801721e98b398624c8d2fa78618d297d6800f96113e26c275889205526")
|
||||
@ -43,7 +44,7 @@ class RocmCore(CMakePackage):
|
||||
|
||||
depends_on("cxx", type="build") # generated
|
||||
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on("llvm-amdgpu", when=f"@{ver}+asan")
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
|
||||
@ -25,6 +25,7 @@ class RocmDbgapi(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="amd-master")
|
||||
version("6.3.0", sha256="c46ca562fbbac8673c22ee5c92d62ddf6c7dfd7faceeb66d3876cde6beda8872")
|
||||
version("6.2.4", sha256="004e9ace3ead840e44f98fc033b621d5489a554965deecfdb7df768482068282")
|
||||
version("6.2.1", sha256="40064ca031e41ff3c87bfa31406b7192fa65709ab36734eddad87e0ecc01bb80")
|
||||
version("6.2.0", sha256="311811ce0970ee83206791c21d539f351ddeac56ce3ff7efbefc830038748c0c")
|
||||
@ -75,6 +76,7 @@ class RocmDbgapi(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", type="build", when=f"@{ver}")
|
||||
@ -95,6 +97,7 @@ class RocmDbgapi(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -16,8 +16,9 @@ class RocmDebugAgent(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocr_debug_agent/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["librocm-debug-agent"]
|
||||
version("6.3.0", sha256="c8c3461395b2fc1e136d61eb5a36ba9f3f751eb00cb9d830f498de2e5d4299d5")
|
||||
version("6.2.4", sha256="a4f213a9e28a1e82543135c0b6d16c5a252186f83fc842f980631943f7e11398")
|
||||
version("6.2.1", sha256="933223ff6e0aefb54917f4102ac6679dcd67e25ade4bce5e49f5212f45e3bae5")
|
||||
version("6.2.0", sha256="a4b839c47b8a1cd8d00c3577eeeea04d3661210eb8124e221d88bcbedc742363")
|
||||
@ -69,8 +70,30 @@ class RocmDebugAgent(CMakePackage):
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-dbgapi@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -88,6 +111,7 @@ class RocmDebugAgent(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -22,9 +22,10 @@ def url_for_version(self, version):
|
||||
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c")
|
||||
version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528")
|
||||
version("6.2.1", sha256="4840f109d8f267c28597e936c869c358de56b8ad6c3ed4881387cf531846e5a7")
|
||||
version("6.2.0", sha256="12ce17dc920ec6dac0c5484159b3eec00276e4a5b301ab1250488db3b2852200")
|
||||
@ -79,6 +80,7 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
@ -98,6 +100,7 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -18,6 +18,7 @@ class RocmGdb(AutotoolsPackage):
|
||||
license("LGPL-2.0-or-later")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("6.3.0", sha256="4a41ffbc4f7a5970181ee0aae07f0ea4cda278870cd60a562b25001f1365e29f")
|
||||
version("6.2.4", sha256="061d00f3d02ca64094008c5da185712712ccd3a922f6e126d5f203cdae2b9e04")
|
||||
version("6.2.1", sha256="bed312c3fbb9982166538036bb9fd4a75053117c65ba80e34dbdae629a8fe6e4")
|
||||
version("6.2.0", sha256="753fd4f34d49fb0297b01dca2dd7cdf12cd039caa622a5f2d153362d27a8659c")
|
||||
@ -74,6 +75,7 @@ class RocmGdb(AutotoolsPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-dbgapi@{ver}", type="link", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", type="link", when=f"@{ver}")
|
||||
@ -93,6 +95,7 @@ class RocmGdb(AutotoolsPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ class RocmOpencl(CMakePackage):
|
||||
git = "https://github.com/ROCm/ROCm-OpenCL-Runtime.git"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["libOpenCL"]
|
||||
|
||||
def url_for_version(self, version):
|
||||
@ -36,6 +36,7 @@ def url_for_version(self, version):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="main")
|
||||
version("6.3.0", sha256="829e61a5c54d0c8325d02b0191c0c8254b5740e63b8bfdb05eec9e03d48f7d2c")
|
||||
version("6.2.4", sha256="0a3164af7f997a4111ade634152957378861b95ee72d7060eb01c86c87208c54")
|
||||
version("6.2.1", sha256="e9cff3a8663defdbda833d49c9e7160171eca14dc285ffe4061378607d6c890d")
|
||||
version("6.2.0", sha256="620e4c6a7f05651cc7a170bc4700fef8cae002420307a667c638b981d00b25e8")
|
||||
@ -70,7 +71,7 @@ def url_for_version(self, version):
|
||||
depends_on("numactl", type="link")
|
||||
depends_on("libx11", when="+asan")
|
||||
depends_on("xproto", when="+asan")
|
||||
depends_on("opencl-icd-loader@2024.05.08", when="@6.2")
|
||||
depends_on("opencl-icd-loader@2024.05.08", when="@6.2:")
|
||||
|
||||
for d_version, d_shasum in [
|
||||
("5.6.1", "cc9a99c7e4de3d9360c0a471b27d626e84a39c9e60e0aff1e8e1500d82391819"),
|
||||
@ -126,12 +127,13 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"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", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"aqlprofile@{ver}", type="link", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
@ -149,6 +151,7 @@ def url_for_version(self, version):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -34,6 +34,7 @@
|
||||
"5f54d7c7c798bcf1cd47d3a7f17ceaf79991bf166cc5e47e5372a68e7cf7d520",
|
||||
"ac82e8da0c210ee14b911c833ae09a029a41541689930759737c135db52464a3",
|
||||
"ad5674b5626ed6720ca5f8772542e8ed3fb7a9150ed7a86a1adbcd70a2074e8e",
|
||||
"8c8240d948817ab1874eff0406d6053ee0518902427e0236e6b4d2cee84ff882",
|
||||
]
|
||||
|
||||
devlib = [
|
||||
@ -55,6 +56,7 @@
|
||||
"12ce17dc920ec6dac0c5484159b3eec00276e4a5b301ab1250488db3b2852200",
|
||||
"4840f109d8f267c28597e936c869c358de56b8ad6c3ed4881387cf531846e5a7",
|
||||
"7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528",
|
||||
"79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c",
|
||||
]
|
||||
|
||||
llvm = [
|
||||
@ -76,6 +78,7 @@
|
||||
"12ce17dc920ec6dac0c5484159b3eec00276e4a5b301ab1250488db3b2852200",
|
||||
"4840f109d8f267c28597e936c869c358de56b8ad6c3ed4881387cf531846e5a7",
|
||||
"7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528",
|
||||
"79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c",
|
||||
]
|
||||
|
||||
flang = [
|
||||
@ -97,6 +100,7 @@
|
||||
"6af7785b1776aeb9229ce4e5083dcfd451e8450f6e5ebe34214560b13f679d96",
|
||||
"409ee98bf15e51ac68b7ed351f4582930dfa0288de042006e17eea6b64df5ad6",
|
||||
"51c1308f324101e4b637e78cd2eb652e22f68f6d820991a76189c15131f971dc",
|
||||
"43f10662706dbf22b0090839fd590d9fc633e7339b19aaee7578322ea6809275",
|
||||
]
|
||||
|
||||
extras = [
|
||||
@ -118,6 +122,7 @@
|
||||
"7cef51c980f29d8b46d8d4b110e4f2f75d93544cf7d63c5e5d158cf531aeec7d",
|
||||
"4b0d250b5ebd997ed6d5d057689c3f67dfb4d82f09f582ebb439ca9134fae48d",
|
||||
"34c3506b0f6aefbf0bc7981ff2901b7a2df975a5b40c5eb078522499d81057f0",
|
||||
"22cdd87b1d66e7e7f9e30fd9031fcbf01ce0b631551959144bb42e7f1dba28cb",
|
||||
]
|
||||
|
||||
versions = [
|
||||
@ -139,6 +144,7 @@
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]
|
||||
versions_dict = dict() # type: Dict[str,Dict[str,str]]
|
||||
components = ["aomp", "devlib", "llvm", "flang", "extras"]
|
||||
@ -162,6 +168,7 @@ class RocmOpenmpExtras(Package):
|
||||
license("Apache-2.0")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "estewart08", "afzpatel")
|
||||
version("6.3.0", sha256=versions_dict["6.3.0"]["aomp"])
|
||||
version("6.2.4", sha256=versions_dict["6.2.4"]["aomp"])
|
||||
version("6.2.1", sha256=versions_dict["6.2.1"]["aomp"])
|
||||
version("6.2.0", sha256=versions_dict["6.2.0"]["aomp"])
|
||||
@ -213,6 +220,7 @@ class RocmOpenmpExtras(Package):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -275,6 +283,8 @@ class RocmOpenmpExtras(Package):
|
||||
)
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"comgr@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
@ -315,7 +325,7 @@ class RocmOpenmpExtras(Package):
|
||||
when="@6.1",
|
||||
)
|
||||
patch("0001-Avoid-duplicate-registration-on-cuda-env.patch", when="@6.1")
|
||||
patch("0001-Avoid-duplicate-registration-on-cuda-env-6.2.patch", when="@6.2")
|
||||
patch("0001-Avoid-duplicate-registration-on-cuda-env-6.2.patch", when="@6.2:")
|
||||
|
||||
def setup_run_environment(self, env):
|
||||
devlibs_prefix = self.spec["llvm-amdgpu"].prefix
|
||||
@ -481,7 +491,8 @@ def install(self, spec, prefix):
|
||||
else:
|
||||
devlibs_src = "{0}/rocm-openmp-extras/rocm-device-libs".format(src)
|
||||
hsa_prefix = self.spec["hsa-rocr-dev"].prefix
|
||||
hsakmt_prefix = self.spec["hsakmt-roct"].prefix
|
||||
if self.spec.satisfies("@:6.2"):
|
||||
hsakmt_prefix = self.spec["hsakmt-roct"].prefix
|
||||
if self.spec.satisfies("@5.7:6.1"):
|
||||
libdrm_prefix = self.spec["libdrm"].prefix
|
||||
numactl_prefix = self.spec["numactl"].prefix
|
||||
@ -514,9 +525,10 @@ def install(self, spec, prefix):
|
||||
os.unlink(os.path.join(lib_dir, "libdevice"))
|
||||
if os.path.islink((os.path.join(llvm_prefix, "lib-debug"))):
|
||||
os.unlink(os.path.join(llvm_prefix, "lib-debug"))
|
||||
|
||||
os.symlink(os.path.join(omp_bin_dir, "flang1"), os.path.join(bin_dir, "flang1"))
|
||||
os.symlink(os.path.join(omp_bin_dir, "flang2"), os.path.join(bin_dir, "flang2"))
|
||||
if not os.path.exists(os.path.join(bin_dir, "flang1")):
|
||||
os.symlink(os.path.join(omp_bin_dir, "flang1"), os.path.join(bin_dir, "flang1"))
|
||||
if not os.path.exists(os.path.join(bin_dir, "flang2")):
|
||||
os.symlink(os.path.join(omp_bin_dir, "flang2"), os.path.join(bin_dir, "flang2"))
|
||||
|
||||
if self.spec.version >= Version("6.1.0"):
|
||||
os.symlink(
|
||||
@ -560,8 +572,6 @@ def install(self, spec, prefix):
|
||||
"-DLIBOMPTARGET_AMDGCN_GFXLIST={0}".format(gfx_list),
|
||||
"-DLIBOMP_COPY_EXPORTS=OFF",
|
||||
"-DHSA_LIB={0}/lib".format(hsa_prefix),
|
||||
"-DHSAKMT_LIB={0}/lib".format(hsakmt_prefix),
|
||||
"-DHSAKMT_LIB64={0}/lib64".format(hsakmt_prefix),
|
||||
"-DCOMGR_INCLUDE={0}/include".format(comgr_prefix),
|
||||
"-DCOMGR_LIB={0}/lib".format(comgr_prefix),
|
||||
"-DOPENMP_ENABLE_LIBOMPTARGET=1",
|
||||
@ -572,6 +582,7 @@ def install(self, spec, prefix):
|
||||
"-DCMAKE_CXX_FLAGS=-isystem{0} -I{1}".format(elfutils_inc, ffi_inc),
|
||||
"-DNEW_BC_PATH=1",
|
||||
"-DHSA_INCLUDE={0}/include/hsa".format(hsa_prefix),
|
||||
"-DLIBOMPTARGET_ENABLE_DEBUG=ON",
|
||||
]
|
||||
if self.spec.satisfies("@5.7:6.1"):
|
||||
openmp_common_args += [
|
||||
@ -579,9 +590,9 @@ def install(self, spec, prefix):
|
||||
"-DHSAKMT_INC_PATH={0}/include".format(hsakmt_prefix),
|
||||
"-DNUMACTL_DIR={0}".format(numactl_prefix),
|
||||
]
|
||||
|
||||
if self.spec.satisfies("@5.3.0:"):
|
||||
openmp_common_args += ["-DLIBOMPTARGET_ENABLE_DEBUG=ON"]
|
||||
if self.spec.satisfies("@:6.2"):
|
||||
"-DHSAKMT_LIB={0}/lib".format(hsakmt_prefix),
|
||||
"-DHSAKMT_LIB64={0}/lib64".format(hsakmt_prefix),
|
||||
|
||||
components["openmp"] = ["../rocm-openmp-extras/llvm-project/openmp"]
|
||||
components["openmp"] += openmp_common_args
|
||||
|
||||
@ -24,6 +24,7 @@ class RocmSmiLib(CMakePackage):
|
||||
libraries = ["librocm_smi64"]
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="573cfb759f8c7700fdcb0c28d045aed0f2d950692bb66a10bd589b89b8f48d0f")
|
||||
version("6.2.4", sha256="eb8986dd571f5862c2db693398c0dbec28e2754f764f6bd3cfb21be7699e4452")
|
||||
version("6.2.1", sha256="28543d099fa44b4b79644533644aba4b67fa48d477628dd5802c3b50cc78583a")
|
||||
version("6.2.0", sha256="95010dfc9de9c608b9ce159107585ff4adce82a52a38daab2a37870aca2428bf")
|
||||
|
||||
@ -18,7 +18,8 @@ class RocmTensile(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
version("6.3.0", sha256="7ae90d1a513dc6f000a45f644b360305ef212ab3dff7b0217b6addabebf932e1")
|
||||
version("6.2.4", sha256="dd0721e4371c8752aa4b14362f75d7ebb7805f57dcb990e03ae08cef4a291383")
|
||||
version("6.2.1", sha256="29802dc65a7cea29f0e2608782c75db87e9c71eea8aeb485e856cf2861d83098")
|
||||
version("6.2.0", sha256="6f7d679bfffd1f723f2788b00fdcb1b4673b597f9f85c2cdaab3c2aa17afb33d")
|
||||
@ -84,6 +85,7 @@ class RocmTensile(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -0,0 +1,687 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 77065a7..709a10b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -76,14 +76,18 @@ endif(rocblas_FOUND)
|
||||
# Making ROCM_PATH, CMAKE_INSTALL_PREFIX, CPACK_PACKAGING_INSTALL_PREFIX as CACHE
|
||||
# variables since we will pass them as cmake params appropriately, and
|
||||
# all find_packages relevant to this build will be in ROCM path hence appending it to CMAKE_PREFIX_PATH
|
||||
-set(ROCM_PATH "/opt/rocm" CACHE PATH "ROCM install path")
|
||||
-set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "CMAKE installation directory")
|
||||
-set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE PATH "Prefix used in built packages")
|
||||
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
+set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
list(APPEND CMAKE_PREFIX_PATH "${ROCM_PATH}")
|
||||
-set(ROCR_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime" FORCE)
|
||||
-set(ROCR_LIB_DIR "${ROCM_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime" FORCE)
|
||||
-set(HIP_INC_DIR "${ROCM_PATH}" CACHE PATH "Contains header files exported by ROC Runtime")
|
||||
-set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk" FORCE)
|
||||
+set(ROCR_INC_DIR "${HSA_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime")
|
||||
+set(ROCR_LIB_DIR "${HSA_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime")
|
||||
+set(HIP_INC_DIR "${HIP_PATH}" CACHE PATH "Contains header files exported by ROC Runtime")
|
||||
+set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk")
|
||||
+set(HIPRAND_INC_DIR "${HIPRAND_DIR}/include" CACHE PATH "Contains header files exported by ROC Trunk")
|
||||
+set(HIPRAND_LIB_DIR "${HIPRAND_DIR}/lib" CACHE PATH "Contains header files exported by ROC Trunk")
|
||||
+set(ROCRAND_INC_DIR "${ROCRAND_DIR}/include" CACHE PATH "Contains header files exported by ROC Trunk")
|
||||
+set(ROCRAND_LIB_DIR "${ROCRAND_DIR}/lib" CACHE PATH "Contains header files exported by ROC Trunk")
|
||||
|
||||
add_definitions(-DROCM_PATH="${ROCM_PATH}")
|
||||
if(FETCH_ROCMPATH_FROM_ROCMCORE)
|
||||
@@ -446,18 +450,20 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/rvs_smi-build/librocm_smi64.so
|
||||
)
|
||||
|
||||
endif() # if (RVS_ROCMSMI EQUAL 1)
|
||||
-
|
||||
-set(HIPRAND_INC_DIR "${ROCM_PATH}/include")
|
||||
-set(HIPRAND_LIB_DIR "${ROCM_PATH}/lib")
|
||||
-set(HIPBLASLT_INC_DIR "${ROCM_PATH}/include")
|
||||
-set(HIPBLASLT_LIB_DIR "${ROCM_PATH}/lib")
|
||||
+find_package( hipblas-common REQUIRED CONFIG PATHS ${HIP_DIR} ${ROCM_PATH} /opt/rocm)
|
||||
+set(HIPRAND_INC_DIR "${HIPRAND_DIR}/include")
|
||||
+set(HIPRAND_LIB_DIR "${HIPRAND_DIR}/lib")
|
||||
+set(HIPBLASLT_INC_DIR "${HIPBLASLT_DIR}/include")
|
||||
+set(HIPBLASLT_LIB_DIR "${HIPBLASLT_DIR}/lib")
|
||||
+set(ROCRAND_INC_DIR "${ROCRAND_DIR}/include")
|
||||
+set(ROCRAND_LIB_DIR "${ROCRAND_DIR}/lib")
|
||||
|
||||
if (RVS_ROCBLAS EQUAL 1)
|
||||
set(ROCBLAS_INC_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install")
|
||||
set(ROCBLAS_LIB_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install/lib/")
|
||||
else()
|
||||
- set(ROCBLAS_INC_DIR "${ROCM_PATH}/include")
|
||||
- set(ROCBLAS_LIB_DIR "${ROCM_PATH}/lib")
|
||||
+ set(ROCBLAS_INC_DIR "${ROCBLAS_DIR}/include")
|
||||
+ set(ROCBLAS_LIB_DIR "${ROCBLAS_DIR}/lib")
|
||||
endif()
|
||||
|
||||
if (RVS_ROCMSMI EQUAL 1)
|
||||
@@ -472,8 +478,8 @@ else()
|
||||
set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/rocm_smi/lib")
|
||||
else()
|
||||
message( STATUS "ROCBLAS REORG Enabled Version: ${RVS_ROCBLAS_VERSION_FLAT}" )
|
||||
- set(ROCM_SMI_INC_DIR "${ROCM_PATH}/include")
|
||||
- set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/lib")
|
||||
+ set(ROCM_SMI_INC_DIR "${ROCM_SMI_DIR}/include")
|
||||
+ set(ROCM_SMI_LIB_DIR "${ROCM_SMI_DIR}/lib")
|
||||
endif()
|
||||
endif()
|
||||
set(ROCM_SMI_LIB "rocm_smi64" CACHE STRING "rocm_smi library name")
|
||||
diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt
|
||||
index ca29a5b..36ff304 100644
|
||||
--- a/babel.so/CMakeLists.txt
|
||||
+++ b/babel.so/CMakeLists.txt
|
||||
@@ -109,13 +109,13 @@ set(HIP_HCC_LIB "amdhip64")
|
||||
add_compile_options(-DRVS_ROCBLAS_VERSION_FLAT=${RVS_ROCBLAS_VERSION_FLAT})
|
||||
|
||||
# Determine Roc Runtime header files are accessible
|
||||
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime.h)
|
||||
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
|
||||
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime.h)
|
||||
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
|
||||
RETURN()
|
||||
endif()
|
||||
|
||||
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime_api.h)
|
||||
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
|
||||
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime_api.h)
|
||||
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
|
||||
RETURN()
|
||||
endif()
|
||||
|
||||
@@ -135,16 +135,16 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
|
||||
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
|
||||
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
|
||||
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
|
||||
RETURN()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
|
||||
+include_directories(./ ../ ${HIP_PATH})
|
||||
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
|
||||
@@ -156,7 +156,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
|
||||
set_target_properties(${RVS_TARGET} PROPERTIES
|
||||
SUFFIX .so.${LIB_VERSION_STRING}
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB})
|
||||
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
diff --git a/cmake_modules/tests_unit.cmake b/cmake_modules/tests_unit.cmake
|
||||
index 9760b72..d585f8b 100644
|
||||
--- a/cmake_modules/tests_unit.cmake
|
||||
+++ b/cmake_modules/tests_unit.cmake
|
||||
@@ -27,7 +27,7 @@
|
||||
## define additional unit testing include directories
|
||||
include_directories(${UT_INC})
|
||||
## define additional unit testing lib directories
|
||||
-link_directories(${UT_LIB} ${RVS_LIB_DIR})
|
||||
+link_directories(${UT_LIB} ${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
|
||||
file(GLOB TESTSOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/test*.cpp )
|
||||
#message ( "TESTSOURCES: ${TESTSOURCES}" )
|
||||
@@ -46,6 +46,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES})
|
||||
add_dependencies(${TEST_NAME} rvs_gtest_target)
|
||||
target_link_libraries(${TEST_NAME}
|
||||
${UT_LINK_LIBS} rvslibut rvslib gtest_main gtest pthread pci
|
||||
+ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so
|
||||
)
|
||||
target_compile_definitions(${TEST_NAME} PUBLIC RVS_UNIT_TEST)
|
||||
if(DEFINED tcd.${TEST_NAME})
|
||||
diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt
|
||||
index 4466edc..8c739bb 100644
|
||||
--- a/edp.so/CMakeLists.txt
|
||||
+++ b/edp.so/CMakeLists.txt
|
||||
@@ -128,17 +128,17 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
|
||||
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
|
||||
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
|
||||
RETURN()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
|
||||
+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set (SOURCES src/rvs_module.cpp src/action.cpp src/edp_worker.cpp )
|
||||
@@ -148,7 +148,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
|
||||
set_target_properties(${RVS_TARGET} PROPERTIES
|
||||
SUFFIX .so.${LIB_VERSION_STRING}
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB})
|
||||
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${HIPRAND_LIB} ${ROCRAND_LIB})
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
diff --git a/gm.so/CMakeLists.txt b/gm.so/CMakeLists.txt
|
||||
index d3caa84..94a06be 100644
|
||||
--- a/gm.so/CMakeLists.txt
|
||||
+++ b/gm.so/CMakeLists.txt
|
||||
@@ -118,11 +118,11 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCM_SMI_INC_DIR})
|
||||
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${YAML_CPP_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp)
|
||||
@@ -133,7 +133,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
|
||||
set_target_properties(${RVS_TARGET} PROPERTIES
|
||||
SUFFIX .so.${LIB_VERSION_STRING}
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCM_SMI_LIB})
|
||||
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS})
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
@@ -149,7 +149,7 @@ install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib${RVS}.so"
|
||||
|
||||
# TEST SECTION
|
||||
if (RVS_BUILD_TESTS)
|
||||
- add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
+ B_add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
COMMAND ln -fs ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib${RVS}.so.${VERSION_MAJOR} ${RVS_BINTEST_FOLDER}/lib${RVS}.so WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||
)
|
||||
include(${CMAKE_CURRENT_SOURCE_DIR}/tests.cmake)
|
||||
diff --git a/gm.so/tests.cmake b/gm.so/tests.cmake
|
||||
index 71dabc8..7898dee 100644
|
||||
--- a/gm.so/tests.cmake
|
||||
+++ b/gm.so/tests.cmake
|
||||
@@ -31,11 +31,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime")
|
||||
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
|
||||
|
||||
set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so"
|
||||
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB}
|
||||
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${ROCRAND_LIB}.so" "lib${HIPBLASLT_LIB}.so"
|
||||
)
|
||||
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR})
|
||||
+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
|
||||
set (UT_SOURCES src/action.cpp src/worker.cpp
|
||||
)
|
||||
diff --git a/gpup.so/CMakeLists.txt b/gpup.so/CMakeLists.txt
|
||||
index 43d337a..c92d8ba 100644
|
||||
--- a/gpup.so/CMakeLists.txt
|
||||
+++ b/gpup.so/CMakeLists.txt
|
||||
@@ -109,11 +109,11 @@ else()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ include ../include)
|
||||
+include_directories(./ ../ include ../include ${YAML_CPP_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp)
|
||||
diff --git a/gpup.so/tests.cmake b/gpup.so/tests.cmake
|
||||
index 566508f..a64622c 100644
|
||||
--- a/gpup.so/tests.cmake
|
||||
+++ b/gpup.so/tests.cmake
|
||||
@@ -26,12 +26,13 @@
|
||||
set(ROCBLAS_LIB "rocblas")
|
||||
set(HIPRAND_LIB "hiprand")
|
||||
set(HIPBLASLT_LIB "hipblaslt")
|
||||
+set(ROCRAND_LIB "rocrand")
|
||||
set(ROC_THUNK_NAME "hsakmt")
|
||||
set(CORE_RUNTIME_NAME "hsa-runtime")
|
||||
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
|
||||
|
||||
set(UT_LINK_LIBS libpthread.so libm.so libdl.so ${ROCM_SMI_LIB}
|
||||
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB})
|
||||
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${ROCRAND_LIB})
|
||||
|
||||
# Add directories to look for library files to link
|
||||
link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR})
|
||||
diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt
|
||||
index fd346ce..eebc90b 100644
|
||||
--- a/gst.so/CMakeLists.txt
|
||||
+++ b/gst.so/CMakeLists.txt
|
||||
@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
|
||||
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
|
||||
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
|
||||
RETURN()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
|
||||
+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_DIR} ${ROCRAND_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/gst_worker.cpp)
|
||||
diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt
|
||||
index 002c03c..e0383a6 100644
|
||||
--- a/iet.so/CMakeLists.txt
|
||||
+++ b/iet.so/CMakeLists.txt
|
||||
@@ -145,7 +145,7 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
|
||||
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
|
||||
RETURN()
|
||||
endif()
|
||||
@@ -160,11 +160,11 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR})
|
||||
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so )
|
||||
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/iet_worker.cpp )
|
||||
|
||||
@@ -173,7 +173,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
|
||||
set_target_properties(${RVS_TARGET} PROPERTIES
|
||||
SUFFIX .so.${LIB_VERSION_STRING}
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCM_SMI_LIB})
|
||||
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_INC_DIR}/lib/ ${HIP_HCC_LIB} ${ROCBLAS_LIB})
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt
|
||||
index 5133337..1f05dc6 100644
|
||||
--- a/mem.so/CMakeLists.txt
|
||||
+++ b/mem.so/CMakeLists.txt
|
||||
@@ -134,18 +134,18 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
|
||||
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
|
||||
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
|
||||
RETURN()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
|
||||
+include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/rvs_memtest.cpp src/rvs_memworker.cpp)
|
||||
diff --git a/pbqt.so/CMakeLists.txt b/pbqt.so/CMakeLists.txt
|
||||
index 5ae675a..8b7e5a6 100644
|
||||
--- a/pbqt.so/CMakeLists.txt
|
||||
+++ b/pbqt.so/CMakeLists.txt
|
||||
@@ -136,11 +136,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so)
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ pci ${ROCR_INC_DIR})
|
||||
+include_directories(./ ../ pci ${ROCR_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp
|
||||
diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt
|
||||
index c4e2964..a37e78a 100644
|
||||
--- a/pebb.so/CMakeLists.txt
|
||||
+++ b/pebb.so/CMakeLists.txt
|
||||
@@ -137,11 +137,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so)
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ pci ${ROCR_INC_DIR})
|
||||
+include_directories(./ ../ pci ${ROCR_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR}/.. ${ROCRAND_LIB_DIR}/..)
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp
|
||||
diff --git a/peqt.so/CMakeLists.txt b/peqt.so/CMakeLists.txt
|
||||
index ead507d..d83c9e5 100644
|
||||
--- a/peqt.so/CMakeLists.txt
|
||||
+++ b/peqt.so/CMakeLists.txt
|
||||
@@ -107,11 +107,11 @@ else()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../)
|
||||
+include_directories(./ ../ ${HSA_PATH})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp)
|
||||
@@ -121,7 +121,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
|
||||
set_target_properties(${RVS_TARGET} PROPERTIES
|
||||
SUFFIX .so.${LIB_VERSION_STRING}
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} )
|
||||
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt
|
||||
index 518dac9..5cc54c1 100644
|
||||
--- a/perf.so/CMakeLists.txt
|
||||
+++ b/perf.so/CMakeLists.txt
|
||||
@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
|
||||
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
|
||||
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
|
||||
RETURN()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
|
||||
+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/perf_worker.cpp)
|
||||
@@ -157,7 +157,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
|
||||
set_target_properties(${RVS_TARGET} PROPERTIES
|
||||
SUFFIX .so.${LIB_VERSION_STRING}
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB})
|
||||
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS})
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
diff --git a/pesm.so/CMakeLists.txt b/pesm.so/CMakeLists.txt
|
||||
index 1f27f34..502c1c8 100644
|
||||
--- a/pesm.so/CMakeLists.txt
|
||||
+++ b/pesm.so/CMakeLists.txt
|
||||
@@ -107,11 +107,11 @@ else()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ pci)
|
||||
+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_DIR} ${ROCRAND_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp)
|
||||
diff --git a/pesm.so/tests.cmake b/pesm.so/tests.cmake
|
||||
index e255144..b3f2660 100644
|
||||
--- a/pesm.so/tests.cmake
|
||||
+++ b/pesm.so/tests.cmake
|
||||
@@ -31,11 +31,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime")
|
||||
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
|
||||
|
||||
set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so"
|
||||
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB}
|
||||
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${HIPBLASLT_LIB}.so"
|
||||
)
|
||||
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR})
|
||||
+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
|
||||
set (UT_SOURCES test/unitactionbase.cpp
|
||||
)
|
||||
diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt
|
||||
index c0099ab..fcc82f3 100644
|
||||
--- a/rcqt.so/CMakeLists.txt
|
||||
+++ b/rcqt.so/CMakeLists.txt
|
||||
@@ -108,11 +108,11 @@ else()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../)
|
||||
+include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ASAN_LIB_PATH} ${HSAKMT_LIB_DIR} ${ROCM_SMI_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib)
|
||||
+set (PROJECT_LINK_LIBS rvslib ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES
|
||||
diff --git a/rvs/CMakeLists.txt b/rvs/CMakeLists.txt
|
||||
index 5c1c124..70fa609 100644
|
||||
--- a/rvs/CMakeLists.txt
|
||||
+++ b/rvs/CMakeLists.txt
|
||||
@@ -34,6 +34,7 @@ set ( RVS "rvs" )
|
||||
set ( RVS_PACKAGE "rvs-roct" )
|
||||
set ( RVS_COMPONENT "lib${RVS}" )
|
||||
set ( RVS_TARGET "${RVS}" )
|
||||
+set ( YAML_CPP_LIBRARIES "${YAML_CPP_LIB_PATH}")
|
||||
|
||||
project ( ${RVS_TARGET} )
|
||||
|
||||
@@ -115,21 +116,23 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS})
|
||||
## define lib directories
|
||||
-link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR})
|
||||
+link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR} ${RVS_LIB_DIR}/.. ${YAML_CPP_LIBRARIES})
|
||||
|
||||
## additional libraries
|
||||
-set(ROCBLAS_LIB "rocblas")
|
||||
-set(ROC_THUNK_NAME "hsakmt")
|
||||
-set(CORE_RUNTIME_NAME "hsa-runtime")
|
||||
-set(HIPRAND_LIB "hiprand")
|
||||
-set(HIPBLASLT_LIB "hipblaslt")
|
||||
-set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
|
||||
-set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so ${YAML_CPP_LIBRARIES})
|
||||
+set(ROCBLAS_LIB "${ROCBLAS_LIB_DIR}/librocblas.so")
|
||||
+set(ROC_THUNK_NAME "${HSAKMT_LIB_DIR}/libhsakmt.a")
|
||||
+set(CORE_RUNTIME_NAME "${HSA_PATH}/lib/libhsa-runtime64.so")
|
||||
+set(YAML_CPP_LIB "${YAML_CPP_LIBRARIES}/libyaml-cpp.a")
|
||||
+set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}")
|
||||
+set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so)
|
||||
+set(HIPRAND_LIB "${HIPRAND_LIB_DIR}/libhiprand.so")
|
||||
+set(ROCRAND_LIB "${ROCRAND_LIB_DIR}/librocrand.so")
|
||||
+set(HIPBLASLT_LIB "${HIPBLASLT_LIB_DIR}/libhipblaslt.so")
|
||||
|
||||
## define target
|
||||
add_executable(${RVS_TARGET} src/rvs.cpp)
|
||||
target_link_libraries(${RVS_TARGET} rvslib
|
||||
- ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${PROJECT_LINK_LIBS} ${HIPRAND_LIB} ${HIPBLASLT_LIB})
|
||||
+ ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${PROJECT_LINK_LIBS} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${YAML_CPP_LIB} ${ROCRAND_LIB})
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
install(TARGETS ${RVS_TARGET}
|
||||
diff --git a/rvs/tests.cmake b/rvs/tests.cmake
|
||||
index 15e72c2..36fc223 100644
|
||||
--- a/rvs/tests.cmake
|
||||
+++ b/rvs/tests.cmake
|
||||
@@ -38,12 +38,12 @@ set(CORE_RUNTIME_NAME "hsa-runtime")
|
||||
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
|
||||
|
||||
## define lib directories
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${HIPRAND_LIB_DIR})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
|
||||
## define target for "test-to-fail"
|
||||
add_executable(${RVS_TARGET}fail src/rvs.cpp)
|
||||
target_link_libraries(${RVS_TARGET}fail rvslib rvslibut ${PROJECT_LINK_LIBS}
|
||||
- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${ROCM_CORE} ${CORE_RUNTIME_TARGET} ${HIPRAND_LIB} ${HIPBLASLT_LIB})
|
||||
+ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${ROCM_CORE} ${CORE_RUNTIME_TARGET} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${ROCRAND_LIB})
|
||||
|
||||
target_compile_definitions(${RVS_TARGET}fail PRIVATE RVS_INVERT_RETURN_STATUS)
|
||||
set_target_properties(${RVS_TARGET}fail PROPERTIES
|
||||
@@ -212,7 +212,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES})
|
||||
${PROJECT_LINK_LIBS}
|
||||
${PROJECT_TEST_LINK_LIBS}
|
||||
rvslib rvslibut gtest_main gtest pthread
|
||||
- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${HIPRAND_LIB} ${HIPBLASLT_LIB}
|
||||
+ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${ROCRAND_LIB}
|
||||
)
|
||||
add_dependencies(${TEST_NAME} rvs_gtest_target)
|
||||
|
||||
diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt
|
||||
index bf806a0..7693b0e 100644
|
||||
--- a/rvslib/CMakeLists.txt
|
||||
+++ b/rvslib/CMakeLists.txt
|
||||
@@ -116,7 +116,7 @@ endif()
|
||||
|
||||
## define include directories
|
||||
include_directories(./ ../ ../rvs
|
||||
- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${HIPBLASLT_INC_DIR})
|
||||
+ ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_PATH} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
|
||||
link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
|
||||
|
||||
diff --git a/smqt.so/CMakeLists.txt b/smqt.so/CMakeLists.txt
|
||||
index 042586f..285cb17 100644
|
||||
--- a/smqt.so/CMakeLists.txt
|
||||
+++ b/smqt.so/CMakeLists.txt
|
||||
@@ -106,11 +106,11 @@ else()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ pci)
|
||||
+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp)
|
||||
diff --git a/smqt.so/tests.cmake b/smqt.so/tests.cmake
|
||||
index 8b6ea93..329a967 100644
|
||||
--- a/smqt.so/tests.cmake
|
||||
+++ b/smqt.so/tests.cmake
|
||||
@@ -31,11 +31,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime")
|
||||
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
|
||||
|
||||
set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so"
|
||||
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB}
|
||||
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${HIPBLASLT_LIB}.so"
|
||||
)
|
||||
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR})
|
||||
+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
|
||||
|
||||
set (UT_SOURCES src/action.cpp test/unitsmqt.cpp
|
||||
)
|
||||
diff --git a/testif.so/CMakeLists.txt b/testif.so/CMakeLists.txt
|
||||
index 4cba0f9..691534a 100644
|
||||
--- a/testif.so/CMakeLists.txt
|
||||
+++ b/testif.so/CMakeLists.txt
|
||||
@@ -108,11 +108,11 @@ endif()
|
||||
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ pci)
|
||||
+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so)
|
||||
|
||||
## define source files
|
||||
## set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp)
|
||||
diff --git a/tst.so/CMakeLists.txt b/tst.so/CMakeLists.txt
|
||||
index 1a1a8b0..7c70b04 100644
|
||||
--- a/tst.so/CMakeLists.txt
|
||||
+++ b/tst.so/CMakeLists.txt
|
||||
@@ -140,7 +140,7 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
|
||||
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
|
||||
RETURN()
|
||||
endif()
|
||||
@@ -155,11 +155,11 @@ if(DEFINED RVS_ROCMSMI)
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR})
|
||||
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS})
|
||||
# Add directories to look for library files to link
|
||||
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR}/.. ${ROCRAND_LIB_DIR}/..)
|
||||
## additional libraries
|
||||
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
|
||||
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/tst_worker.cpp )
|
||||
|
||||
@ -21,7 +21,8 @@ class RocmValidationSuite(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
version("6.3.0", sha256="1e2b7eee002dd922625bcf792104e265cc5a57bec21f13d79d68036aa84b422f")
|
||||
version("6.2.4", sha256="ccdea6e955ca145a29d47da74d77b14196c935b57502edaed37fd18029b5220c")
|
||||
version("6.2.1", sha256="7e1f4f391a5b31087585b250136f3a8c1fdf4c609880499575291c61b3ebbc15")
|
||||
version("6.2.0", sha256="03913a1aae426b9fbb7a4870f408a3af1b8b7d32766515eaccb43107673fe631")
|
||||
@ -61,6 +62,7 @@ class RocmValidationSuite(CMakePackage):
|
||||
patch("009-replacing-rocm-path-with-package-path.patch", when="@6.0")
|
||||
patch("009-replacing-rocm-path-with-package-path-6.1.patch", when="@6.1:6.2.0")
|
||||
patch("009-replacing-rocm-path-with-package-path-6.2.1.patch", when="@6.2.1:6.2.4")
|
||||
patch("009-replacing-rocm-path-with-package-path-6.3.patch", when="@6.3.0")
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
depends_on("zlib-api", type="link")
|
||||
depends_on("yaml-cpp~shared")
|
||||
@ -90,17 +92,41 @@ def setup_build_environment(self, build_env):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocminfo@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocblas@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
for ver in ["6.2.1", "6.2.4"]:
|
||||
for ver in ["6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"hiprand@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocrand@{ver}", when=f"@{ver}")
|
||||
|
||||
depends_on("hipblaslt@6.3.0", when="@6.3.0")
|
||||
|
||||
def patch(self):
|
||||
if self.spec.satisfies("@5.2:5.4"):
|
||||
filter_file(
|
||||
@ -132,13 +158,17 @@ def cmake_args(self):
|
||||
if not os.path.isdir(libloc):
|
||||
libloc = self.spec["googletest"].prefix.lib
|
||||
args.append(self.define("UT_LIB", libloc))
|
||||
libloc = self.spec["hsakmt-roct"].prefix.lib64
|
||||
if not os.path.isdir(libloc):
|
||||
libloc = self.spec["hsakmt-roct"].prefix.lib
|
||||
args.append(self.define("HSAKMT_LIB_DIR", libloc))
|
||||
if self.spec.satisfies("@:6.2"):
|
||||
libloc = self.spec["hsakmt-roct"].prefix.lib64
|
||||
if not os.path.isdir(libloc):
|
||||
libloc = self.spec["hsakmt-roct"].prefix.lib
|
||||
args.append(self.define("HSAKMT_LIB_DIR", libloc))
|
||||
else:
|
||||
args.append(self.define("HSAKMT_LIB_DIR", self.spec["hsa-rocr-dev"].prefix.lib))
|
||||
libloc = self.spec["yaml-cpp"].prefix.lib64
|
||||
if not os.path.isdir(libloc):
|
||||
libloc = self.spec["yaml-cpp"].prefix.lib
|
||||
args.append(self.define("YAML_CPP_LIB_PATH", libloc))
|
||||
|
||||
if self.spec.satisfies("@6.3.0:"):
|
||||
args.append(self.define("HIPBLASLT_DIR", self.spec["hipblaslt"].prefix))
|
||||
return args
|
||||
|
||||
@ -18,6 +18,7 @@ class Rocminfo(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="40e2ef89e135770196022761cb929af93c80c41869082b3ef80e42b7772267d0")
|
||||
version("6.2.4", sha256="14d4b0e22e2314156091ac9ad1646dd20909dba3a43e037584a503a6754e7f9e")
|
||||
version("6.2.1", sha256="ae6e08962535e76a81ed872cbd6bf6860c46fa6e4e4bc8f7849c8781359798d8")
|
||||
version("6.2.0", sha256="4d9a9051bda3355f8d2050e981435cd02528a04264a7f61162d685e7e1629f73")
|
||||
@ -62,9 +63,31 @@ class Rocminfo(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
@ -82,6 +105,7 @@ class Rocminfo(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -18,6 +18,7 @@ class Rocmlir(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "afzpatel", "renjithravindrankannath")
|
||||
|
||||
version("6.3.0", sha256="8dd167250e138fac0609f4ed06fc6a4dca5edad346166a291f20b4dad99bbd0b")
|
||||
version("6.2.4", sha256="3283685431fd59e20a6ac5737df22c7c7421901779a2a0b6dbd6c1ab1f1b5adb")
|
||||
version("6.2.1", sha256="eff594c6b6b97ac21bf268da49fcd016584cfe28c8ff64b0a20b8a9144dca683")
|
||||
version("6.2.0", sha256="889e021edab19657947716e0056176ca0298602a21c4b77e7e7b00467fdaa175")
|
||||
@ -75,6 +76,7 @@ def patch(self):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -16,7 +16,8 @@ class Rocprim(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
|
||||
version("6.3.0", sha256="d97c6edcf1f636721f8c023b54f3fad968b48b0709a95ecd640ec0ab1057069e")
|
||||
version("6.2.4", sha256="c567aa5e3209dd00aefe5052dde8ceb5bcc3a4aeeeb3ad8dc322f8d0791fc07f")
|
||||
version("6.2.1", sha256="55cfa8a4224bcd2dcf2298e7938c983a8bb0c1c072fc8295c198e53785b521ac")
|
||||
version("6.2.0", sha256="cd9be3a030830c96c940dc69e4a00f2701539a7e10b62ab1181ab83eeef31e57")
|
||||
@ -76,6 +77,7 @@ class Rocprim(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -16,9 +16,10 @@ class RocprofilerDev(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocprofiler/archive/refs/tags/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["librocprofiler64"]
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="45ddc1d87a33bb27e9445e642a3495fef21cec1e545793b2ca5f551743961b1f")
|
||||
version("6.2.4", sha256="898eae91938c2d08207b615db03a784c7f3090989bcf09260635d18aa5930a2c")
|
||||
version("6.2.1", sha256="6eb36dad67e3b294f210e21987c52aec666652cffa87b8af1f8077d5b7812245")
|
||||
version("6.2.0", sha256="79b4f29d051e62639b4bf2ca288035514d32e055fc759ff4a82d377bf7ca97ea")
|
||||
@ -65,6 +66,28 @@ class RocprofilerDev(CMakePackage):
|
||||
"6.2.4",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocminfo@{ver}", when=f"@{ver}")
|
||||
depends_on(f"roctracer-dev-api@{ver}", when=f"@{ver}")
|
||||
@ -80,6 +103,7 @@ class RocprofilerDev(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
|
||||
@ -99,6 +123,7 @@ class RocprofilerDev(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"aqlprofile@{ver}", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", when=f"@{ver}")
|
||||
@ -146,9 +171,10 @@ def cmake_args(self):
|
||||
self.define(
|
||||
"PROF_API_HEADER_PATH", self.spec["roctracer-dev-api"].prefix.roctracer.include.ext
|
||||
),
|
||||
self.define("ROCM_ROOT_DIR", self.spec["hsakmt-roct"].prefix.include),
|
||||
self.define("CMAKE_INSTALL_LIBDIR", "lib"),
|
||||
]
|
||||
if self.spec.satisfies("@:6.2"):
|
||||
args.append(self.define("ROCM_ROOT_DIR", self.spec["hsakmt-roct"].prefix.include))
|
||||
if self.spec.satisfies("@6.2:"):
|
||||
args.append(self.define("ROCPROFILER_BUILD_PLUGIN_PERFETTO", "OFF"))
|
||||
return args
|
||||
|
||||
@ -20,6 +20,7 @@ class RocprofilerRegister(CMakePackage):
|
||||
maintainers("afzpatel", "srekolam", "renjithravindrankannath")
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="51aae00e7a8bb44a369de9626fca360c80879034ab43092eb6e4ccfa1b51ca47")
|
||||
version("6.2.4", sha256="e7c31d5e1100c1e8ae0a2c6de3bfea75341abc4a68d02b58089421e2a54bba54")
|
||||
version("6.2.1", sha256="161d3502863147df4daeadc538d0eb156c314c94634f8c34ee5994f046f8753f")
|
||||
version("6.2.0", sha256="5cdfdfc621da9ef5a6b828d1a3a342db222b648c91359f71651b9404bf7ba62c")
|
||||
|
||||
@ -14,7 +14,7 @@ class Rocpydecode(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocPyDecode/archive/refs/tags/rocm-6.2.0.tar.gz"
|
||||
|
||||
maintainers("afzpatel", "srekolam", "renjithravindrankannath")
|
||||
|
||||
version("6.3.0", sha256="4d0d969fb32328d8277b5cc451ee875428f58c12c1d4b3ff33247774ecc6caf8")
|
||||
version("6.2.4", sha256="9cdb8bdc65b54b2c02d6c950dd34cd702ec50d903aa4d252d1eb1f8cae8c0afb")
|
||||
version("6.2.1", sha256="34c595cfe40ad74fcec2f52e7cc7be3ad8c8334030b0e98eb36305b6f63edc0d")
|
||||
version("6.2.0", sha256="e465254cd3e96bbb59208e90293d7c6b7744b0fbcd928ef278ec568c83e63ff3")
|
||||
@ -23,7 +23,7 @@ class Rocpydecode(CMakePackage):
|
||||
depends_on("ffmpeg@4.4:6")
|
||||
depends_on("dlpack")
|
||||
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4"]:
|
||||
for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0"]:
|
||||
depends_on(f"rocdecode@{ver}", when=f"@{ver}")
|
||||
|
||||
def patch(self):
|
||||
@ -33,6 +33,12 @@ def patch(self):
|
||||
"CMakeLists.txt",
|
||||
string=True,
|
||||
)
|
||||
filter_file(
|
||||
r"${ROCM_PATH}/lib/llvm/bin/clang++",
|
||||
"{0}/bin/clang++".format(self.spec["llvm-amdgpu"].prefix),
|
||||
"CMakeLists.txt",
|
||||
string=True,
|
||||
)
|
||||
filter_file(
|
||||
r"${ROCM_PATH}/share/rocdecode/utils",
|
||||
"{0}/share/rocdecode/utils".format(self.spec["rocdecode"].prefix),
|
||||
|
||||
@ -18,13 +18,14 @@ class Rocrand(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocRAND/archive/rocm-6.0.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["librocrand"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="396d2dc842c64d29f577365c348fbccd6260a11431eec61f233fdb0f38b7625d")
|
||||
version("6.2.4", sha256="94a2ea2413623b427ddf69365b3996c18721456965024c0dfac506a13c8dc547")
|
||||
version("6.2.1", sha256="ed07f638b5e30199251ddda6dd9ee53ee0ec49bcf37cc571a3de85c3a9833248")
|
||||
version("6.2.0", sha256="7f5318e9c9eb36fb3660392e97520268920c59af3a51af19633aabe5046ef1af")
|
||||
@ -126,6 +127,7 @@ class Rocrand(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
|
||||
@ -18,7 +18,7 @@ class Rocsolver(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocSOLVER/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie", "afzpatel")
|
||||
libraries = ["librocsolver"]
|
||||
|
||||
amdgpu_targets = ROCmPackage.amdgpu_targets
|
||||
@ -46,6 +46,7 @@ class Rocsolver(CMakePackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.3.0", sha256="48861f7b86379f2b825c0496d1d9318c6e29426d083b361c10f685b0ddd66274")
|
||||
version("6.2.4", sha256="022863df6a9d51bd216e56dd4dc7d437584e48304cfdbc9c5751be1abfd7c73f")
|
||||
version("6.2.1", sha256="e1c19cd25f7119c116d1c63e2384e9c47a4ff7ae14bb42dfcef766a4d3a011d5")
|
||||
version("6.2.0", sha256="74cb799dcddfcbd6ee05398003416dbccd3d06d7f4b23e4324baac3f15440162")
|
||||
@ -108,6 +109,7 @@ class Rocsolver(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocblas@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -20,7 +20,7 @@ class Rocsparse(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocSPARSE/archive/rocm-6.2.4.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["librocsparse"]
|
||||
|
||||
amdgpu_targets = ROCmPackage.amdgpu_targets
|
||||
@ -39,6 +39,7 @@ class Rocsparse(CMakePackage):
|
||||
conflicts("+asan", when="os=centos8")
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="38aaf1cc55f57566a3056a970f73f40a9a4930583d6e57fc9c7745a127029227")
|
||||
version("6.2.4", sha256="1f86c2d439e777cd17724269da66997d351b3a1b83f44143361e9c77d80e2370")
|
||||
version("6.2.1", sha256="4691d689db0a03fc950dbc9d88471752f6d17f5382a4bd2f7e23dfb43fc7074c")
|
||||
version("6.2.0", sha256="d07357d180423cedbabc849983a2d4d79b0e9f4c9b5e07d4993043e646fe6df9")
|
||||
@ -84,6 +85,7 @@ class Rocsparse(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocprim@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -17,7 +17,8 @@ class Rocthrust(CMakePackage):
|
||||
url = "https://github.com/ROCm/rocThrust/archive/rocm-6.1.0.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
|
||||
version("6.3.0", sha256="553e67bc0a7fb2d129b15fd4b8889f9ee56ebd29bc885a1fb32918dfcfa3b955")
|
||||
version("6.2.4", sha256="ec212f3f5ff1ff3c71b85dae50d19c1faa344d400b5d1fa376471c2390361dc8")
|
||||
version("6.2.1", sha256="de6121e354e4d2d5f90243acc1071e9afb2a335e17570d293b590b85f3f58fa2")
|
||||
version("6.2.0", sha256="8037aadf7ec3d548aa17944e0a47465d608dc6eb7347173a6d76cbf5342e4ab6")
|
||||
@ -73,6 +74,7 @@ class Rocthrust(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocprim@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -18,7 +18,8 @@ class RoctracerDevApi(Package):
|
||||
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
version("6.3.0", sha256="6eb09e3b3b45ed68b2ac7ed6848521e645569bcd4a1f3a336cf2473a801308a2")
|
||||
version("6.2.4", sha256="b94c7db8ac57a4a1d7f8115020c36551220c20f33289fd06830495b4914a7d7b")
|
||||
version("6.2.1", sha256="9e69c90b9dc650e0d8642ec675082c9566e576285a725c3a5d07a37cebb18810")
|
||||
version("6.2.0", sha256="2fc39f47161f41cc041cd5ee4b1bb0e9832508650e832434056423fec3739735")
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
|
||||
m 70c457c9d087f83e5587c0d2f65a284a5cbafa1e Mon Sep 17 00:00:00 2001
|
||||
From: Afzal Patel <Afzal.Patel@amd.com>
|
||||
Date: Wed, 14 Aug 2024 16:58:27 +0000
|
||||
Subject: [PATCH] Use clang version 18
|
||||
|
||||
---
|
||||
test/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 95563d5..c9a50b9 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -34,7 +34,7 @@ if(DEFINED ROCM_PATH)
|
||||
endif()
|
||||
find_package(HIP REQUIRED MODULE)
|
||||
|
||||
-find_package(Clang REQUIRED CONFIG
|
||||
+find_package(Clang 18 REQUIRED CONFIG
|
||||
PATHS "${ROCM_PATH}"
|
||||
PATH_SUFFIXES "llvm/lib/cmake/clang")
|
||||
|
||||
--
|
||||
2.43.5
|
||||
|
||||
@ -18,10 +18,11 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
url = "https://github.com/ROCm/roctracer/archive/rocm-6.1.2.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
libraries = ["libroctracer64"]
|
||||
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="6eb09e3b3b45ed68b2ac7ed6848521e645569bcd4a1f3a336cf2473a801308a2")
|
||||
version("6.2.4", sha256="b94c7db8ac57a4a1d7f8115020c36551220c20f33289fd06830495b4914a7d7b")
|
||||
version("6.2.1", sha256="9e69c90b9dc650e0d8642ec675082c9566e576285a725c3a5d07a37cebb18810")
|
||||
version("6.2.0", sha256="2fc39f47161f41cc041cd5ee4b1bb0e9832508650e832434056423fec3739735")
|
||||
@ -72,6 +73,28 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
"6.2.4",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"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",
|
||||
"6.1.2",
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocminfo@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -94,11 +117,11 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
patch("0001-include-rocprofiler-dev-path.patch", when="@5.3:5.4")
|
||||
patch("0002-use-clang-18.patch", when="@6.2")
|
||||
|
||||
@classmethod
|
||||
def determine_version(cls, lib):
|
||||
@ -140,7 +163,8 @@ def cmake_args(self):
|
||||
args.append(self.define("ROCPROFILER_PATH", self.spec["rocprofiler-dev"].prefix))
|
||||
if self.spec.satisfies("@6.0:"):
|
||||
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
|
||||
|
||||
if self.spec.satisfies("@6.2:"):
|
||||
args.append(self.define("Clang_DIR", self.spec["llvm-amdgpu"].prefix.lib.cmake.clang))
|
||||
return args
|
||||
|
||||
@run_after("install")
|
||||
|
||||
@ -26,7 +26,8 @@ class Rocwmma(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
version("6.3.0", sha256="8dcd06599083dc3a67958a1b6f7c29c1880758eb6ff579143e0fb162985b0612")
|
||||
version("6.2.4", sha256="eaa2f313a1bfe455d9641df44d7b890ea7334b58a643c75f0b7f108cae5f777c")
|
||||
version("6.2.1", sha256="f05fcb3612827502d2a15b30f0e46228625027145013652b8f591ad403fa9ddc")
|
||||
version("6.2.0", sha256="08c5d19f0417ee9ba0e37055152b22f64ed0eab1d9ab9a7d13d46bf8d3b255dc")
|
||||
@ -91,6 +92,7 @@ class Rocwmma(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver)
|
||||
@ -111,6 +113,7 @@ class Rocwmma(CMakePackage):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on("rocm-smi-lib@" + ver, when="@" + ver)
|
||||
|
||||
|
||||
@ -28,6 +28,7 @@ def url_for_version(self, version):
|
||||
|
||||
maintainers("srekolam", "afzpatel")
|
||||
license("MIT")
|
||||
version("6.3.0", sha256="130a6bd2fc4278956c6450a3c49243651576b1031e6a485aa62453b9dc3b4d51")
|
||||
version("6.2.4", sha256="e733350e938ce8d2f7d6d43d2bfd0febd270d52673bafa0265ed97bb850289de")
|
||||
version("6.2.1", sha256="5ae9d0c6733ba0e00be1cda13003e98acebd3f86de59e6f1969e297d673f124e")
|
||||
version("6.2.0", sha256="69fbebf50b734e055258ea3c5b0399a51babab8f66074166d2b0fc4f1904c09c")
|
||||
@ -142,6 +143,7 @@ def patch(self):
|
||||
depends_on("bzip2")
|
||||
depends_on("half")
|
||||
depends_on("hwloc")
|
||||
depends_on("ffmpeg@:6", when="@6.2:")
|
||||
depends_on(
|
||||
"opencv@4.5:"
|
||||
"+calib3d+features2d+highgui+imgcodecs+imgproc"
|
||||
@ -166,6 +168,7 @@ def patch(self):
|
||||
"6.2.0",
|
||||
"6.2.1",
|
||||
"6.2.4",
|
||||
"6.3.0",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
with when("@:1.2"):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user