Bump up the version for ROCm-6.1.0 (#43843)
* Bump up the version for ROCm-6.1.0 * Style check error correction and patch files * Update for rocm-openmp-extras 6.1 * updating rocm-openmp-extras and math libraries with 6.1 * Style check error correcion * updating hipcub, hipfort & miopen-hip for 6.1 * Rocm-openmp-extras and some mathlib updates * iAudit error correction and rocmlir update * Updating dependency on suite-sparse and adding path * Style check error corection * hip-tensor 6.1.0 update * rdc 6.1 needs grpc 1.59.1 * rvs 6.1 updates and patch
This commit is contained in:
renjithravindrankannath
GitHub
parent
2bcba57757
commit
2e40c88d50
@ -20,6 +20,7 @@ class Amdsmi(CMakePackage):
|
||||
libraries = ["libamd_smi"]
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="5bd1f150a2191b1703ff2670e40f6fed730f59f155623d6e43b7f64c39ae0967")
|
||||
version("6.0.2", sha256="aeadf07750def0325a0eaa29e767530b2ec94f3d45dc3b7452fd7a2493769428")
|
||||
version("6.0.0", sha256="2626e3af9d60dec245c61af255525a0c0841a73fb7ec2836477c0ce5793de39c")
|
||||
version("5.7.0", sha256="144391d537710dafa9ef69571dd76203e56db6142ab61a1375346b5733137e23")
|
||||
|
||||
@ -8,6 +8,20 @@
|
||||
from spack.package import *
|
||||
|
||||
_versions = {
|
||||
"6.1.0": {
|
||||
"apt": (
|
||||
"0ef862503245f12721384443f8347528f3d5c2c7762289c770521f3235ba36c9",
|
||||
"https://repo.radeon.com/rocm/apt/6.1/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.60100.60100-82~20.04_amd64.deb",
|
||||
),
|
||||
"yum": (
|
||||
"bb08ec49987ef821278e24b9669ccea613a1475af4aedfcc3ac77146e6fbf229",
|
||||
"https://repo.radeon.com/rocm/yum/6.1/main/hsa-amd-aqlprofile-1.0.0.60100.60100-82.el7.x86_64.rpm",
|
||||
),
|
||||
"zyp": (
|
||||
"6a20c8933a878dc3476fa5a45936d3d230d5c2c417e914a6460c2f576a3d6e35",
|
||||
"https://repo.radeon.com/rocm/zyp/6.1/main/hsa-amd-aqlprofile-1.0.0.60100.60100-sles154.82.x86_64.rpm",
|
||||
),
|
||||
},
|
||||
"6.0.2": {
|
||||
"apt": (
|
||||
"57efc4e8380d941fc9e3ba8353bc724913cd5b5be2c53fed016e92da63e31b2f",
|
||||
|
||||
@ -14,7 +14,14 @@ class Comgr(CMakePackage):
|
||||
|
||||
homepage = "https://github.com/ROCm/ROCm-CompilerSupport"
|
||||
git = "https://github.com/ROCm/ROCm-CompilerSupport.git"
|
||||
url = "https://github.com/ROCm/ROCm-CompilerSupport/archive/rocm-6.0.0.tar.gz"
|
||||
|
||||
def url_for_version(self, version):
|
||||
if version <= Version("6.0.2"):
|
||||
url = "https://github.com/ROCm/ROCm-CompilerSupport/archive/rocm-{0}.tar.gz"
|
||||
else:
|
||||
url = "https://github.com/ROCm/llvm-project/archive/rocm-{0}.tar.gz"
|
||||
return url.format(version)
|
||||
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
@ -23,6 +30,7 @@ class Comgr(CMakePackage):
|
||||
license("NCSA")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("6.1.0", sha256="6bd9912441de6caf6b26d1323e1c899ecd14ff2431874a2f5883d3bc5212db34")
|
||||
version("6.0.2", sha256="737b110d9402509db200ee413fb139a78369cf517453395b96bda52d0aa362b9")
|
||||
version("6.0.0", sha256="04353d27a512642a5e5339532a39d0aabe44e0964985de37b150a2550385800a")
|
||||
version("5.7.1", sha256="3b9433b4a0527167c3e9dfc37a3c54e0550744b8d4a8e1be298c8d4bcedfee7c")
|
||||
@ -74,6 +82,7 @@ class Comgr(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
]:
|
||||
# llvm libs are linked statically, so this *could* be a build dep
|
||||
@ -83,10 +92,15 @@ class Comgr(CMakePackage):
|
||||
# that a conditional dependency
|
||||
depends_on(f"rocm-device-libs@{ver}", when=f"@{ver} ^llvm-amdgpu ~rocm-device-libs")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
root_cmakelists_dir = join_path("lib", "comgr")
|
||||
@property
|
||||
def root_cmakelists_dir(self):
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
return join_path("lib", "comgr")
|
||||
else:
|
||||
return join_path("amd", "comgr")
|
||||
|
||||
def cmake_args(self):
|
||||
args = [self.define("BUILD_TESTING", self.run_tests)]
|
||||
|
||||
@ -13,12 +13,13 @@ class ComposableKernel(CMakePackage):
|
||||
|
||||
homepage = "https://github.com/ROCm/composable_kernel"
|
||||
git = "https://github.com/ROCm/composable_kernel.git"
|
||||
url = "https://github.com/ROCm/composable_kernel/archive/refs/tags/rocm-6.0.2.tar.gz"
|
||||
url = "https://github.com/ROCm/composable_kernel/archive/refs/tags/rocm-6.1.0.tar.gz"
|
||||
maintainers("srekolam", "afzpatel")
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="develop")
|
||||
version("6.1.0", sha256="355a4514b96b56aa9edf78198a3e22067e7397857cfe29d9a64d9c5557b9f83d")
|
||||
version("6.0.2", sha256="f648a99388045948b7d5fbf8eb8da6a1803c79008b54d406830b7f9119e1dcf6")
|
||||
version("6.0.0", sha256="a8f736f2f2a8afa4cddd06301205be27774d85f545429049b4a2bbbe6fcd67df")
|
||||
version("5.7.1", sha256="75f66e023c2e31948e91fa26366eaeac72d871fc2e5188361d4465179f13876e")
|
||||
@ -50,6 +51,7 @@ class ComposableKernel(CMakePackage):
|
||||
|
||||
for ver in [
|
||||
"master",
|
||||
"6.1.0",
|
||||
"6.0.2",
|
||||
"6.0.0",
|
||||
"5.7.1",
|
||||
|
||||
@ -11,10 +11,11 @@ class Grpc(CMakePackage):
|
||||
maintainers("nazavode")
|
||||
|
||||
homepage = "https://grpc.io"
|
||||
url = "https://github.com/grpc/grpc/archive/v1.39.0.tar.gz"
|
||||
url = "https://github.com/grpc/grpc/archive/v1.59.1.tar.gz"
|
||||
|
||||
license("Apache-2.0 AND BSD-3-Clause AND MIT")
|
||||
|
||||
version("1.59.1", sha256="916f88a34f06b56432611aaa8c55befee96d0a7b7d7457733b9deeacbc016f99")
|
||||
version("1.55.0", sha256="9cf1a69a921534ac0b760dcbefb900f3c2f735f56070bf0536506913bb5bfd74")
|
||||
version("1.50.0", sha256="76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a")
|
||||
version("1.47.0", sha256="271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54")
|
||||
|
||||
@ -17,6 +17,7 @@ class HipTensor(CMakePackage, ROCmPackage):
|
||||
maintainers("srekolam", "afzpatel")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="9cc43b1b3394383f22f30e194d8753ca6ff1887c83ec1de5823cb2e94976eeed")
|
||||
version("6.0.2", sha256="6e6e7530eabbd1fb28b83efa5a49c19a6642d40e1554224ebb1e0a5999045e27")
|
||||
version("6.0.0", sha256="268d7f114784b7e824f89c21c65c2efedbb5486f09a356a56dca1b89bde1ef7a")
|
||||
version("5.7.1", sha256="96743d4e695fe865aef4097ae31d9b4e42a2d5a92135a005b0d187d9c0b17645")
|
||||
@ -24,11 +25,17 @@ class HipTensor(CMakePackage, ROCmPackage):
|
||||
|
||||
variant("asan", default=False, description="Build with address-sanitizer enabled or disabled")
|
||||
|
||||
for ver in ["5.7.0", "5.7.1", "6.0.0", "6.0.2", "master"]:
|
||||
for ver in ["5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.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"]:
|
||||
depends_on(f"hipcc@{ver}", when=f"@{ver}")
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
if self.spec.satisfies("@6.1"):
|
||||
env.set("CXX", self.spec["hipcc"].prefix.bin.hipcc)
|
||||
else:
|
||||
env.set("CXX", self.spec["hip"].hipcc)
|
||||
if self.spec.satisfies("+asan"):
|
||||
self.asan_on(env)
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
diff --git a/clr/hipamd/CMakeLists.txt b/clr/hipamd/CMakeLists.txt
|
||||
index ccfbcee..8c3752f 100755
|
||||
--- a/clr/hipamd/CMakeLists.txt
|
||||
+++ b/clr/hipamd/CMakeLists.txt
|
||||
@@ -300,16 +300,6 @@ if(HIP_RUNTIME STREQUAL "rocclr")
|
||||
add_subdirectory(src)
|
||||
endif()
|
||||
|
||||
-# Download libamdhip64.so.5
|
||||
-if(HIP_PLATFORM STREQUAL "amd")
|
||||
- if(NOT WIN32)
|
||||
- execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/download_libamhip64_v5.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND_ECHO STDERR RESULT_VARIABLE DWLD_HIP_SO_RC)
|
||||
- if (DWLD_HIP_SO_RC AND NOT DWLD_HIP_SO_RC EQUAL 0)
|
||||
- message(FATAL_ERROR "Failed to download libamdhip64.so.5")
|
||||
- endif()
|
||||
- endif()
|
||||
-endif()
|
||||
-
|
||||
# Build doxygen documentation
|
||||
find_program(DOXYGEN_EXE doxygen)
|
||||
if(DOXYGEN_EXE)
|
||||
@ -27,6 +27,7 @@ class Hip(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="6fd57910a16d0b54df822807e67b6207146233a2de5a46c6a05b940a21e2c4d7")
|
||||
version("6.0.2", sha256="b47178db94f2acc106e1a88ceb029844805266ebaba11ef63744e90d224b11be")
|
||||
version("6.0.0", sha256="0d575788e0b731124a8489a36652014a165b9ebab92d5456ec3c976e062f3a82")
|
||||
version("5.7.1", sha256="eaa0e14a9ae45c58ed37863797b683a7778b3cbbf92f5b6529ec65fd61d61f3e")
|
||||
@ -54,6 +55,7 @@ class Hip(CMakePackage):
|
||||
depends_on("cuda", when="+cuda")
|
||||
|
||||
depends_on("cmake@3.16.8:", type="build")
|
||||
depends_on("libedit", type="build")
|
||||
depends_on("perl@5.10:", type=("build", "run"))
|
||||
|
||||
test_requires_compiler = True
|
||||
@ -79,6 +81,7 @@ class Hip(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
@ -98,17 +101,28 @@ class Hip(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on("hipify-clang", when=f"@{ver}")
|
||||
depends_on(f"hipify-clang@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in [
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"5.7.0",
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
# hipcc likes to add `-lnuma` by default :(
|
||||
# ref https://github.com/ROCm/HIP/pull/2202
|
||||
depends_on("numactl", when="@3.7.0:")
|
||||
|
||||
for ver in ["6.0.0", "6.0.2"]:
|
||||
depends_on("hipcc", when=f"@{ver}")
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"hipcc@{ver}", when=f"@{ver}")
|
||||
|
||||
# roc-obj-ls requirements
|
||||
depends_on("perl-file-which")
|
||||
@ -184,6 +198,7 @@ class Hip(CMakePackage):
|
||||
)
|
||||
# Add hip-clr sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("6.1.0", "49b23eef621f4e8e528bb4de8478a17436f42053a2f7fde21ff221aa683205c7"),
|
||||
("6.0.2", "cb8ac610c8d4041b74fb3129c084f1e7b817ce1a5a9943feca1fa7531dc7bdcc"),
|
||||
("6.0.0", "798b55b5b5fb90dd19db54f136d8d8e1da9ae1e408d5b12b896101d635f97e50"),
|
||||
("5.7.1", "c78490335233a11b4d8a5426ace7417c555f5e2325de10422df06c0f0f00f7eb"),
|
||||
@ -207,13 +222,13 @@ class Hip(CMakePackage):
|
||||
"https://github.com/ROCm/clr/commit/c4f773db0b4ccbbeed4e3d6c0f6bff299c2aa3f0.patch?full_index=1",
|
||||
sha256="5bb9b0e08888830ccf3a0a658529fe25f4ee62b5b8890f349bf2cc914236eb2f",
|
||||
working_dir="clr",
|
||||
when="@5.7:",
|
||||
when="@5.7:6.0",
|
||||
)
|
||||
patch(
|
||||
"https://github.com/ROCm/clr/commit/7868876db742fb4d44483892856a66d2993add03.patch?full_index=1",
|
||||
sha256="7668b2a710baf4cb063e6b00280fb75c4c3e0511575e8298a9c7ae5143f60b33",
|
||||
working_dir="clr",
|
||||
when="@5.7:",
|
||||
when="@5.7:6.0",
|
||||
)
|
||||
|
||||
# Add hipcc sources thru the below
|
||||
@ -234,6 +249,7 @@ class Hip(CMakePackage):
|
||||
)
|
||||
# Add hiptests sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("6.1.0", "cf3a6a7c43116032d933cc3bc88bfc4b17a4ee1513c978e751755ca11a5ed381"),
|
||||
("6.0.2", "740ca064f4909c20d83226a63c2f164f7555783ec5f5f70be5bc23d3587ad829"),
|
||||
("6.0.0", "e8f92a0f5d1f6093ca1fb24ff1b7140128900fcdc6e9f01f153d6907e5c2d807"),
|
||||
("5.7.1", "28fbdf49f405adfee903bc0f05a43ac392c55b34c514c3582dfb7d6d67e79985"),
|
||||
@ -276,9 +292,10 @@ class Hip(CMakePackage):
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.5.5.0.patch", when="@5.5")
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.5.6.0.patch", when="@5.6.0:5.6")
|
||||
patch("0014-Remove-compiler-rt-linkage-for-host-for-5.7.0.patch", when="@5.7.0:5.7")
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.6.0.patch", when="@6.0:")
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.6.0.patch", when="@6.0")
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.6.1.patch", when="@6.1")
|
||||
patch("0015-reverting-operator-mixup-fix-for-slate.patch", when="@5.6:6.0")
|
||||
patch("0018-reverting-hipMemoryType-with-memoryType.patch", when="@6.0")
|
||||
patch("0018-reverting-hipMemoryType-with-memoryType.patch", when="@6.0:")
|
||||
|
||||
# See https://github.com/ROCm/HIP/pull/3206
|
||||
patch(
|
||||
|
||||
@ -24,6 +24,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="5f8193c4ef0508967e608a8adf86d63066a984c5803a4d05dd617021d6298091")
|
||||
version("6.0.2", sha256="10c1b6c1deb0f225c0fb6b2bb88398a32cd0d32d3ffce9b5c8df9db2cf88d25c")
|
||||
version("6.0.0", sha256="8fbd0c244fe82eded866e06d2399b1d91ab5d43d2ebcb73382c7ce1ae48d9cb3")
|
||||
version("5.7.1", sha256="794e9298f48ffbe3bd1c1ab87a5c2c2b953713500155fdec9ef8cbb11f81fc8a")
|
||||
@ -72,7 +73,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
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"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-cmake@{ver}", when=f"+rocm @{ver}")
|
||||
|
||||
depends_on("hip +cuda", when="+cuda")
|
||||
@ -95,6 +96,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
diff --git a/amd/hipcc/bin/hipcc.pl b/amd/hipcc/bin/hipcc.pl
|
||||
index 513a427..ffeafaa 100755
|
||||
--- a/amd/hipcc/bin/hipcc.pl
|
||||
+++ b/amd/hipcc/bin/hipcc.pl
|
||||
@@ -160,11 +160,15 @@ if ($HIP_PLATFORM eq "amd") {
|
||||
if($isWindows) {
|
||||
$execExtension = ".exe";
|
||||
}
|
||||
- $HIPCC=get_normalized_path("$HIP_CLANG_PATH/clang++" . $execExtension);
|
||||
+ # llvm_path is set inside the hip recipe
|
||||
+ $LLVM_PATH= $ENV{'LLVM_PATH'};
|
||||
+ $HIPCC="${LLVM_PATH}/bin/clang++" . $execExtension;
|
||||
+
|
||||
|
||||
# If $HIPCC clang++ is not compiled, use clang instead
|
||||
if ( ! -e $HIPCC ) {
|
||||
- $HIPCC=get_normalized_path("$HIP_CLANG_PATH/clang" . $execExtension);
|
||||
+ $LLVM_PATH= $ENV{'LLVM_PATH'};
|
||||
+ $HIPCC="${LLVM_PATH}/bin/clang" . $execExtension;
|
||||
$HIPLDFLAGS = "--driver-mode=g++";
|
||||
}
|
||||
# to avoid using dk linker or MSVC linker
|
||||
@@ -484,7 +488,8 @@ if($HIP_PLATFORM eq "amd"){
|
||||
$targetsStr = $ENV{HCC_AMDGPU_TARGET};
|
||||
} elsif (not $isWindows) {
|
||||
# Else try using rocm_agent_enumerator
|
||||
- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator";
|
||||
+ $ROCMINFO_PATH = $ENV{'ROCMINFO_PATH'} // $ROCMINFO_PATH;
|
||||
+ $ROCM_AGENT_ENUM = "${ROCMINFO_PATH}/bin/rocm_agent_enumerator";
|
||||
$targetsStr = `${ROCM_AGENT_ENUM} -t GPU`;
|
||||
$targetsStr =~ s/\n/,/g;
|
||||
}
|
||||
@ -13,12 +13,19 @@ class Hipcc(CMakePackage):
|
||||
|
||||
homepage = "https://github.com/ROCm/hipcc"
|
||||
git = "https://github.com/ROCm/hipcc.git"
|
||||
url = "https://github.com/ROCm/HIPCC/archive/refs/tags/rocm-6.0.2.tar.gz"
|
||||
|
||||
def url_for_version(self, version):
|
||||
if version <= Version("6.0.2"):
|
||||
url = "https://github.com/ROCm/HIPCC/archive/rocm-{0}.tar.gz"
|
||||
else:
|
||||
url = "https://github.com/ROCm/llvm-project/archive/rocm-{0}.tar.gz"
|
||||
return url.format(version)
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "afzpatel")
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.1.0", sha256="6bd9912441de6caf6b26d1323e1c899ecd14ff2431874a2f5883d3bc5212db34")
|
||||
version("6.0.2", sha256="d6209b14fccdd00d7231dec4b4f962aa23914b9dde389ba961370e8ba918bde5")
|
||||
version("6.0.0", sha256="e9cfaaecaf0e6ed363946439197f340c115e8e1189f96dbd716cf20245c29255")
|
||||
version("5.7.1", sha256="d47d27ef2b5de7f49cdfd8547832ac9b437a32e6fc6f0e9c1646f4b704c90aee")
|
||||
@ -26,11 +33,28 @@ class Hipcc(CMakePackage):
|
||||
|
||||
depends_on("numactl")
|
||||
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.6.0.patch", when="@6.0:")
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.6.0.patch", when="@6.0")
|
||||
patch("0014-remove-compiler-rt-linkage-for-host.6.1.patch", when="@6.1:")
|
||||
|
||||
@property
|
||||
def root_cmakelists_dir(self):
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
return "."
|
||||
else:
|
||||
return join_path("amd", "hipcc")
|
||||
|
||||
def patch(self):
|
||||
numactl = self.spec["numactl"].prefix.lib
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
with working_dir("bin"):
|
||||
filter_shebang("hipconfig")
|
||||
else:
|
||||
with working_dir("amd/hipcc/bin"):
|
||||
filter_shebang("hipconfig")
|
||||
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
with working_dir("src"):
|
||||
filter_file(" -lnuma", f" -L{numactl} -lnuma", "hipBin_amd.h")
|
||||
else:
|
||||
with working_dir("amd/hipcc/src"):
|
||||
filter_file(" -lnuma", f" -L{numactl} -lnuma", "hipBin_amd.h")
|
||||
|
||||
@ -17,6 +17,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
|
||||
license("BSD-3-Clause")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="39ac03053ecf35f1faf212e5b197b03c0104b74b0833f7cce5cf625c273ba71c")
|
||||
version("6.0.2", sha256="3f912a23dc34510cf18d9097f6eda37e01d01724975c8149c92a64c92415968c")
|
||||
version("6.0.0", sha256="8d9f6e1e3f8433a2ceae1b0efd6727c21383980077e264725d00d5fee165bd30")
|
||||
version("5.7.1", sha256="9b23a58408bc4c549d3c754196cb3e2c1a50e177ab0a286101cbea2f7f173945")
|
||||
@ -76,6 +77,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocprim@{ver}", when=f"+rocm @{ver}")
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
|
||||
@ -24,6 +24,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="1a9cf598a932192f7f12b8987d96477f09186f9a95c5a28742f9caeb81640c95")
|
||||
version("6.0.2", sha256="c0a4bac5fa9a757a19a4995fa9571328b6ee0a71e93c66a880069794d65d284a")
|
||||
version("6.0.0", sha256="44f328b7862c066459089dfe62833cb7d626c6ceb71c57d8c7d6bba45dad491e")
|
||||
version("5.7.1", sha256="33452576649df479f084076c47d0b30f6f1da34864094bce767dd9bf609f04aa")
|
||||
|
||||
@ -17,6 +17,7 @@ class Hipfort(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="70d3ccc9f3536f62686e73934f5972ed011c4df7654ed1f8e6d2d42c4289f47e")
|
||||
version("6.0.2", sha256="b60ada7474b71c1d82c700b0159bc0756dbb2808375054903710280b1677f199")
|
||||
version("6.0.0", sha256="151cf11648885db799aade0d00a7882589e7195643b02beaa251f1b2a43aceed")
|
||||
version("5.7.1", sha256="859fac509e195f3ab97c555b5f63afea325a61aae0f281cb19a970a1b533dead")
|
||||
@ -60,6 +61,7 @@ class Hipfort(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", type="build", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 02df74d..a645aa4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -184,7 +184,7 @@ if (NOT HIPIFY_CLANG_TESTS_ONLY)
|
||||
# Install all folders under clang/version/ in CMAKE_INSTALL_PREFIX path.
|
||||
install(
|
||||
DIRECTORY ${LLVM_DIR}/../../clang/${LIB_CLANG_RES}/
|
||||
- DESTINATION .
|
||||
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
||||
COMPONENT clang-resource-headers
|
||||
FILES_MATCHING
|
||||
PATTERN "*.h"
|
||||
@@ -199,7 +199,7 @@ if (NOT HIPIFY_CLANG_TESTS_ONLY)
|
||||
# install all folders under clang/version/ in CMAKE_INSTALL_PREFIX path
|
||||
install(
|
||||
DIRECTORY ${LLVM_DIR}/../../clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/
|
||||
- DESTINATION .
|
||||
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
||||
COMPONENT clang-resource-headers
|
||||
FILES_MATCHING
|
||||
PATTERN "*.h"
|
||||
@ -20,6 +20,7 @@ class HipifyClang(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="dc61b476081750130c62c7540fce49ee3a45a2b74e185d20049382574c1842d1")
|
||||
version("6.0.2", sha256="21e46276677ec8c00e61c0cbf5fa42185517f6af0d4845ea877fd40eb35198c4")
|
||||
version("6.0.0", sha256="91bed2b72a6684a04e078e50b12b36b93f64ff96523283f4e5d9a33c11e6b967")
|
||||
version("5.7.1", sha256="43121e62233dab010ab686d6805bc2d3163f0dc5e89cc503d50c4bcd59eeb394")
|
||||
@ -45,7 +46,8 @@ class HipifyClang(CMakePackage):
|
||||
# this will fix the issue https://github.com/spack/spack/issues/30711
|
||||
|
||||
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:")
|
||||
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:")
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
for ver in [
|
||||
@ -66,11 +68,12 @@ class HipifyClang(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
def setup_run_environment(self, env):
|
||||
|
||||
@ -24,6 +24,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="f9d71af23092f8faa888d2c14713ee4d4d350454818ca9331d422c81c2587c1f")
|
||||
version("6.0.2", sha256="cb6ff8f58c024b60b3914271921f58f0ab3bdbc9889a53795b40c99c9de0bcd4")
|
||||
version("6.0.0", sha256="7e06c98f9da7c0b20b55b2106cf3a48b9ef6577a79549a455667ae97bd15b61d")
|
||||
version("5.7.1", sha256="81a9f5f0960dce125ce1ab1c7eb58bb07c8756346f9e46a1cc65aa61d5a114f8")
|
||||
@ -94,6 +95,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
From 9adfbf77cff336a0fa01b15e74e4c812302698e8 Mon Sep 17 00:00:00 2001
|
||||
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
|
||||
Date: Mon, 6 May 2024 18:39:02 +0000
|
||||
Subject: [PATCH] suite-sparse include and library path
|
||||
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
library/src/CMakeLists.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 95a2393..5dd88bb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -88,6 +88,7 @@ include( ROCMPackageConfigHelpers )
|
||||
include( ROCMInstallSymlinks )
|
||||
include( ROCMClients )
|
||||
include( ROCMHeaderWrapper )
|
||||
+include_directories(${SUITE_SPARSE_PATH}/include)
|
||||
|
||||
set ( VERSION_STRING "2.1.0" )
|
||||
rocm_setup_version( VERSION ${VERSION_STRING} )
|
||||
diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
|
||||
index ab448f4..a0f877d 100644
|
||||
--- a/library/src/CMakeLists.txt
|
||||
+++ b/library/src/CMakeLists.txt
|
||||
@@ -135,7 +135,7 @@ if( NOT USE_CUDA )
|
||||
endif( )
|
||||
endif( )
|
||||
|
||||
- target_link_libraries( hipsolver PRIVATE roc::rocsparse suitesparseconfig cholmod )
|
||||
+ target_link_libraries( hipsolver PRIVATE roc::rocsparse ${SUITE_SPARSE_PATH}/lib64/libsuitesparseconfig.so ${SUITE_SPARSE_PATH}/lib64/libcholmod.so )
|
||||
target_include_directories( hipsolver
|
||||
SYSTEM PRIVATE
|
||||
$<BUILD_INTERFACE:/usr/include/suitesparse/>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -28,6 +28,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="3cb89ca486cdbdfcb1a07c35ee65f60219ef7bc62a5b0f94ca1a3206a0106495")
|
||||
version("6.0.2", sha256="8215e55c3a5bc9c7eeb141cefdc6a6eeba94d8bc3aeae9e685ab7904965040d4")
|
||||
version("6.0.0", sha256="385849db02189d5e62096457e52ae899ae5c1ae7d409dc1da61f904d8861b48c")
|
||||
version("5.7.1", sha256="5592e965c0dc5722931302289643d1ece370220af2c7afc58af97b3395295658")
|
||||
@ -73,6 +74,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
variant("asan", default=False, description="Build with address-sanitizer enabled or disabled")
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
depends_on("suite-sparse", type="build")
|
||||
|
||||
depends_on("rocm-cmake@5.2.0:", type="build", when="@5.2.0:")
|
||||
depends_on("rocm-cmake@4.5.0:", type="build")
|
||||
@ -97,6 +99,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
@ -109,6 +112,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")
|
||||
|
||||
def check(self):
|
||||
exe = join_path(self.build_directory, "clients", "staging", "hipsolver-test")
|
||||
@ -133,6 +137,8 @@ def cmake_args(self):
|
||||
args = [
|
||||
self.define("BUILD_CLIENTS_SAMPLES", "OFF"),
|
||||
self.define("BUILD_CLIENTS_TESTS", self.run_tests),
|
||||
self.define("SUITE_SPARSE_PATH", self.spec["suite-sparse"].prefix),
|
||||
self.define("ROCBLAS_PATH", self.spec["rocblas"].prefix),
|
||||
]
|
||||
|
||||
args.append(self.define_from_variant("USE_CUDA", "cuda"))
|
||||
|
||||
@ -21,6 +21,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
|
||||
libraries = ["libhipsparse"]
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="1d9277a11f71474ea4a9f8419a7a2c37170a86969584e5724e385ec74241e565")
|
||||
version("6.0.2", sha256="40c1d2493f87c686d9afd84a00321ad10ca0d0d80d6dcfeee8e51858dd1bd8c1")
|
||||
version("6.0.0", sha256="718a5f03b6a579c0542a60d00f5688bec53a181b429b7ee8ce3c8b6c4a78d754")
|
||||
version("5.7.1", sha256="16c3818260611226c3576d8d55ad8f51e0890d2473503edf2c9313250ae65ca7")
|
||||
@ -81,6 +82,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"rocsparse@{ver}", when=f"+rocm @{ver}")
|
||||
|
||||
@ -24,6 +24,7 @@ class HsaRocrDev(CMakePackage):
|
||||
libraries = ["libhsa-runtime64"]
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="50386ebcb7ff24449afa2a10c76a059597464f877225c582ba3e097632a43f9c")
|
||||
version("6.0.2", sha256="e7ff4d7ac35a2dd8aad1cb40b96511a77a9c23fe4d1607902328e53728e05c28")
|
||||
version("6.0.0", sha256="99e8fa1af52d0bf382f28468e1a345af1ff3452c35914a6a7b5eeaf69fc568db")
|
||||
version("5.7.1", sha256="655e9bfef4b0b6ad3f9b89c934dc0a8377273bb0bccbda6c399ac5d5d2c1c04c")
|
||||
@ -75,6 +76,7 @@ class HsaRocrDev(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
@ -82,7 +84,7 @@ class HsaRocrDev(CMakePackage):
|
||||
# allow standalone rocm-device-libs (useful for aomp)
|
||||
depends_on(f"rocm-device-libs@{ver}", when=f"@{ver} ^llvm-amdgpu ~rocm-device-libs")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
patch("0002-Remove-explicit-RPATH-again.patch", when="@3.7.0:5.6")
|
||||
@ -125,8 +127,10 @@ def cmake_args(self):
|
||||
|
||||
if self.spec.satisfies("@5.6:"):
|
||||
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
|
||||
if self.spec.satisfies("@6.0:"):
|
||||
if self.spec.satisfies("@6.0"):
|
||||
args.append(self.define("ROCM_PATCH_VERSION", "60000"))
|
||||
if self.spec.satisfies("@6.1"):
|
||||
args.append(self.define("ROCM_PATCH_VERSION", "60100"))
|
||||
if self.spec.satisfies("@5.7.0:"):
|
||||
args.append(self.define_from_variant("ADDRESS_SANITIZER", "asan"))
|
||||
|
||||
|
||||
@ -22,6 +22,7 @@ class HsakmtRoct(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="1085055068420821f7a7adb816692412b5fb38f89d67b9edb9995198f39e2f31")
|
||||
version("6.0.2", sha256="5354bda9382f80edad834463f2c684289841770a4f7b13f0f40bd8271cc4c71d")
|
||||
version("6.0.0", sha256="9f4e80bd0a714ce45326941b906a62298c62025eff186dc6c48282ce84c787c7")
|
||||
version("5.7.1", sha256="38bc3732886a52ca9cd477ec6fcde3ab17a0ba5dc8e2f7ac34c4de597bd00e8b")
|
||||
@ -52,7 +53,7 @@ class HsakmtRoct(CMakePackage):
|
||||
for ver in ["5.3.0", "5.4.0", "5.4.3"]:
|
||||
depends_on(f"llvm-amdgpu@{ver}", type="test", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", type="test", when=f"@{ver}")
|
||||
|
||||
|
||||
@ -23,6 +23,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage):
|
||||
license("Apache-2.0")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("6.1.0", sha256="6bd9912441de6caf6b26d1323e1c899ecd14ff2431874a2f5883d3bc5212db34")
|
||||
version("6.0.2", sha256="7d35acc84de1adee65406f92a369a30364703f84279241c444cd93a48c7eeb76")
|
||||
version("6.0.0", sha256="c673708d413d60ca8606ee75c77e9871b6953c59029c987b92f2f6e85f683626")
|
||||
version("5.7.1", sha256="6b54c422e45ad19c9bf5ab090ec21753e7f7d854ca78132c30eb146657b168eb")
|
||||
@ -96,7 +97,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage):
|
||||
patch(
|
||||
"https://github.com/ROCm/llvm-project/commit/444d1d12bbc0269fed5451fb1a9110a049679ca5.patch?full_index=1",
|
||||
sha256="b4774ca19b030890d7b276d12c446400ccf8bc3aa724c7f2e9a73531a7400d69",
|
||||
when="@6.0",
|
||||
when="@6.0:",
|
||||
)
|
||||
|
||||
conflicts("^cmake@3.19.0")
|
||||
@ -140,6 +141,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage):
|
||||
when="@master +rocm-device-libs",
|
||||
)
|
||||
for d_version, d_shasum in [
|
||||
("6.1.0", "50386ebcb7ff24449afa2a10c76a059597464f877225c582ba3e097632a43f9c"),
|
||||
("6.0.2", "e7ff4d7ac35a2dd8aad1cb40b96511a77a9c23fe4d1607902328e53728e05c28"),
|
||||
("6.0.0", "99e8fa1af52d0bf382f28468e1a345af1ff3452c35914a6a7b5eeaf69fc568db"),
|
||||
("5.7.1", "655e9bfef4b0b6ad3f9b89c934dc0a8377273bb0bccbda6c399ac5d5d2c1c04c"),
|
||||
@ -202,15 +204,17 @@ def cmake_args(self):
|
||||
self.define("LLVM_ENABLE_RTTI", "ON"),
|
||||
self.define("LLVM_TARGETS_TO_BUILD", "AMDGPU;X86"),
|
||||
self.define("LLVM_AMDGPU_ALLOW_NPI_TARGETS", "ON"),
|
||||
self.define("LLVM_ENABLE_RUNTIMES", llvm_runtimes),
|
||||
self.define("LLVM_ENABLE_PROJECTS", llvm_projects),
|
||||
self.define("PACKAGE_VENDOR", "AMD"),
|
||||
self.define("CLANG_ENABLE_AMDCLANG", "ON"),
|
||||
]
|
||||
|
||||
# Enable rocm-device-libs as a external project
|
||||
if "+rocm-device-libs" in self.spec:
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
dir = os.path.join(self.stage.source_path, "rocm-device-libs")
|
||||
elif self.spec.satisfies("@6.1:"):
|
||||
dir = os.path.join(self.stage.source_path, "amd/device-libs")
|
||||
|
||||
args.extend(
|
||||
[
|
||||
self.define("LLVM_EXTERNAL_PROJECTS", "device-libs"),
|
||||
@ -233,15 +237,29 @@ def cmake_args(self):
|
||||
if self.spec.satisfies("@5.5.0:"):
|
||||
args.append("-DCLANG_DEFAULT_RTLIB=compiler-rt")
|
||||
args.append("-DCLANG_DEFAULT_UNWINDLIB=libgcc")
|
||||
if self.spec.satisfies("@5.5.0:"):
|
||||
args.append("-DCLANG_DEFAULT_RTLIB=compiler-rt")
|
||||
args.append("-DCLANG_DEFAULT_UNWINDLIB=libgcc")
|
||||
if self.spec.satisfies("@5.6.0:6.0"):
|
||||
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:"):
|
||||
hsainc_path = os.path.join(self.stage.source_path, "hsa-runtime/src/inc")
|
||||
comgrinc_path = os.path.join(self.stage.source_path, "comgr/lib/comgr/include")
|
||||
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")
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
args.append(self.define("LLVM_ENABLE_PROJECTS", llvm_projects))
|
||||
args.append(self.define("LLVM_ENABLE_RUNTIMES", llvm_runtimes))
|
||||
elif self.spec.satisfies("@6.1:"):
|
||||
llvm_projects.remove("compiler-rt")
|
||||
llvm_runtimes.extend(["compiler-rt", "libunwind"])
|
||||
args.append(self.define("LLVM_ENABLE_PROJECTS", llvm_projects))
|
||||
args.append(self.define("LLVM_ENABLE_RUNTIMES", llvm_runtimes))
|
||||
args.append(self.define("LLVM_ENABLE_LIBCXX", "OFF"))
|
||||
args.append(self.define("CLANG_LINK_FLANG_LEGACY", False))
|
||||
args.append(self.define("CMAKE_CXX_STANDARD", 17))
|
||||
args.append(self.define("FLANG_INCLUDE_DOCS", False))
|
||||
args.append(self.define("LLVM_BUILD_DOCS", "ON"))
|
||||
args.append(self.define("CLANG_DEFAULT_PIE_ON_LINUX", "OFF"))
|
||||
return args
|
||||
|
||||
compiler_languages = ["c", "cxx", "fortran"]
|
||||
|
||||
@ -20,6 +20,7 @@ class Migraphx(CMakePackage):
|
||||
libraries = ["libmigraphx"]
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="2ba44146397624845c64f3898bb1b08837ad7a49f133329e58eb04c05d1f36ac")
|
||||
version("6.0.2", sha256="13f393f8fdf25275994dda07091a93eec867233cd2f99f9cb0df16fbabd53483")
|
||||
version("6.0.0", sha256="7bb3f5011da9b1f3b79707b06118c523c1259215f650c2ffa5622a7e1d88868f")
|
||||
version("5.7.1", sha256="3e58c043a5a7d1357ee05725fd6cd41e190b070f1ba57f61300128429902089c")
|
||||
@ -90,6 +91,7 @@ class Migraphx(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -97,7 +99,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"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocmlir@{ver}", when=f"@{ver}")
|
||||
|
||||
@property
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From 1693afd9690b97fcceff09ffce765712e3c7361a Mon Sep 17 00:00:00 2001
|
||||
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
|
||||
Date: Mon, 29 Apr 2024 08:01:47 +0000
|
||||
Subject: [PATCH] Adding roctracer-dev include and library path
|
||||
|
||||
---
|
||||
src/CMakeLists.txt | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 0741a60..84b6805 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -739,6 +739,9 @@ if(WIN32)
|
||||
endif()
|
||||
|
||||
target_include_directories(MIOpen SYSTEM PUBLIC $<BUILD_INTERFACE:${HALF_INCLUDE_DIR}>)
|
||||
+target_include_directories(MIOpen SYSTEM PUBLIC "${NLOHMANN_JSON_INCLUDE}")
|
||||
+target_include_directories(MIOpen SYSTEM PUBLIC "${ROCTRACER_INCLUDE_DIR}")
|
||||
+target_include_directories(MIOpen SYSTEM PUBLIC "${SQLITE_INCLUDE_DIR}")
|
||||
# Workaround : change in rocm-cmake was causing linking error so had to add ${CMAKE_DL_LIBS}
|
||||
# We can remove ${CMAKE_DL_LIBS} once root cause is identified.
|
||||
target_link_libraries(MIOpen PRIVATE ${CMAKE_DL_LIBS} Threads::Threads BZip2::BZip2 ${MIOPEN_CK_LINK_FLAGS})
|
||||
@@ -861,7 +864,7 @@ if(NOT WIN32 AND NOT APPLE)
|
||||
endif()
|
||||
|
||||
if(MIOPEN_USE_ROCTRACER)
|
||||
- target_link_libraries(MIOpen PRIVATE roctx64)
|
||||
+ target_link_libraries(MIOpen PRIVATE "${ROCTRACER_LIB_DIR}/libroctx64.so")
|
||||
endif()
|
||||
|
||||
############################################################
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -21,6 +21,7 @@ class MiopenHip(CMakePackage):
|
||||
libraries = ["libMIOpen"]
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="3b373117eaeaf618aab9b39bb22e9950fd49bd0e264c8587b0c51fa348afe0d1")
|
||||
version("6.0.2", sha256="e6f671bd6af59f7470f42cda2ff9e77441d8f6c2105772bbf855d31da1085ffa")
|
||||
version("6.0.0", sha256="a0718a48353be30ff98118ade511f0c1b454e394d8f934aefe7dd6946562b2e9")
|
||||
version("5.7.1", sha256="912a658fe21ce6f1982b0f2ff251c3f7bb618f2e7e9876d983bcb54e3cd7129e")
|
||||
@ -55,6 +56,7 @@ class MiopenHip(CMakePackage):
|
||||
|
||||
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("0002-add-include-dir-miopen-hip-6.1.0.patch", when="@6.1")
|
||||
patch(
|
||||
"https://github.com/ROCm/MIOpen/pull/2276/commits/f60aa1ff89f8fb596b4a6a4c70aa7d557803db87.patch?full_index=1",
|
||||
sha256="c777d9f4cd2bbfec632b38620c0f70bb0cce8da1",
|
||||
@ -79,6 +81,7 @@ class MiopenHip(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -88,14 +91,16 @@ class MiopenHip(CMakePackage):
|
||||
for ver in ["5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3", "5.3.0", "5.3.3"]:
|
||||
depends_on(f"mlirmiopen@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.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"]:
|
||||
for ver in ["6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on("roctracer-dev@" + ver, when="@" + ver)
|
||||
for ver in ["6.1.0"]:
|
||||
depends_on("googletest")
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
lib_dir = self.spec["zlib-api"].libs.directories[0]
|
||||
@ -155,4 +160,6 @@ def cmake_args(self):
|
||||
"-DROCTRACER_INCLUDE_DIR={0}".format(self.spec["roctracer-dev"].prefix.include)
|
||||
)
|
||||
args.append("-DROCTRACER_LIB_DIR={0}".format(self.spec["roctracer-dev"].prefix.lib))
|
||||
if self.spec.satisfies("@6.1:"):
|
||||
args.append("-DSQLITE_INCLUDE_DIR={0}".format(self.spec["sqlite"].prefix.include))
|
||||
return args
|
||||
|
||||
@ -26,6 +26,7 @@ def url_for_version(self, version):
|
||||
return url.format(version)
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="f18a72c4d12c36ab50f9c3a5c22fc3641feb11c99fed513540a16a65cd149fd1")
|
||||
version("6.0.2", sha256="e39521b3109aa0900f652ae95a4421df0fa29fd57e816268cc6602d243c50779")
|
||||
version("6.0.0", sha256="01324a12f21ea0e29a4d7d7c60498ba9231723569fedcdd90f28ddffb5e0570e")
|
||||
version("5.7.1", sha256="bfc074bc32ebe84c72149ee6abb30b5b6499023d5b98269232de82e35d0505a8")
|
||||
@ -269,6 +270,7 @@ def patch(self):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"miopen-hip@{ver}", when=f"@{ver}")
|
||||
for ver in [
|
||||
@ -283,11 +285,12 @@ def patch(self):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"migraphx@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
depends_on("python@3.5:", type="build")
|
||||
|
||||
|
||||
@ -21,6 +21,7 @@ class Rccl(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["librccl"]
|
||||
version("6.1.0", sha256="c6308f6883cbd63dceadbe4ee154cc6fa9e6bdccbd2f0fda295b564b0cf01e9a")
|
||||
version("6.0.2", sha256="5c8495acba3d620b751e729d1157e7b4eea8f5e5692c50ce47c5204d3dfd443c")
|
||||
version("6.0.0", sha256="0496d5a5f2e48c92cd390ab318df31a53cf7ec590988c2574c9f3d99c38b0fa7")
|
||||
version("5.7.1", sha256="fb4c1f0084196d1226ce8a726d0f012d3890b54508a06ca87bbda619be8b90b1")
|
||||
@ -75,6 +76,7 @@ class Rccl(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
@ -99,10 +101,11 @@ class Rccl(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
depends_on("googletest@1.11.0:", when="@5.3:")
|
||||
|
||||
@ -28,6 +28,7 @@ def url_for_version(self, version):
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.1.0", sha256="a8ad5d880645c9e95c9c90b0c9026627b22467e3e879525fff38ccd924f36c39")
|
||||
version("6.0.2", sha256="00defa3b68c340d7f46b8cb06b37ab0602a7949bfddc884b01c163a1526502f8")
|
||||
version("6.0.0", sha256="5e3847a919d5f7efe99d8d76c96e78401659eccd1fb234b1b8cb4304096d6e89")
|
||||
version("5.7.1", sha256="5251eb3085f2019246b332e9552dfae1572cf64ddf58306b81cbe7108019ffee")
|
||||
@ -50,7 +51,8 @@ def url_for_version(self, version):
|
||||
depends_on("cmake@3.15:", type="build")
|
||||
depends_on("grpc@1.28.1+shared", type="build", when="@:5.3")
|
||||
depends_on("grpc@1.44.0+shared", when="@5.4.0:5.4")
|
||||
depends_on("grpc@1.55.0+shared", when="@5.5.0:")
|
||||
depends_on("grpc@1.55.0+shared", when="@5.5.0:6.0")
|
||||
depends_on("grpc@1.59.1+shared", when="@6.1:")
|
||||
depends_on("protobuf")
|
||||
depends_on("libcap")
|
||||
|
||||
@ -72,6 +74,7 @@ def url_for_version(self, version):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-smi-lib@{ver}", type=("build", "link"), when=f"@{ver}")
|
||||
|
||||
@ -93,10 +96,11 @@ def url_for_version(self, version):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
def patch(self):
|
||||
|
||||
@ -27,6 +27,7 @@ class Rocalution(CMakePackage):
|
||||
|
||||
license("MIT")
|
||||
|
||||
version("6.1.0", sha256="699a9b73844fcd4e30d0607b4042dc779f9bcdc27ad732e7a038968ff555af2b")
|
||||
version("6.0.2", sha256="453f889677728b510286d4c72952b343cac63c45e2cb8b801d8388a2ec599d2a")
|
||||
version("6.0.0", sha256="cabf37691b8db00c82bda49c7dcfaefd9b9067b7d097afa43b7a5f86c45bff99")
|
||||
version("5.7.1", sha256="b95afa1285759843c5fea1ad6e1c1edf283922e0d448db03a3e1f42b6942bc24")
|
||||
@ -75,6 +76,7 @@ class Rocalution(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocprim@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -23,6 +23,7 @@ class Rocblas(CMakePackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="af00357909da60d82618038aa9a3cc1f9d4ce1bdfb54db20ec746b592d478edf")
|
||||
version("6.0.2", sha256="d1bf31063a2d349797b88c994c91d05f94e681bafb5550ad9b53529703d89dbb")
|
||||
version("6.0.0", sha256="befa4a75f1de0ea37f2358d4c2de5406d7bce671ca9936e2294b64d3b3bafb60")
|
||||
version("5.7.1", sha256="2984a5ed0ea5a05d40996ee3fddecb24399cbe8ea3e4921fc254e54d8f52fe4f")
|
||||
@ -62,7 +63,7 @@ class Rocblas(CMakePackage):
|
||||
depends_on("googletest@1.10.0:", type="test")
|
||||
depends_on("amdblis", type="test")
|
||||
|
||||
for ver in ["5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"@{ver}")
|
||||
|
||||
depends_on("rocm-cmake@master", type="build", when="@master:")
|
||||
@ -86,6 +87,7 @@ class Rocblas(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", type="build", when=f"@{ver}")
|
||||
@ -123,6 +125,7 @@ class Rocblas(CMakePackage):
|
||||
("@5.7.1", "97e0cfc2c8cb87a1e38901d99c39090dc4181652"),
|
||||
("@6.0.0", "17df881bde80fc20f997dfb290f4bb4b0e05a7e9"),
|
||||
("@6.0.2", "17df881bde80fc20f997dfb290f4bb4b0e05a7e9"),
|
||||
("@6.1.0", "2b55ccf58712f67b3df0ca53b0445f094fcb96b2"),
|
||||
]:
|
||||
resource(
|
||||
name="Tensile",
|
||||
|
||||
@ -20,6 +20,7 @@ class Rocfft(CMakePackage):
|
||||
libraries = ["librocfft"]
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="9e6643174a2b0f376127f43454e78d4feba6fac695d4cda9796da50005ecac66")
|
||||
version("6.0.2", sha256="d3e1f7a4dc661f1e5ffce02e2e01ae6c3c339bac8e93deaf175e4c03ddfea459")
|
||||
version("6.0.0", sha256="fb8ba56572702e77e4383d922cd1fee4ad3fa5f63a5ebdb3d9c354439a446992")
|
||||
version("5.7.1", sha256="202f11f60dc8738e29bbd1b397d419e032794f8bffb7f48f2b31f09cc5f08bc2")
|
||||
@ -83,6 +84,7 @@ class Rocfft(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
|
||||
@ -18,6 +18,7 @@ class RocmBandwidthTest(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="b06522efbd1a55247412c8f535321058e2463eab4abd25505c37e8c67941ae26")
|
||||
version("6.0.2", sha256="af95fe84729701184aeb14917cee0d8d77ab1858ddcced01eb7380401e2134ae")
|
||||
version("6.0.0", sha256="9023401bd6a896059545b8e6263c6730afd89d7d45c0f5866261c300415532a6")
|
||||
version("5.7.1", sha256="7426ef1e317b8293e4d6389673cfa8c63efb3f7d061e2f50a6f0b1b706e2a2a7")
|
||||
@ -57,12 +58,13 @@ class RocmBandwidthTest(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.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", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
build_targets = ["package"]
|
||||
|
||||
@ -18,6 +18,7 @@ class RocmClangOcl(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="c983adad49ab5850307db1282f8bc957b9870d4ce37db8fbb43c52db6c90d0ed")
|
||||
version("6.0.2", sha256="a2f2fcb203737b1f436b4c2b78bbd696552f6de619ba0e7e8faf95a888869866")
|
||||
version("6.0.0", sha256="74b5a64c32f3c57e7e4de638fffabbf448ecdb3dd8e65678b7ba0633352b4ca3")
|
||||
version("5.7.1", sha256="32e4430d009cbbf5404ca9cbbb549b36897fa1826bc2285372e293cfe7531bf8")
|
||||
@ -57,6 +58,7 @@ class RocmClangOcl(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
@ -64,7 +66,7 @@ class RocmClangOcl(CMakePackage):
|
||||
|
||||
# support both builtin and standalone device libs
|
||||
depends_on(f"rocm-device-libs@{ver}", when=f"@{ver} ^llvm-amdgpu ~rocm-device-libs")
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
test_src_dir = "test"
|
||||
|
||||
@ -21,6 +21,7 @@ class RocmCmake(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="8b37d458e801b486521f12d18ca2103125173dd0f1130d37c8c36e795d34772b")
|
||||
version("6.0.2", sha256="7bd3ff971b1a898b8cf06b0ed9fac45891e2523ae651c3194ba36050ab45f869")
|
||||
version("6.0.0", sha256="82bd97ba23d1883ef38bb667e92f7367fedc50d6c11c82f54cced4ab04b0412d")
|
||||
version("5.7.1", sha256="4a4c6aa09576ccb834f869bdcb49e98cc0f0bac3678b802358065d1179a9d6f1")
|
||||
@ -42,7 +43,7 @@ class RocmCmake(CMakePackage):
|
||||
|
||||
depends_on("cmake@3.6:", type="build")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
test_src_dir = "test"
|
||||
|
||||
@ -20,6 +20,7 @@ class RocmCore(CMakePackage):
|
||||
libraries = ["librocm-core"]
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="9dfe542d1647c42993b06f594c316dad63ba6d6fb2a7398bd72c5768fd1d7b5b")
|
||||
version("6.0.2", sha256="04f01dca2862f0bf781de8afb74aabefc3c9b1d9f01bc8cadb2eb3d7395119cc")
|
||||
version("6.0.0", sha256="d950ee4b63336f34579b6e1dda2d05966b7afa9c84bcdc13874991d1147dc788")
|
||||
version("5.7.1", sha256="fc4915019ddfd126e8ef6a15006bce3aa7bd5fd11dc8eb04ce2ee6bdf9c6ae7f")
|
||||
|
||||
@ -25,6 +25,7 @@ class RocmDbgapi(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
version("master", branch="amd-master")
|
||||
version("6.1.0", sha256="0985405b6fd44667a7ce8914aa39a7e651613e037e649fbdbfa2adcf744a2d50")
|
||||
version("6.0.2", sha256="39036f083de421f46afd8d3a8799576242ef64002643d7185767ccbba41ae854")
|
||||
version("6.0.0", sha256="4e823eba255e46b93aff05fd5938ef2a51693ffd74debebffc1aabfce613805c")
|
||||
version("5.7.1", sha256="0ee9c2f083868849f2ea0cec7010e0270c27e7679ccbbadd12072cc0ef6c8a6f")
|
||||
@ -65,12 +66,13 @@ class RocmDbgapi(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", type="build", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", type=("build", "link"), when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
@classmethod
|
||||
|
||||
@ -18,6 +18,7 @@ class RocmDebugAgent(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["librocm-debug-agent"]
|
||||
version("6.1.0", sha256="f52700563e490d662b505693d485272d73521aabff306107586dd1149fb4a70e")
|
||||
version("6.0.2", sha256="da8da1241a6cbb9d0b2a3b81829faf632225a7a27ca881c9715b9f05bca54c89")
|
||||
version("6.0.0", sha256="705be2c2bd0f5c7d1e286eb9b94045b2bd017ff323f07bca9aa7c81f2d168524")
|
||||
version("5.7.1", sha256="3b8d2835935da98f41e7cfc5b808c596ac06dd705b9a07bb70283e002f8dea6a")
|
||||
@ -58,6 +59,7 @@ class RocmDebugAgent(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
@ -80,11 +82,12 @@ class RocmDebugAgent(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-dbgapi@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
# https://github.com/ROCm/rocr_debug_agent/pull/4
|
||||
|
||||
@ -12,12 +12,20 @@ class RocmDeviceLibs(CMakePackage):
|
||||
|
||||
homepage = "https://github.com/ROCm/ROCm-Device-Libs"
|
||||
git = "https://github.com/ROCm/ROCm-Device-Libs.git"
|
||||
url = "https://github.com/ROCm/ROCm-Device-Libs/archive/rocm-6.0.2.tar.gz"
|
||||
|
||||
def url_for_version(self, version):
|
||||
if version <= Version("6.0.2"):
|
||||
url = "https://github.com/ROCm/ROCm-Device-Libs/archive/rocm-{0}.tar.gz"
|
||||
else:
|
||||
url = "https://github.com/ROCm/llvm-project/archive/rocm-{0}.tar.gz"
|
||||
return url.format(version)
|
||||
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("6.1.0", sha256="6bd9912441de6caf6b26d1323e1c899ecd14ff2431874a2f5883d3bc5212db34")
|
||||
version("6.0.2", sha256="c6d88b9b46e39d5d21bd5a0c1eba887ec473a370b1ed0cebd1d2e910eedc5837")
|
||||
version("6.0.0", sha256="198df4550d4560537ba60ac7af9bde31d59779c8ec5d6309627f77a43ab6ef6f")
|
||||
version("5.7.1", sha256="703de8403c0bd0d80f37c970a698f10f148daf144d34f982e4484d04f7c7bbef")
|
||||
@ -66,13 +74,21 @@ class RocmDeviceLibs(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
@property
|
||||
def root_cmakelists_dir(self):
|
||||
if self.spec.satisfies("@:6.0"):
|
||||
return "."
|
||||
else:
|
||||
return join_path("amd", "device-libs")
|
||||
|
||||
def cmake_args(self):
|
||||
spec = self.spec
|
||||
return [
|
||||
|
||||
@ -18,6 +18,7 @@ class RocmGdb(AutotoolsPackage):
|
||||
license("LGPL-2.0-or-later")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="e90d855ca4c1478acf143d45ff0811e7ecd068711db155de6d5f3593cdef6230")
|
||||
version("6.0.2", sha256="69b7c3d63435e7d99088980498c68422e52b69244d10a3a62541633e733286e0")
|
||||
version("6.0.0", sha256="0db4ab32ca729e69688cdb238df274ce5cf58b5cb2538584662cca4358708c2b")
|
||||
version("5.7.1", sha256="5cd150b5796aea9d77efd43b89d30a34fa4125338179eb87c6053abcac9f3c62")
|
||||
@ -47,6 +48,7 @@ class RocmGdb(AutotoolsPackage):
|
||||
depends_on("zlib-api", type="link")
|
||||
depends_on("babeltrace@1.2.4", type="link")
|
||||
depends_on("gmp", type=("build", "link"))
|
||||
depends_on("mpfr", type=("build", "link"))
|
||||
|
||||
for ver in [
|
||||
"5.1.0",
|
||||
@ -66,11 +68,12 @@ class RocmGdb(AutotoolsPackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-dbgapi@{ver}", type="link", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", type="link", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
build_directory = "spack-build"
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e8b5696..939a30b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -122,7 +122,9 @@ find_path (
|
||||
${CMAKE_BINARY_DIR}/runtime/src
|
||||
)
|
||||
|
||||
-include_directories(${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMP_OMP_TOOLS_INCLUDE_DIR})
|
||||
+include_directories(${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMP_OMP_TOOLS_INCLUDE_DIR} ${HSAKMT_INC_PATH})
|
||||
+link_directories(${HSAKMT_LIB64} ${HSAKMT_LIB} ${LIBDRM_LIB} ${NUMACTL_DIR}/lib)
|
||||
+
|
||||
|
||||
# Various LLVM_TOOLS are needed to build libomptarget
|
||||
find_package(LLVM QUIET CONFIG PATHS
|
||||
diff --git a/DeviceRTL/CMakeLists.txt b/DeviceRTL/CMakeLists.txt
|
||||
index 66ccb43..6094d65 100644
|
||||
--- a/DeviceRTL/CMakeLists.txt
|
||||
+++ b/DeviceRTL/CMakeLists.txt
|
||||
@@ -13,6 +13,9 @@
|
||||
set(LIBOMPTARGET_BUILD_DEVICERTL_BCLIB TRUE CACHE BOOL
|
||||
"Can be set to false to disable building this library.")
|
||||
|
||||
+include_directories(${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMP_OMP_TOOLS_INCLUDE_DIR} ${HSAKMT_INC_PATH})
|
||||
+link_directories(${HSAKMT_LIB64} ${HSAKMT_LIB} ${LIBDRM_LIB} ${NUMACTL_DIR}/lib)
|
||||
+
|
||||
if (NOT LIBOMPTARGET_BUILD_DEVICERTL_BCLIB)
|
||||
libomptarget_say("Not building DeviceRTL: Disabled by LIBOMPTARGET_BUILD_DEVICERTL_BCLIB")
|
||||
return()
|
||||
@ -32,6 +32,7 @@
|
||||
"ed7bbf92230b6535a353ed032a39a9f16e9987397798100392fc25e40c8a1a4e",
|
||||
"1b2c0934ef16e17b2377944fae8c9b3db6dc64b7e43932ddfe2eeefdf6821410",
|
||||
"d6e13a15d5d25990d4bacbac8fabe2eb07973829f2e69abbc628e0736f95caf9",
|
||||
"832b7c48149a730619b577a2863b8d1bf1b2551eda5b815e1865a044929ab9fa",
|
||||
]
|
||||
|
||||
devlib = [
|
||||
@ -52,6 +53,7 @@
|
||||
"703de8403c0bd0d80f37c970a698f10f148daf144d34f982e4484d04f7c7bbef",
|
||||
"198df4550d4560537ba60ac7af9bde31d59779c8ec5d6309627f77a43ab6ef6f",
|
||||
"c6d88b9b46e39d5d21bd5a0c1eba887ec473a370b1ed0cebd1d2e910eedc5837",
|
||||
"6bd9912441de6caf6b26d1323e1c899ecd14ff2431874a2f5883d3bc5212db34",
|
||||
]
|
||||
|
||||
llvm = [
|
||||
@ -72,6 +74,7 @@
|
||||
"6b54c422e45ad19c9bf5ab090ec21753e7f7d854ca78132c30eb146657b168eb",
|
||||
"c673708d413d60ca8606ee75c77e9871b6953c59029c987b92f2f6e85f683626",
|
||||
"7d35acc84de1adee65406f92a369a30364703f84279241c444cd93a48c7eeb76",
|
||||
"6bd9912441de6caf6b26d1323e1c899ecd14ff2431874a2f5883d3bc5212db34",
|
||||
]
|
||||
|
||||
flang = [
|
||||
@ -92,6 +95,7 @@
|
||||
"8fd618d81af092416b267c4d00c801731f7a00c0f8d4aedb795e52a4ec1bf183",
|
||||
"fcb319ddb2aa3004a6ae60370ab4425f529336b1cee50f29200e697e61b53586",
|
||||
"8e6469415880bb068d788596b3ed713a24495eb42788f98cca92e73a2998f703",
|
||||
"51ecd2c154568c971f5b46ff0e1e1b57063afe28d128fc88c503de88f7240267",
|
||||
]
|
||||
|
||||
extras = [
|
||||
@ -112,6 +116,7 @@
|
||||
"8060c6879708faf5f7d417b19a479dec9b7b9583a1b885f12d247faf831f7f0b",
|
||||
"f37e1107e4da5b083e794244f3d0c9fd073ccb6fd6015e635349d8f0d679c4b8",
|
||||
"b2e117d703cefdc2858adaeee5bad95e9b6dab6263a9c13891a79a7b1e2defb6",
|
||||
"57d6d9d26c0cb6ea7f8373996c41165f463ae7936d32e5793822cfae03900f8f",
|
||||
]
|
||||
|
||||
versions = [
|
||||
@ -132,6 +137,7 @@
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]
|
||||
versions_dict = dict() # type: Dict[str,Dict[str,str]]
|
||||
components = ["aomp", "devlib", "llvm", "flang", "extras"]
|
||||
@ -155,6 +161,7 @@ class RocmOpenmpExtras(Package):
|
||||
license("Apache-2.0")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "estewart08")
|
||||
version("6.1.0", sha256=versions_dict["6.1.0"]["aomp"])
|
||||
version("6.0.2", sha256=versions_dict["6.0.2"]["aomp"])
|
||||
version("6.0.0", sha256=versions_dict["6.0.0"]["aomp"])
|
||||
version("5.7.1", sha256=versions_dict["5.7.1"]["aomp"])
|
||||
@ -185,7 +192,7 @@ class RocmOpenmpExtras(Package):
|
||||
depends_on("libdrm", when="@5.7:6.0")
|
||||
depends_on("numactl", when="@5.7:6.0")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in [
|
||||
@ -221,6 +228,40 @@ class RocmOpenmpExtras(Package):
|
||||
placement="rocm-device-libs",
|
||||
when=f"@{ver}",
|
||||
)
|
||||
resource(
|
||||
name="flang",
|
||||
url=f"{tools_url}/flang/archive/rocm-{ver}.tar.gz",
|
||||
sha256=versions_dict[ver]["flang"],
|
||||
expand=True,
|
||||
destination="rocm-openmp-extras",
|
||||
placement="flang",
|
||||
when=f"@{ver}",
|
||||
)
|
||||
|
||||
resource(
|
||||
name="aomp-extras",
|
||||
url=f"{tools_url}/aomp-extras/archive/rocm-{ver}.tar.gz",
|
||||
sha256=versions_dict[ver]["extras"],
|
||||
expand=True,
|
||||
destination="rocm-openmp-extras",
|
||||
placement="aomp-extras",
|
||||
when=f"@{ver}",
|
||||
)
|
||||
|
||||
resource(
|
||||
name="llvm-project",
|
||||
url=f"{compute_url}/llvm-project/archive/rocm-{ver}.tar.gz",
|
||||
sha256=versions_dict[ver]["llvm"],
|
||||
expand=True,
|
||||
destination="rocm-openmp-extras",
|
||||
placement="llvm-project",
|
||||
when=f"@{ver}",
|
||||
)
|
||||
for ver in ["6.1.0"]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
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}")
|
||||
|
||||
resource(
|
||||
name="flang",
|
||||
@ -252,6 +293,11 @@ class RocmOpenmpExtras(Package):
|
||||
when=f"@{ver}",
|
||||
)
|
||||
patch("0001-Linking-hsakmt-libdrm-and-numactl-libraries.patch", when="@5.7:6.0")
|
||||
patch(
|
||||
"0001-Linking-hsakmt-libdrm-and-numactl-libraries-6.1.patch",
|
||||
working_dir="rocm-openmp-extras/llvm-project/openmp/libomptarget",
|
||||
when="@6.1",
|
||||
)
|
||||
|
||||
def setup_run_environment(self, env):
|
||||
devlibs_prefix = self.spec["llvm-amdgpu"].prefix
|
||||
@ -301,6 +347,23 @@ def patch(self):
|
||||
aomp_extras.format(src) + "/aompextras/CMakeLists.txt",
|
||||
libomptarget.format(src) + "/deviceRTLs/amdgcn/CMakeLists.txt",
|
||||
)
|
||||
if self.spec.satisfies("@6.1"):
|
||||
filter_file(
|
||||
r"${HSAKMT_LIB_PATH}",
|
||||
"${HSAKMT_LIB_PATH} ${HSAKMT_LIB64}"
|
||||
+ "${HSAKMT_LIB} ${LIBDRM_LIB} ${NUMACTL_DIR}/lib",
|
||||
libomptarget.format(src) + "/CMakeLists.txt",
|
||||
)
|
||||
filter_file(
|
||||
r"${LIBOMPTARGET_LLVM_INCLUDE_DIRS}",
|
||||
"${LIBOMPTARGET_LLVM_INCLUDE_DIRS} ${HSAKMT_INC_PATH}",
|
||||
libomptarget.format(src) + "/../CMakeLists.txt",
|
||||
)
|
||||
filter_file(
|
||||
r"${LIBOMPTARGET_LLVM_INCLUDE_DIRS}",
|
||||
"${LIBOMPTARGET_LLVM_INCLUDE_DIRS} ${HSAKMT_INC_PATH}",
|
||||
libomptarget.format(src) + "/CMakeLists.txt",
|
||||
)
|
||||
|
||||
# Openmp adjustments
|
||||
# Fix relocation error with libffi by not using static lib.
|
||||
@ -398,10 +461,13 @@ def install(self, spec, prefix):
|
||||
gfx_list = gfx_list.replace(" ", ";")
|
||||
openmp_extras_prefix = self.spec["rocm-openmp-extras"].prefix
|
||||
devlibs_prefix = self.spec["llvm-amdgpu"].prefix
|
||||
if self.spec.satisfies("@6.1"):
|
||||
devlibs_src = "{0}/rocm-openmp-extras/llvm-project/amd/device-libs".format(src)
|
||||
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("@5.7:6.0"):
|
||||
if self.spec.satisfies("@5.7:6.1"):
|
||||
libdrm_prefix = self.spec["libdrm"].prefix
|
||||
numactl_prefix = self.spec["numactl"].prefix
|
||||
comgr_prefix = self.spec["comgr"].prefix
|
||||
@ -481,7 +547,7 @@ def install(self, spec, prefix):
|
||||
"-DNEW_BC_PATH=1",
|
||||
"-DHSA_INCLUDE={0}/include/hsa".format(hsa_prefix),
|
||||
]
|
||||
if self.spec.satisfies("@5.7:6.0"):
|
||||
if self.spec.satisfies("@5.7:6.1"):
|
||||
openmp_common_args += [
|
||||
"-DLIBDRM_LIB={0}/lib".format(libdrm_prefix),
|
||||
"-DHSAKMT_INC_PATH={0}/include".format(hsakmt_prefix),
|
||||
|
||||
@ -24,6 +24,7 @@ class RocmSmiLib(CMakePackage):
|
||||
libraries = ["librocm_smi64"]
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="d1a1b372489b27cb7eb8c91d74a71370ad9668dd5aaf89c0267172534e417e41")
|
||||
version("6.0.2", sha256="61e755d710ff38425df3d262d1ad4c510d52d3c64e3fe15140c2575eba316949")
|
||||
version("6.0.0", sha256="0053b42402fd007e5ca9b3186c70f2c6f1b3026558f328722adadc2838c51309")
|
||||
version("5.7.1", sha256="4d79cb0482b2f801cc7824172743e3dd2b44b9f6784d1ca2e5067f2fbb4ef803")
|
||||
@ -49,7 +50,7 @@ class RocmSmiLib(CMakePackage):
|
||||
depends_on("cmake@3:", type="build")
|
||||
depends_on("python@3:", type=("build", "run"))
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
patch("disable_pdf_generation_with_doxygen_and_latex.patch", when="@:5.6")
|
||||
|
||||
|
||||
@ -19,6 +19,7 @@ class RocmTensile(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
version("6.1.0", sha256="69bfdc711d3a86e6651b1dcfb2c461c7d3ae574e6d884833d4e07d3e7ad06491")
|
||||
version("6.0.2", sha256="1d8a92422560c1e908fa25fd97a4aa07a96659528a543f77618408ffcfe1f307")
|
||||
version("6.0.0", sha256="5d90add62d1439b7daf0527316e950e454e5d8beefb4f723865fe9ab26c7aa42")
|
||||
version("5.7.1", sha256="9211a51b23c22b7a79e4e494e8ff3c31e90bf21adb8cce260acc57891fb2c917")
|
||||
@ -80,6 +81,7 @@ class RocmTensile(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"rocm-cmake@{ver}", type="build", when=f"@{ver}")
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -0,0 +1,539 @@
|
||||
From 687438d41a42527858dc104b5fcb371d472949e2 Mon Sep 17 00:00:00 2001
|
||||
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
|
||||
Date: Tue, 7 May 2024 22:17:54 +0000
|
||||
Subject: [PATCH] Updating cmake with include and library path for spack for
|
||||
6.1
|
||||
|
||||
---
|
||||
CMakeLists.txt | 22 +++++++++++-----------
|
||||
babel.so/CMakeLists.txt | 18 +++++++++---------
|
||||
cmake_modules/tests_unit.cmake | 3 ++-
|
||||
edp.so/CMakeLists.txt | 8 ++++----
|
||||
gm.so/CMakeLists.txt | 6 +++---
|
||||
gpup.so/CMakeLists.txt | 6 +++---
|
||||
gst.so/CMakeLists.txt | 8 ++++----
|
||||
iet.so/CMakeLists.txt | 6 +++---
|
||||
mem.so/CMakeLists.txt | 6 +++---
|
||||
pbqt.so/CMakeLists.txt | 6 +++---
|
||||
pebb.so/CMakeLists.txt | 4 ++--
|
||||
peqt.so/CMakeLists.txt | 6 +++---
|
||||
perf.so/CMakeLists.txt | 8 ++++----
|
||||
pesm.so/CMakeLists.txt | 6 +++---
|
||||
rcqt.so/CMakeLists.txt | 6 +++---
|
||||
rvs/CMakeLists.txt | 18 ++++++++++--------
|
||||
rvslib/CMakeLists.txt | 2 +-
|
||||
smqt.so/CMakeLists.txt | 6 +++---
|
||||
testif.so/CMakeLists.txt | 6 +++---
|
||||
tst.so/CMakeLists.txt | 2 +-
|
||||
20 files changed, 78 insertions(+), 75 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6bce31b..f7e31c9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -74,14 +74,14 @@ 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")
|
||||
|
||||
add_definitions(-DROCM_PATH="${ROCM_PATH}")
|
||||
if(FETCH_ROCMPATH_FROM_ROCMCORE)
|
||||
@@ -447,8 +447,8 @@ 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)
|
||||
@@ -463,8 +463,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 54a0e3a..bfa0069 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})
|
||||
## 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)
|
||||
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..2d3a05b 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})
|
||||
|
||||
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
|
||||
)
|
||||
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 7dd34ea..a208bac 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})
|
||||
# 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})
|
||||
## 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)
|
||||
|
||||
## define source files
|
||||
set (SOURCES src/rvs_module.cpp src/action.cpp src/edp_worker.cpp )
|
||||
diff --git a/gm.so/CMakeLists.txt b/gm.so/CMakeLists.txt
|
||||
index d3caa84..73b83ce 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})
|
||||
## 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)
|
||||
|
||||
## 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
|
||||
diff --git a/gpup.so/CMakeLists.txt b/gpup.so/CMakeLists.txt
|
||||
index 43d337a..9b07004 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})
|
||||
## 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)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp)
|
||||
diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt
|
||||
index fd346ce..0debf98 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})
|
||||
# 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})
|
||||
## 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)
|
||||
|
||||
## 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 a85ca98..252e565 100644
|
||||
--- a/iet.so/CMakeLists.txt
|
||||
+++ b/iet.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()
|
||||
@@ -159,7 +159,7 @@ include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR
|
||||
# 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})
|
||||
## 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)
|
||||
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/iet_worker.cpp )
|
||||
|
||||
@@ -168,7 +168,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..2462bbc 100644
|
||||
--- a/mem.so/CMakeLists.txt
|
||||
+++ b/mem.so/CMakeLists.txt
|
||||
@@ -134,7 +134,7 @@ 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()
|
||||
@@ -143,9 +143,9 @@ endif()
|
||||
include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
|
||||
|
||||
# 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})
|
||||
## 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)
|
||||
|
||||
## 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..892b6ac 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})
|
||||
# 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})
|
||||
## 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)
|
||||
|
||||
## 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..7a6b368 100644
|
||||
--- a/pebb.so/CMakeLists.txt
|
||||
+++ b/pebb.so/CMakeLists.txt
|
||||
@@ -139,9 +139,9 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ pci ${ROCR_INC_DIR})
|
||||
# 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} )
|
||||
## 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)
|
||||
|
||||
## 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..567358b 100644
|
||||
--- a/peqt.so/CMakeLists.txt
|
||||
+++ b/peqt.so/CMakeLists.txt
|
||||
@@ -107,9 +107,9 @@ 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} ${YAML_CPP_INCLUDE_DIRS})
|
||||
## additional libraries
|
||||
set (PROJECT_LINK_LIBS rvslib libpci.so libm.so)
|
||||
|
||||
@@ -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)
|
||||
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..02d2245 100644
|
||||
--- a/perf.so/CMakeLists.txt
|
||||
+++ b/perf.so/CMakeLists.txt
|
||||
@@ -137,7 +137,7 @@ 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()
|
||||
@@ -145,9 +145,9 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
|
||||
# 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})
|
||||
## 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)
|
||||
|
||||
## 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..729fb5f 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})
|
||||
## 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)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp)
|
||||
diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt
|
||||
index c0099ab..8d92982 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)
|
||||
|
||||
## define source files
|
||||
set(SOURCES
|
||||
diff --git a/rvs/CMakeLists.txt b/rvs/CMakeLists.txt
|
||||
index 3909be8..7db90e4 100644
|
||||
--- a/rvs/CMakeLists.txt
|
||||
+++ b/rvs/CMakeLists.txt
|
||||
@@ -113,21 +113,23 @@ else()
|
||||
endif()
|
||||
|
||||
## define include directories
|
||||
-include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS})
|
||||
+include_directories(./ ../ ${YAML_INC_DIR})
|
||||
## 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})
|
||||
+link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${RVS_LIB_DIR}/.. ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${YAML_CPP_LIBRARIES} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} )
|
||||
|
||||
## additional libraries
|
||||
-set(ROCBLAS_LIB "rocblas")
|
||||
-set(ROC_THUNK_NAME "hsakmt")
|
||||
-set(CORE_RUNTIME_NAME "hsa-runtime")
|
||||
-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_INC_DIR}/../lib64/libyaml-cpp.a")
|
||||
+set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}")
|
||||
+set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.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})
|
||||
+ ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${PROJECT_LINK_LIBS} ${YAML_CPP_LIB}
|
||||
+ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so )
|
||||
add_dependencies(${RVS_TARGET} rvslib)
|
||||
|
||||
install(TARGETS ${RVS_TARGET}
|
||||
diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt
|
||||
index 8d29590..d52aee3 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})
|
||||
+ ${ROCM_SMI_INC_DIR} ${HIP_PATH} ${ROCBLAS_INC_DIR} ${YAML_INC_DIR})
|
||||
|
||||
link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
|
||||
|
||||
diff --git a/smqt.so/CMakeLists.txt b/smqt.so/CMakeLists.txt
|
||||
index 042586f..0133c00 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)
|
||||
|
||||
## define source files
|
||||
set(SOURCES src/rvs_module.cpp src/action.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..0ca398d 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()
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -16,12 +16,13 @@ class RocmValidationSuite(CMakePackage):
|
||||
compatible platform."""
|
||||
|
||||
homepage = "https://github.com/ROCm/ROCmValidationSuite"
|
||||
url = "https://github.com/ROCm/ROCmValidationSuite/archive/rocm-6.0.2.tar.gz"
|
||||
url = "https://github.com/ROCm/ROCmValidationSuite/archive/rocm-6.1.0.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="712f49bfe3a62c9f9cc6f9dc1c593b57e0b45158bb270d685d1141c9a9e90387")
|
||||
version("6.0.2", sha256="8286d00ce290eeace3697138da9d7a9669f54152e5febcd9e5c5156ae79f0c0c")
|
||||
version("6.0.0", sha256="a84e36b5e50e70ba033fb6bc6fa99da2e32bf7eaef2098df3164365a77a8f14c")
|
||||
version("5.7.1", sha256="202f2b6e014bbbeec40af5d3ec630c042f09a61087a77bd70715d81044ea4d65")
|
||||
@ -53,6 +54,7 @@ class RocmValidationSuite(CMakePackage):
|
||||
)
|
||||
patch("008-correcting-library-and-include-path-WITHOUT-RVS-BUILD-TESTS.patch", when="@5.7")
|
||||
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")
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
depends_on("zlib-api", type="link")
|
||||
depends_on("yaml-cpp~shared")
|
||||
@ -81,6 +83,7 @@ def setup_build_environment(self, build_env):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocminfo@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -18,6 +18,7 @@ class Rocminfo(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="973352210fdc65932f0125e2db68729383727eaf4ebb7f52c88a948c14bbbb73")
|
||||
version("6.0.2", sha256="e616d364a48de18eaee661bdce999d095086905f49777663ca99312f40a63da1")
|
||||
version("6.0.0", sha256="bc29f1798644b6dea73895353dffada9db7366d0058274e587ebd3291a4d3844")
|
||||
version("5.7.1", sha256="642dc2ec4254b3c30c43064e6690861486db820b25f4906ec78bdb47e68dcd0b")
|
||||
@ -57,12 +58,13 @@ class Rocminfo(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
"master",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
def cmake_args(self):
|
||||
|
||||
@ -14,9 +14,10 @@ class Rocmlir(CMakePackage):
|
||||
|
||||
homepage = "https://github.com/ROCm/rocMLIR"
|
||||
git = "https://github.com/ROCm/rocMLIR.git"
|
||||
url = "https://github.com/ROCm/rocMLIR/archive/refs/tags/rocm-6.0.2.tar.gz"
|
||||
url = "https://github.com/ROCm/rocMLIR/archive/refs/tags/rocm-6.1.0.tar.gz"
|
||||
|
||||
maintainers("srekolam")
|
||||
version("6.1.0", sha256="dd800783f1ce66ce7c560d5193d053ddf3797abae5ec9375c9842243f5a8ca0b")
|
||||
version("6.0.2", sha256="6ed039e8045169bb64c10fb063c2e1753b8d52d6d56c60e001c929082be1f20b")
|
||||
version("6.0.0", sha256="128915abdceaf5cef26a717d154f2b2f9466f6904f4490f158038878cedbf618")
|
||||
version("5.5.1", commit="8c29325e7e68e3248e863172bf0e7f97055d45ee")
|
||||
@ -50,7 +51,7 @@ def patch(self):
|
||||
depends_on("half")
|
||||
depends_on("pkgconfig", type="build")
|
||||
|
||||
for ver in ["5.3.0", "5.4.0", "5.4.3", "5.5.0", "5.5.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.3.0", "5.4.0", "5.4.3", "5.5.0", "5.5.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -17,6 +17,7 @@ class Rocprim(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="9f02e5f8be90baa679a28f83927495ddf0e17d684536e1f820021e8c3e8e6c84")
|
||||
version("6.0.2", sha256="d3998720d3206965335902f8f67ca497b320a33b810cd19b2a2264505cb38779")
|
||||
version("6.0.0", sha256="51f26c9f891a64c8db8df51d75d86d404d682092fd9d243e966ac6b2a6de381a")
|
||||
version("5.7.1", sha256="15d820a0f61aed60efbba88b6efe6942878b02d912f523f9cf8f33a4583d6cd7")
|
||||
@ -67,6 +68,7 @@ class Rocprim(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -19,6 +19,7 @@ class RocprofilerDev(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["librocprofiler64"]
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="14ac0a451428465133583e83d9177ed34b3d4679515018a12ee74f5e0288c956")
|
||||
version("6.0.2", sha256="d3f24e639a5e151fa418a92ae6fe150bdf14120b8982a5baa52844ce2fba0b82")
|
||||
version("6.0.0", sha256="6aca327a6ba302b5957002e55ac640dd185d51a354da3859e957448a5fc36b14")
|
||||
version("5.7.1", sha256="2fb7158592d89312ba419a272d907d8849373c0a676a83dd03c32b9942dfd27a")
|
||||
@ -57,17 +58,18 @@ class RocprofilerDev(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
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}")
|
||||
|
||||
for ver in ["5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"aqlprofile@{ver}", when=f"@{ver}")
|
||||
depends_on(f"comgr@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -89,7 +91,7 @@ class RocprofilerDev(CMakePackage):
|
||||
patch("0002-add-fPIC-and-disable-tests.patch", when="@5.5")
|
||||
patch("0002-add-fPIC-and-disable-tests-5.6.patch", when="@5.6")
|
||||
patch("0002-add-fPIC-and-disable-tests-5.7.patch", when="@5.7")
|
||||
patch("0003-disable-tests.patch", when="@6.0")
|
||||
patch("0003-disable-tests.patch", when="@6.0:")
|
||||
|
||||
def patch(self):
|
||||
filter_file(
|
||||
|
||||
@ -26,6 +26,7 @@ class Rocrand(CMakePackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="ea80c5d657fa48b1122a47986239a04118977195ee4826d2b14b8bfe0fabce6e")
|
||||
version("6.0.2", sha256="51d66c645987cbfb593aaa6be94109e87fe4cb7e9c70309eb3c159af0de292d7")
|
||||
version("6.0.0", sha256="cee93231c088be524bb2cb0e6093ec47e62e61a55153486bebbc2ca5b3d49360")
|
||||
version("5.7.1", sha256="885cd905bbd23d02ba8f3f87d5c0b79bc44bd020ea9af190f3959cf5aa33d07d")
|
||||
@ -122,6 +123,7 @@ class Rocrand(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
|
||||
|
||||
@ -41,6 +41,7 @@ class Rocsolver(CMakePackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("6.1.0", sha256="f1d7a4edf14ed0b2e2f74aa5cbc9db0c3b0dd31e50bbada1586cb353a28fe015")
|
||||
version("6.0.2", sha256="781d5df2886ab0d5087a215a33ac390dd27653b2a9b4a620c7d51b0ae56f63d2")
|
||||
version("6.0.0", sha256="5fcaba96f3efafc2ecc3f4ec104095d96545c16e1b9f95410bd571cb0fc643ae")
|
||||
version("5.7.1", sha256="83e0c137b8690dbeb2e85d9e25415d96bd06979f09f2b10b2aff8e4c9f833fa4")
|
||||
@ -100,6 +101,7 @@ class Rocsolver(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocblas@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -34,6 +34,7 @@ class Rocsparse(CMakePackage):
|
||||
variant("test", default=False, description="Build rocsparse-test client")
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="d69d9b0079159abb2d7514f8f45a41bb2cbcaf8b52e600e794aca3facf274b5e")
|
||||
version("6.0.2", sha256="00292eb7efe5719a65960bdbe391ba8e0ce610487eea11397aad6a14b11e12cd")
|
||||
version("6.0.0", sha256="bdc618677ec78830c6af315d61194d6ab8532345b8daeeb115aca96f274d4ca4")
|
||||
version("5.7.1", sha256="4c09b182b371124675d4057246021b5ed45e2833fdbf265b37a9b06b668baf0a")
|
||||
@ -73,6 +74,7 @@ class Rocsparse(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocprim@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -18,6 +18,7 @@ class Rocthrust(CMakePackage):
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="8c36fb7b34758579601365a450700899133da5802e5c8370654051b190bd6e1c")
|
||||
version("6.0.2", sha256="8de9414f6b921ff549ba102239fcf65f5cc70ece5eec9753de5ec91870e6934d")
|
||||
version("6.0.0", sha256="a3fdafe4b6124118e07f23a3b0270d91740da324f61aaa3e8c034da08d9312b1")
|
||||
version("5.7.1", sha256="b7cb9ea6c42b2c6b610c34d2c438443e0f99245bd391aff18591949bf1cd53ee")
|
||||
@ -69,6 +70,7 @@ class Rocthrust(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hip@{ver}", when=f"@{ver}")
|
||||
depends_on(f"rocprim@{ver}", when=f"@{ver}")
|
||||
|
||||
@ -19,6 +19,7 @@ class RoctracerDevApi(Package):
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="3f8e296c4d04123a7177d815ca166e978b085ad7c816ac298e6bb47a299fa187")
|
||||
version("6.0.2", sha256="1e0105b32fdd9c010aab304bb2ca1a5a38ba323cea610afe1135657edda8f26e")
|
||||
version("6.0.0", sha256="941166a0363c5689bfec118d54e986c43fb1ec8cbf18d95721d9a824bd52c0f8")
|
||||
version("5.7.1", sha256="ec0453adac7e62b142eb0df1e1e2506863aac4c3f2ce9d117c3184c08c0c6b48")
|
||||
|
||||
@ -22,6 +22,7 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
libraries = ["libroctracer64"]
|
||||
|
||||
license("MIT")
|
||||
version("6.1.0", sha256="3f8e296c4d04123a7177d815ca166e978b085ad7c816ac298e6bb47a299fa187")
|
||||
version("6.0.2", sha256="1e0105b32fdd9c010aab304bb2ca1a5a38ba323cea610afe1135657edda8f26e")
|
||||
version("6.0.0", sha256="941166a0363c5689bfec118d54e986c43fb1ec8cbf18d95721d9a824bd52c0f8")
|
||||
version("5.7.1", sha256="ec0453adac7e62b142eb0df1e1e2506863aac4c3f2ce9d117c3184c08c0c6b48")
|
||||
@ -65,6 +66,7 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
|
||||
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
|
||||
@ -73,7 +75,7 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
for ver in ["5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3", "5.3.0", "5.3.3", "5.4.0", "5.4.3"]:
|
||||
depends_on(f"rocprofiler-dev@{ver}", when=f"@{ver}")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on(f"rocm-core@{ver}", when=f"@{ver}")
|
||||
|
||||
patch("0001-include-rocprofiler-dev-path.patch", when="@5.3:5.4")
|
||||
|
||||
@ -27,6 +27,7 @@ class Rocwmma(CMakePackage):
|
||||
license("MIT")
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("6.1.0", sha256="ca29f33cfe6894909159ad68d786eacd469febab33883886a202f13ae061f691")
|
||||
version("6.0.2", sha256="61c6cc095b4ac555f4be4b55f6a7e3194c8c54bffc57bfeb0c02191119ac5dc8")
|
||||
version("6.0.0", sha256="f9e97e7c6c552d43ef8c7348e4402bead2cd978d0f81a9657d6a0f6c83a6139b")
|
||||
version("5.7.1", sha256="a998a1385e6ad7062707ddb9ff82bef727ca48c39a10b4d861667024e3ffd2a3")
|
||||
@ -83,6 +84,7 @@ class Rocwmma(CMakePackage):
|
||||
"5.7.1",
|
||||
"6.0.0",
|
||||
"6.0.2",
|
||||
"6.1.0",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver)
|
||||
@ -90,7 +92,7 @@ class Rocwmma(CMakePackage):
|
||||
depends_on("rocblas@" + ver, type="build", when="@" + ver)
|
||||
depends_on("rocm-openmp-extras@" + ver, type="build", when="@" + ver)
|
||||
|
||||
for ver in ["5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on("rocm-smi-lib@" + ver, when="@" + ver)
|
||||
|
||||
for tgt in itertools.chain(["auto"], amdgpu_targets):
|
||||
|
||||
@ -29,6 +29,7 @@ def url_for_version(self, version):
|
||||
maintainers("srekolam", "afzpatel")
|
||||
license("MIT")
|
||||
|
||||
version("6.1.0", sha256="026c5ac7a92e14e35b9e7630a2ebfff3f4b3544b988eb9aa8af9991d4beea242")
|
||||
version("6.0.2", sha256="2686eb4099233db4444fcd2f77af9b00d38d829f05de2403bed37b1b28f2653c")
|
||||
version("6.0.0", sha256="3626a648bc773520f5cd5ca15f494de6e74b422baf32491750ce0737c3367f15")
|
||||
version("5.7.1", sha256="36fff5f1c52d969c3e2e0c75b879471f731770f193c9644aa6ab993fb8fa4bbf")
|
||||
@ -123,7 +124,7 @@ def patch(self):
|
||||
|
||||
with when("+hip"):
|
||||
with when("@5.7:"):
|
||||
for ver in ["5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
|
||||
for ver in ["5.7.0", "5.7.1", "6.0.0", "6.0.2", "6.1.0"]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
with when("@:1.2"):
|
||||
depends_on("hip@5:")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user