Rocm 5.6.0 & 5.6.1 release updates (#39673)
* 5.6.0 updates
* Rocm 5.6.0 updates
* Style and audit corrections for 5.6
* Patching smi path for tests.
* Style correction
* 5.6.1 updates
* Updated hip tests for ci build failure
Updated hiprand with the release tag
Taken care the review comment rocsolver
* Adding rocm-smi path for 5.6
* Adding the patch file
* Setting library directory uniform
* gl depends on mesa but it should not be llvm variant
* Fix for the issue 39520 by setting CMAKE_INSTALL_LIBDIR=lib
* i1 muls can sometimes happen after SCEV. They resulted in
ISel failures because we were missing the patterns for them.
* 5.6.0 & 5.6.1 updates for migraphx, miopen-hip, mivisionx
* Revert "5.6.0 & 5.6.1 updates for migraphx, miopen-hip, mivisionx"
This reverts commit f54c9c6c67.
* Revert operator mixup fix
* Splitting compiler-rt-linkage-for-host and operator mixup patch
* Adding missing patch for reverting operator mixup
* 5.6 update for composable-kernel,migraphx,miopen-hip and mivisionx
* Updating rvs, rcd and rccl for 5.6.1. adding comment for llvm patch
This commit is contained in:
renjithravindrankannath
GitHub
parent
453625014d
commit
615312fcee
@ -21,6 +21,8 @@ class Comgr(CMakePackage):
|
||||
libraries = ["libamd_comgr"]
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("5.6.1", sha256="0a85d84619f98be26ca7a32c71f94ed3c4e9866133789eabb451be64ce739300")
|
||||
version("5.6.0", sha256="9396a7238b547ee68146c669b10b9d5de8f1d76527c649133c75d8076a185a72")
|
||||
version("5.5.1", sha256="0fbb15fe5a95c2e141ccd360bc413e1feda283334781540a6e5095ab27fd8019")
|
||||
version("5.5.0", sha256="97dfff03226ce0902b9d5d1c8c7bebb7a15978a81b6e9c750bf2d2473890bd42")
|
||||
version("5.4.3", sha256="8af18035550977fe0aa9cca8dfacbe65fe292e971de5a0e160710bafda05a81f")
|
||||
@ -142,6 +144,8 @@ class Comgr(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
# llvm libs are linked statically, so this *could* be a build dep
|
||||
@ -153,7 +157,7 @@ class Comgr(CMakePackage):
|
||||
"rocm-device-libs@" + ver, when="@{0} ^llvm-amdgpu ~rocm-device-libs".format(ver)
|
||||
)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
root_cmakelists_dir = join_path("lib", "comgr")
|
||||
|
||||
@ -17,6 +17,8 @@ class ComposableKernel(CMakePackage):
|
||||
maintainers("srekolam", "afzpatel")
|
||||
|
||||
version("master", branch="develop")
|
||||
version("5.6.1", commit="f5ec04f091fa5c48c67d7bacec36a414d0be06a5")
|
||||
version("5.6.0", commit="f0fd02634c2f8f8c70f5a0ab2a8c84db5e36eeca")
|
||||
version("5.5.1", commit="ac9e01e2cc3721be24619807adc444e1f59a9d25")
|
||||
version("5.5.0", commit="8b76b832420a3d69708401de6607a033163edcce")
|
||||
version("5.4.3", commit="bb3d9546f186e39cefedc3e7f01d88924ba20168")
|
||||
@ -40,7 +42,7 @@ class ComposableKernel(CMakePackage):
|
||||
depends_on("pkgconfig", type="build")
|
||||
depends_on("cmake@3.16:", type="build")
|
||||
|
||||
for ver in ["master", "5.5.1", "5.5.0", "5.4.3", "5.4.0"]:
|
||||
for ver in ["master", "5.6.1", "5.6.0", "5.5.1", "5.5.0", "5.4.3", "5.4.0"]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("llvm-amdgpu@" + ver, when="@" + ver)
|
||||
depends_on("rocm-cmake@" + ver, when="@" + ver, type="build")
|
||||
|
||||
@ -27,6 +27,8 @@ def url_for_version(self, version):
|
||||
return url.format(version)
|
||||
|
||||
version("master", branch="main")
|
||||
version("5.6.1", sha256="cc9a99c7e4de3d9360c0a471b27d626e84a39c9e60e0aff1e8e1500d82391819")
|
||||
version("5.6.0", sha256="864f87323e793e60b16905284fba381a7182b960dd4a37fb67420c174442c03c")
|
||||
version("5.5.1", sha256="1375fc7723cfaa0ae22a78682186d4804188b0a54990bfd9c0b8eb421b85e37e")
|
||||
version("5.5.0", sha256="efbae9a1ef2ab3de5ca44091e9bb78522e76759c43524c1349114f9596cc61d1")
|
||||
version("5.4.3", sha256="71d9668619ab57ec8a4564d11860438c5aad5bd161a3e58fbc49555fbd59182d")
|
||||
@ -140,6 +142,8 @@ def url_for_version(self, version):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
@ -162,6 +166,8 @@ def url_for_version(self, version):
|
||||
|
||||
# Add opencl sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("5.6.1", "ec26049f7d93c95050c27ba65472736665ec7a40f25920a868616b2970f6b845"),
|
||||
("5.6.0", "52ab260d00d279c2a86c353901ffd88ee61b934ad89e9eb480f210656705f04e"),
|
||||
("5.5.1", "a8a62a7c6fc5398406d2203b8cb75621a24944688e545d917033d87de2724498"),
|
||||
("5.5.0", "0df9fa0b8aa0c8e6711d34eec0fdf1ed356adcd9625bc8f1ce9b3e72090f3e4f"),
|
||||
("5.4.3", "b0f8339c844a2e62773bd85cd1e7c5ecddfe71d7c8e8d604e1a1d60900c30873"),
|
||||
|
||||
@ -0,0 +1,75 @@
|
||||
From cd4283eab943a3018237035afea61f1b5e0042cd Mon Sep 17 00:00:00 2001
|
||||
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
|
||||
Date: Wed, 27 Sep 2023 06:38:18 +0000
|
||||
Subject: [PATCH] Remove-compiler-rt-linkage-for-host
|
||||
|
||||
---
|
||||
clr/hipamd/CMakeLists.txt | 6 ++++--
|
||||
clr/hipamd/hip-config.cmake.in | 1 -
|
||||
hipcc/bin/hipcc.pl | 11 ++++++++---
|
||||
3 files changed, 12 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/clr/hipamd/CMakeLists.txt b/clr/hipamd/CMakeLists.txt
|
||||
index c14a9ad..ca49f7f 100755
|
||||
--- a/clr/hipamd/CMakeLists.txt
|
||||
+++ b/clr/hipamd/CMakeLists.txt
|
||||
@@ -400,8 +400,10 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
|
||||
install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
|
||||
install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
|
||||
install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
|
||||
- install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
|
||||
- install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
|
||||
+ if(WIN32)
|
||||
+ install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
|
||||
+ install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
#############################
|
||||
diff --git a/clr/hipamd/hip-config.cmake.in b/clr/hipamd/hip-config.cmake.in
|
||||
index 537a599..7d10273 100755
|
||||
--- a/clr/hipamd/hip-config.cmake.in
|
||||
+++ b/clr/hipamd/hip-config.cmake.in
|
||||
@@ -245,7 +245,6 @@ if(HIP_COMPILER STREQUAL "clang")
|
||||
# Add support for __fp16 and _Float16, explicitly link with compiler-rt
|
||||
if( "${CLANGRT_BUILTINS_FETCH_EXIT_CODE}" STREQUAL "0" )
|
||||
# CLANG_RT Builtins found Successfully Set interface link libraries property
|
||||
- set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}")
|
||||
set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}")
|
||||
else()
|
||||
message(STATUS "clangrt builtins lib not found: ${CLANGRT_BUILTINS_FETCH_EXIT_CODE}")
|
||||
diff --git a/hipcc/bin/hipcc.pl b/hipcc/bin/hipcc.pl
|
||||
index 56dcda2..c7ae60b 100755
|
||||
--- a/hipcc/bin/hipcc.pl
|
||||
+++ b/hipcc/bin/hipcc.pl
|
||||
@@ -155,11 +155,15 @@ if ($HIP_PLATFORM eq "amd") {
|
||||
if($isWindows) {
|
||||
$execExtension = ".exe";
|
||||
}
|
||||
- $HIPCC="$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="$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
|
||||
@@ -483,7 +487,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;
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,107 @@
|
||||
From 1d7f7eb9a52af2b83d3cb06bb4fe0f31eb47ce7f Mon Sep 17 00:00:00 2001
|
||||
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
|
||||
Date: Wed, 27 Sep 2023 07:07:01 +0000
|
||||
Subject: [PATCH] Reverting operator mixup fix for slate
|
||||
|
||||
---
|
||||
.../include/hip/amd_detail/amd_hip_complex.h | 17 ++++------
|
||||
.../hip/amd_detail/amd_hip_vector_types.h | 31 +++++++++++--------
|
||||
2 files changed, 24 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/clr/hipamd/include/hip/amd_detail/amd_hip_complex.h b/clr/hipamd/include/hip/amd_detail/amd_hip_complex.h
|
||||
index 9d9dfd5..eba6eb5 100644
|
||||
--- a/clr/hipamd/include/hip/amd_detail/amd_hip_complex.h
|
||||
+++ b/clr/hipamd/include/hip/amd_detail/amd_hip_complex.h
|
||||
@@ -106,20 +106,15 @@ THE SOFTWARE.
|
||||
return lhs; \
|
||||
}
|
||||
|
||||
-#define COMPLEX_MUL_PREOP_OVERLOAD(type) \
|
||||
- __HOST_DEVICE__ static inline type& operator*=(type& lhs, const type& rhs) { \
|
||||
- type temp{lhs}; \
|
||||
- lhs.x = rhs.x * temp.x - rhs.y * temp.y; \
|
||||
- lhs.y = rhs.y * temp.x + rhs.x * temp.y; \
|
||||
- return lhs; \
|
||||
+#define COMPLEX_MUL_PREOP_OVERLOAD(type) \
|
||||
+ __HOST_DEVICE__ static inline type& operator*=(type& lhs, const type& rhs) { \
|
||||
+ lhs = lhs * rhs; \
|
||||
+ return lhs; \
|
||||
}
|
||||
|
||||
#define COMPLEX_DIV_PREOP_OVERLOAD(type) \
|
||||
- __HOST_DEVICE__ static inline type& operator/=(type& lhs, const type& rhs) { \
|
||||
- type temp; \
|
||||
- temp.x = (lhs.x*rhs.x + lhs.y * rhs.y) / (rhs.x*rhs.x + rhs.y*rhs.y); \
|
||||
- temp.y = (lhs.y * rhs.x - lhs.x * rhs.y) / (rhs.x*rhs.x + rhs.y*rhs.y); \
|
||||
- lhs = temp; \
|
||||
+ __HOST_DEVICE__ static inline type& operator/=(type& lhs, const type& rhs) { \
|
||||
+ lhs = lhs / rhs; \
|
||||
return lhs; \
|
||||
}
|
||||
|
||||
diff --git a/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h b/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
|
||||
index 8215fb0..dfd3b39 100644
|
||||
--- a/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
|
||||
+++ b/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
|
||||
@@ -544,13 +544,6 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
|
||||
data *= x.data;
|
||||
return *this;
|
||||
}
|
||||
-
|
||||
- friend __HOST_DEVICE__ inline constexpr HIP_vector_type operator*(
|
||||
- HIP_vector_type x, const HIP_vector_type& y) noexcept
|
||||
- {
|
||||
- return HIP_vector_type{ x } *= y;
|
||||
- }
|
||||
-
|
||||
template<
|
||||
typename U,
|
||||
typename std::enable_if<
|
||||
@@ -561,12 +554,6 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
|
||||
return *this *= HIP_vector_type{x};
|
||||
}
|
||||
|
||||
- friend __HOST_DEVICE__ inline constexpr HIP_vector_type operator/(
|
||||
- HIP_vector_type x, const HIP_vector_type& y) noexcept
|
||||
- {
|
||||
- return HIP_vector_type{ x } /= y;
|
||||
- }
|
||||
-
|
||||
__HOST_DEVICE__
|
||||
HIP_vector_type& operator/=(const HIP_vector_type& x) noexcept
|
||||
{
|
||||
@@ -722,6 +709,15 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
|
||||
return HIP_vector_type<T, n>{x} -= y;
|
||||
}
|
||||
|
||||
+ template<typename T, unsigned int n>
|
||||
+ __HOST_DEVICE__
|
||||
+ inline
|
||||
+ constexpr
|
||||
+ HIP_vector_type<T, n> operator*(
|
||||
+ const HIP_vector_type<T, n>& x, const HIP_vector_type<T, n>& y) noexcept
|
||||
+ {
|
||||
+ return HIP_vector_type<T, n>{x} *= y;
|
||||
+ }
|
||||
template<typename T, unsigned int n, typename U>
|
||||
__HOST_DEVICE__
|
||||
inline
|
||||
@@ -741,6 +737,15 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
|
||||
return HIP_vector_type<T, n>{x} *= y;
|
||||
}
|
||||
|
||||
+ template<typename T, unsigned int n>
|
||||
+ __HOST_DEVICE__
|
||||
+ inline
|
||||
+ constexpr
|
||||
+ HIP_vector_type<T, n> operator/(
|
||||
+ const HIP_vector_type<T, n>& x, const HIP_vector_type<T, n>& y) noexcept
|
||||
+ {
|
||||
+ return HIP_vector_type<T, n>{x} /= y;
|
||||
+ }
|
||||
template<typename T, unsigned int n, typename U>
|
||||
__HOST_DEVICE__
|
||||
inline
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -25,6 +25,8 @@ class Hip(CMakePackage):
|
||||
libraries = ["libamdhip64"]
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="4b3c4dfcf8595da0e1b8c3e8067b1ccebeaac337762ff098db14375fa8dd4487")
|
||||
version("5.6.0", sha256="a8237768c1ae70029d972376f8d279f4de18a1e6106fff6215d1e16847bc375e")
|
||||
version("5.5.1", sha256="1f5f6bb72d8d64335ccc8242ef2e2ea8efeb380cce2997f475b1ee77528d9fb4")
|
||||
version("5.5.0", sha256="5b0d0253e62f85cc21d043513f7c11c64e4a4ec416159668f0b160d732d09a3c")
|
||||
version("5.4.3", sha256="23e51d3af517cd63019f8d199e46b84d5a18251d148e727f3985e8d99ccb0e58")
|
||||
@ -162,6 +164,8 @@ class Hip(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
|
||||
@ -170,10 +174,10 @@ class Hip(CMakePackage):
|
||||
depends_on("rocminfo@" + ver, when="@" + ver)
|
||||
depends_on("roctracer-dev-api@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.4.0", "5.4.3", "5.5.0", "5.5.1"]:
|
||||
for ver in ["5.4.0", "5.4.3", "5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("hipify-clang", when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
# hipcc likes to add `-lnuma` by default :(
|
||||
# ref https://github.com/ROCm-Developer-Tools/HIP/pull/2202
|
||||
@ -269,6 +273,55 @@ class Hip(CMakePackage):
|
||||
placement="rocclr",
|
||||
when="@{0}".format(d_version),
|
||||
)
|
||||
# Add hip-clr sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("5.6.1", "0b88af1e99643899d11b1c8cf8a3c46601051b328a5e0ffbd44ee88b7eb0db33"),
|
||||
("5.6.0", "8dcd99110737a294f67a805639cf372890c8ca16c7603caaa793e71e84478fe4"),
|
||||
]:
|
||||
resource(
|
||||
name="clr",
|
||||
url="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-{0}.tar.gz".format(
|
||||
d_version
|
||||
),
|
||||
sha256=d_shasum,
|
||||
expand=True,
|
||||
destination="",
|
||||
placement="clr",
|
||||
when="@{0}".format(d_version),
|
||||
)
|
||||
|
||||
# Add hipcc sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("5.6.1", "5800fac92b841ef6f52acda78d9bf86f83970bec0fb848a6265d239bdb7eb51a"),
|
||||
("5.6.0", "fdb7fdc9e4648376120330f034ee8353038d34c8a015f9eb0c208c56eeddd097"),
|
||||
]:
|
||||
resource(
|
||||
name="hipcc",
|
||||
url="https://github.com/ROCm-Developer-Tools/HIPCC/archive/refs/tags/rocm-{0}.tar.gz".format(
|
||||
d_version
|
||||
),
|
||||
sha256=d_shasum,
|
||||
expand=True,
|
||||
destination="",
|
||||
placement="hipcc",
|
||||
when="@{0}".format(d_version),
|
||||
)
|
||||
# Add hiptests sources thru the below
|
||||
for d_version, d_shasum in [
|
||||
("5.6.1", "5b3002ddfafda162329e4d9e6ac1200eeb48ff08e666b342aa8aeca30750f48b"),
|
||||
("5.6.0", "8cf4509bf9c0747dab8ed8fec1365a9156792034b517207a0b2d63270429fd2e"),
|
||||
]:
|
||||
resource(
|
||||
name="hip-tests",
|
||||
url="https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-{0}.tar.gz".format(
|
||||
d_version
|
||||
),
|
||||
sha256=d_shasum,
|
||||
expand=True,
|
||||
destination="",
|
||||
placement="hip-tests",
|
||||
when="@{0}".format(d_version),
|
||||
)
|
||||
# Note: the ROCm ecosystem expects `lib/` and `bin/` folders with symlinks
|
||||
# in the parent directory of the package, which is incompatible with spack.
|
||||
# In hipcc the ROCM_PATH variable is used to point to the parent directory
|
||||
@ -331,10 +384,11 @@ class Hip(CMakePackage):
|
||||
patch("0005-Disable-tests-4.1.0.patch", when="@4.1.0:4.3.2")
|
||||
|
||||
patch("Add_missing_open_cl_header_file_for_4.3.0.patch", when="@4.3.0:4.3.2")
|
||||
patch("0014-hip-test-file-reorg-5.4.0.patch", when="@5.4.0:")
|
||||
patch("0016-hip-sample-fix-hipMalloc-call.patch", when="@5.4.3:")
|
||||
patch("0014-hip-test-file-reorg-5.4.0.patch", when="@5.4.0:5.5")
|
||||
patch("0016-hip-sample-fix-hipMalloc-call.patch", when="@5.4.3:5.5")
|
||||
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:")
|
||||
patch("0015-reverting-operator-mixup-fix-for-slate.patch", when="@5.6:")
|
||||
# See https://github.com/ROCm-Developer-Tools/HIP/pull/3206
|
||||
patch(
|
||||
"https://github.com/ROCm-Developer-Tools/HIP/commit/50ee82f6bc4aad10908ce09198c9f7ebfb2a3561.patch?full_index=1",
|
||||
@ -346,8 +400,10 @@ class Hip(CMakePackage):
|
||||
def root_cmakelists_dir(self):
|
||||
if self.spec.satisfies("@:4.3.2"):
|
||||
return self.stage.source_path
|
||||
else:
|
||||
elif self.spec.satisfies("@4.5:5.5"):
|
||||
return "hipamd"
|
||||
else:
|
||||
return "clr"
|
||||
|
||||
def get_paths(self):
|
||||
if self.spec.external:
|
||||
@ -393,6 +449,7 @@ def get_paths(self):
|
||||
"llvm-amdgpu": rocm_prefix.llvm,
|
||||
"hsa-rocr-dev": rocm_prefix.hsa,
|
||||
"rocminfo": rocm_prefix,
|
||||
"comgr": rocm_prefix,
|
||||
"rocm-device-libs": rocm_prefix,
|
||||
}
|
||||
|
||||
@ -405,6 +462,7 @@ def get_paths(self):
|
||||
"llvm-amdgpu": self.spec["llvm-amdgpu"].prefix,
|
||||
"hsa-rocr-dev": self.spec["hsa-rocr-dev"].prefix,
|
||||
"rocminfo": self.spec["rocminfo"].prefix,
|
||||
"comgr": self.spec["comgr"].prefix,
|
||||
"rocm-device-libs": self.spec["llvm-amdgpu"].prefix,
|
||||
}
|
||||
|
||||
@ -476,6 +534,7 @@ def set_variables(self, env):
|
||||
# hiprtcCreateProgram:
|
||||
# https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/blob/rocm-4.0.0/lib/comgr/src/comgr-env.cpp
|
||||
env.set("LLVM_PATH", paths["llvm-amdgpu"])
|
||||
env.set("COMGR_PATH", paths["comgr"])
|
||||
|
||||
# Finally we have to set --rocm-path=<prefix> ourselves, which is not
|
||||
# the same as --hip-device-lib-path (set by hipcc). It's used to set
|
||||
@ -525,13 +584,20 @@ def patch(self):
|
||||
"hip-config.cmake.in",
|
||||
string=True,
|
||||
)
|
||||
if self.spec.satisfies("@5.2: +rocm"):
|
||||
if self.spec.satisfies("@5.2:5.4 +rocm"):
|
||||
filter_file(
|
||||
'"${ROCM_PATH}/llvm"',
|
||||
self.spec["llvm-amdgpu"].prefix,
|
||||
"hipamd/hip-config.cmake.in",
|
||||
string=True,
|
||||
)
|
||||
if self.spec.satisfies("@5.6: +rocm"):
|
||||
filter_file(
|
||||
'"${ROCM_PATH}/llvm"',
|
||||
self.spec["llvm-amdgpu"].prefix,
|
||||
"clr/hipamd/hip-config.cmake.in",
|
||||
string=True,
|
||||
)
|
||||
|
||||
perl = self.spec["perl"].command
|
||||
kwargs = {"ignore_absent": False, "backup": False, "string": False}
|
||||
@ -552,13 +618,13 @@ def patch(self):
|
||||
"roc-obj-ls",
|
||||
"hipvars.pm",
|
||||
]
|
||||
elif self.spec.satisfies("@4.5.0:"):
|
||||
elif self.spec.satisfies("@4.5.0:5.5"):
|
||||
files = []
|
||||
filter_file(match, substitute, *files, **kwargs)
|
||||
# This guy is used during the cmake phase, so we have to fix the
|
||||
# shebang already here in case it is too long.
|
||||
filter_shebang("hipconfig")
|
||||
if self.spec.satisfies("@4.5.0:"):
|
||||
filter_file(match, substitute, *files, **kwargs)
|
||||
# This guy is used during the cmake phase, so we have to fix the
|
||||
# shebang already here in case it is too long.
|
||||
filter_shebang("hipconfig")
|
||||
if self.spec.satisfies("@4.5.0:5.5"):
|
||||
perl = self.spec["perl"].command
|
||||
kwargs = {"ignore_absent": False, "backup": False, "string": False}
|
||||
with working_dir("hipamd/bin"):
|
||||
@ -566,6 +632,18 @@ def patch(self):
|
||||
substitute = "#!{perl}".format(perl=perl)
|
||||
files = ["roc-obj-extract", "roc-obj-ls"]
|
||||
filter_file(match, substitute, *files, **kwargs)
|
||||
if self.spec.satisfies("@5.6.0:"):
|
||||
perl = self.spec["perl"].command
|
||||
kwargs = {"ignore_absent": False, "backup": False, "string": False}
|
||||
match = "^#!/usr/bin/perl"
|
||||
substitute = "#!{perl}".format(perl=perl)
|
||||
with working_dir("clr/hipamd/bin"):
|
||||
files = ["roc-obj-extract", "roc-obj-ls"]
|
||||
filter_file(match, substitute, *files, **kwargs)
|
||||
with working_dir("hipcc/bin"):
|
||||
files = []
|
||||
filter_file(match, substitute, *files, **kwargs)
|
||||
filter_shebang("hipconfig")
|
||||
if "@3.7.0: +rocm" in self.spec:
|
||||
numactl = self.spec["numactl"].prefix.lib
|
||||
kwargs = {"ignore_absent": False, "backup": False, "string": False}
|
||||
@ -573,7 +651,16 @@ def patch(self):
|
||||
with working_dir("bin"):
|
||||
match = " -lnuma"
|
||||
substitute = " -L{numactl} -lnuma".format(numactl=numactl)
|
||||
filter_file(match, substitute, "hipcc", **kwargs)
|
||||
if self.spec.satisfies("@4.5.0:5.5"):
|
||||
filter_file(match, substitute, "hipcc", **kwargs)
|
||||
if "@5.6.0: +rocm" in self.spec:
|
||||
numactl = self.spec["numactl"].prefix.lib
|
||||
kwargs = {"ignore_absent": False, "backup": False, "string": False}
|
||||
|
||||
with working_dir("hipcc/src"):
|
||||
match = " -lnuma"
|
||||
substitute = " -L{numactl} -lnuma".format(numactl=numactl)
|
||||
filter_file(match, substitute, "hipBin_amd.h", **kwargs)
|
||||
|
||||
def flag_handler(self, name, flags):
|
||||
if name == "cxxflags" and self.spec.satisfies("@3.7.0:4.3.2"):
|
||||
@ -609,21 +696,30 @@ def cmake_args(self):
|
||||
if "@4.5.0:" in self.spec:
|
||||
args.append(self.define("HIP_COMMON_DIR", self.stage.source_path))
|
||||
args.append(self.define("HIP_CATCH_TEST", "OFF"))
|
||||
args.append(self.define("ROCCLR_PATH", self.stage.source_path + "/rocclr"))
|
||||
args.append(self.define("AMD_OPENCL_PATH", self.stage.source_path + "/opencl"))
|
||||
if "@4.5.0:5.5" in self.spec:
|
||||
args.append(self.define("ROCCLR_PATH", self.stage.source_path + "rocclr"))
|
||||
args.append(self.define("AMD_OPENCL_PATH", self.stage.source_path + "opencl"))
|
||||
if "@5.3.0:" in self.spec:
|
||||
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
|
||||
|
||||
if "@5.6.0:" in self.spec:
|
||||
args.append(self.define("ROCCLR_PATH", self.stage.source_path + "/clr/rocclr"))
|
||||
args.append(self.define("AMD_OPENCL_PATH", self.stage.source_path + "/clr/opencl"))
|
||||
args.append(self.define("HIPCC_BIN_DIR", self.stage.source_path + "/hipcc/bin")),
|
||||
args.append(self.define("CLR_BUILD_HIP", True)),
|
||||
args.append(self.define("CLR_BUILD_OCL", False)),
|
||||
return args
|
||||
|
||||
test_src_dir = "samples"
|
||||
|
||||
@run_after("install")
|
||||
def cache_test_sources(self):
|
||||
"""Copy the tests source files after the package is installed to an
|
||||
install test subdirectory for use during `spack test run`."""
|
||||
if self.spec.satisfies("@:5.1.0"):
|
||||
return
|
||||
else:
|
||||
if "@:5.5" in self.spec:
|
||||
self.test_src_dir = "samples"
|
||||
else:
|
||||
self.test_src_dir = "hip-tests/samples"
|
||||
self.cache_extra_test_sources([self.test_src_dir])
|
||||
|
||||
def test_samples(self):
|
||||
|
||||
@ -22,6 +22,8 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="f9da82fbefc68b84081ea0ed0139b91d2a540357fcf505c7f1d57eab01eb327c")
|
||||
version("5.6.0", sha256="9453a31324e10ba528f8f4755d2c270d0ed9baa33e980d8f8383204d8e28a563")
|
||||
version("5.5.1", sha256="5920c9a9c83cf7e2b42d1f99f5d5091cac7f6c0a040a737e869e57b92d7045a9")
|
||||
version("5.5.0", sha256="b080c25cb61531228d26badcdca856c46c640035c058bfc1c9f63de65f418cd5")
|
||||
version("5.4.3", sha256="5acac147aafc15c249c2f24c19459135ed68b506403aa92e602b67cfc10c38b7")
|
||||
@ -167,6 +169,8 @@ def check(self):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
|
||||
@ -15,7 +15,8 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("5.6.1", sha256="4b9479daa40424c9ddbc14ce967aa170680f8ca1ed01a514e6e30ccfa22552ce")
|
||||
version("5.6.0", sha256="5e74ddbf833f39836bf9ec6c6750348c7386a85ca67aaf9bb54d16c9e1959031")
|
||||
version("5.5.1", sha256="ad83f3f1ed85ead9e3012906957c125a896168be913f6fb6af298228fc571480")
|
||||
version("5.5.0", sha256="3eec838119326a67eb4cc006c706e328f3a51a01e98bbfb518df8fe4a4707e13")
|
||||
version("5.4.3", sha256="cf528d9acb4f9b9c3aad439ae76bfc3d02be6e7a74d96099544e5d54e1a23675")
|
||||
@ -148,6 +149,8 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocprim@" + ver, when="+rocm @" + ver)
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
|
||||
@ -22,7 +22,8 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
|
||||
maintainers("renjithravindrankannath", "srekolam")
|
||||
|
||||
version("master", branch="master")
|
||||
|
||||
version("5.6.1", sha256="d2ae36b8eacd39b865e8a7972b8eb86bcea2de4ac90711bba7e29b39b01eaa74")
|
||||
version("5.6.0", sha256="c7f425b693caf9371b42226d86392335d993a117d23219b6ba1fd13523cb8261")
|
||||
version("5.5.1", sha256="3addd15a459752ad657e84c2a7b6b6289600d1d0a5f90d6e0946ba11e8148fc0")
|
||||
version("5.5.0", sha256="47ec6f7da7346c312b80daaa8f763e86c7bdc33ac8617cfa3344068e5b20dd9e")
|
||||
version("5.4.3", sha256="ae37f40b6019a11f10646ef193716836f366d269eab3c5cc2ed09af85355b945")
|
||||
@ -116,6 +117,8 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("rocfft@" + ver, when="+rocm @" + ver)
|
||||
|
||||
@ -15,7 +15,8 @@ class Hipfort(CMakePackage):
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
|
||||
version("5.6.1", sha256="a55345cc9ccaf0cd69d306b8eb9ec2a02c220a57e9c396443cc7273aa3377adc")
|
||||
version("5.6.0", sha256="03176a099bc81e212ad1bf9d86f35561f8f2d21a2f126732d7620e1ea59888d5")
|
||||
version("5.5.1", sha256="abc59f7b81cbefbe3555cbf1bf0d80e8aa65901c70799748c40870fe6f3fea60")
|
||||
version("5.5.0", sha256="cae75ffeac129639cabebfe2f95f254c83d6c0a6cffd98142ea3537a132e42bb")
|
||||
version("5.4.3", sha256="1954a1cba351d566872ced5549b2ced7ab6332221e2b98dba3c07180dce8f173")
|
||||
@ -118,6 +119,8 @@ class Hipfort(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, type="build", when="@" + ver)
|
||||
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 80c8a3f..d2b88c0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -137,7 +137,7 @@ install(
|
||||
# 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"
|
||||
@ -18,6 +18,8 @@ class HipifyClang(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="ec3a4f276556f9fd924ea3c89be11b6c6ddf999cdd4387f669e38e41ee0042e8")
|
||||
version("5.6.0", sha256="a2572037a7d3bd0813bd6819a5e6c0e911678db5fd3ab15a65370601df91891b")
|
||||
version("5.5.1", sha256="35b9c07a7afaf9cf6f3bbe9dd147fa81b1b297af3e5e26e60c55629e83feaa48")
|
||||
version("5.5.0", sha256="1b75c702799ac93027337f8fb61d7c27ba960e8ece60d907fc8c5ab3f15c3fe9")
|
||||
version("5.4.3", sha256="79e27bd6c0a28e6a62b02dccc0b5d88a81f69fe58487e83f3b7ab47d6b64341b")
|
||||
@ -103,7 +105,8 @@ class HipifyClang(CMakePackage):
|
||||
# the patch was added to install the targets in the correct directory structure
|
||||
# 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:")
|
||||
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:")
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
for ver in [
|
||||
@ -132,11 +135,13 @@ class HipifyClang(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("llvm-amdgpu@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
def setup_run_environment(self, env):
|
||||
|
||||
@ -22,6 +22,8 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="a73d5578bc7f8dff0b8960e4bff97bc4fc28f508a19ed6acd1cfd4d3e76b47ee")
|
||||
version("5.6.0", sha256="8c214e2f90337a5317a69950026bf337b1e567d43bb9ae64f2a802af2228c313")
|
||||
version("5.5.1", sha256="5df9d78eae0991be5ec9f60e8d3530fabc23793d9f9cf274b075d689675db04e")
|
||||
version("5.5.0", sha256="7c7dde7b989d5da9c0b0251233245f955b477c090462c7d34e3e0284c5fca761")
|
||||
version("5.4.3", sha256="7d3d04476880ec90c088dff81f69aac8699eaef972476000e5c4726584ffa98f")
|
||||
@ -78,6 +80,8 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
|
||||
@ -26,7 +26,8 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
|
||||
version("5.6.1", sha256="2e546bc7771f7bf0aa7892b69cded725941573e8b70614759c3d03c21eb78dde")
|
||||
version("5.6.0", sha256="11fa51d210853d93d24d55b20367738e49711793412f58e8d7689710b92ae16c")
|
||||
version("5.5.1", sha256="826bd64a4887176595bb7319d9a3612e7327602efe1f42aa3f2ad0e783d1a180")
|
||||
version("5.5.0", sha256="0f45be0f90907381ae3e82424599e2ca2112d6411b4a64c72558d63f00409b83")
|
||||
version("5.4.3", sha256="02a1bffecc494393f49f97174db7d2c101db557d32404923a44520876e682e3a")
|
||||
@ -106,6 +107,8 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
"develop",
|
||||
]:
|
||||
|
||||
@ -19,6 +19,8 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie")
|
||||
libraries = ["libhipsparse"]
|
||||
version("5.6.1", sha256="d636d0c5d1e38cc0c09b1e95380199ec82bd465b94bd6661f0c8d9374d9b565d")
|
||||
version("5.6.0", sha256="3a6931b744ebaa4469a4c50d059a008403e4dc2a4f04dd69c3c6d20916b4a491")
|
||||
version("5.5.1", sha256="3d291e4fe2c611d555e54de66149b204fe7ac59f5dd00a9ad93bc6dca0528880")
|
||||
version("5.5.0", sha256="8122c8f17d899385de83efb7ac0d8a4fabfcd2aa21bbed63e63ea7adf0d22df6")
|
||||
version("5.4.3", sha256="b373eccd03679a13fab4e740fc780da25cbd598abca3a1e5e3613ae14954f9db")
|
||||
@ -149,6 +151,8 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("rocsparse@" + ver, when="+rocm @" + ver)
|
||||
|
||||
@ -24,6 +24,8 @@ class HsaRocrDev(CMakePackage):
|
||||
libraries = ["libhsa-runtime64"]
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="4de9a57c2092edf9398d671c8a2c60626eb7daf358caf710da70d9c105490221")
|
||||
version("5.6.0", sha256="30875d440df9d8481ffb24d87755eae20a0efc1114849a72619ea954f1e9206c")
|
||||
version("5.5.1", sha256="53d84ad5ba5086ed4ad67ad892c52c0e4eba8ddfa85c2dd341bf825f4d5fe4ee")
|
||||
version("5.5.0", sha256="8dbc776b56f93ddaa2ca38bf3b88299b8091de7c1b3f2e481064896cf6808e6c")
|
||||
version("5.4.3", sha256="a600eed848d47a7578c60da7e64eb92f29bbce2ec67932b251eafd4c2974cb67")
|
||||
@ -145,6 +147,8 @@ class HsaRocrDev(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
@ -153,7 +157,7 @@ class HsaRocrDev(CMakePackage):
|
||||
depends_on(
|
||||
"rocm-device-libs@" + ver, when="@{0} ^llvm-amdgpu ~rocm-device-libs".format(ver)
|
||||
)
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
# Both 3.5.0 and 3.7.0 force INSTALL_RPATH in different ways
|
||||
@ -198,4 +202,6 @@ def cmake_args(self):
|
||||
|
||||
args.append(self.define("BITCODE_DIR", bitcode_dir))
|
||||
|
||||
if self.spec.satisfies("@5.6:"):
|
||||
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
|
||||
return args
|
||||
|
||||
@ -22,6 +22,8 @@ class HsakmtRoct(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="d60b355bfd21a08e0e36270fd56f98d052c3c6edca47da887fa32bf32759c29b")
|
||||
version("5.6.0", sha256="cd009c5c09f664f046c428ba9843582ab468f7b88d560747eb949d8d7f8c5567")
|
||||
version("5.5.1", sha256="4ffde3fc1f91f24cdbf09263fd8e012a3995ad10854f4c1d866beab7b9f36bf4")
|
||||
version("5.5.0", sha256="2b11fd8937c2b06cd4ddea2c3699fbf3d1651892c4c5957d38553b993dd9af18")
|
||||
version("5.4.3", sha256="3799abbe7177fbff3b304e2a363e2b39e8864f8650ae569b2b88b9291f9a710c")
|
||||
@ -114,7 +116,7 @@ class HsakmtRoct(CMakePackage):
|
||||
for ver in ["5.3.0", "5.4.0", "5.4.3"]:
|
||||
depends_on("llvm-amdgpu@" + ver, type="test", when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
depends_on("llvm-amdgpu@" + ver, type="test", when="@" + ver)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -24,6 +24,8 @@ class LlvmAmdgpu(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("5.6.1", sha256="045e43c0c4a3f4f2f1db9fb603a4f1ea3d56e128147e19ba17909eb57d7f08e5")
|
||||
version("5.6.0", sha256="e922bd492b54d99e56ed88c81e2009ed6472059a180b10cc56ce1f9bd2d7b6ed")
|
||||
version("5.5.1", sha256="7d7181f20f89cb0715191aa32914186c67a34258c13457055570d47e15296553")
|
||||
version("5.5.0", sha256="5dc6c99f612b69ff73145bee17524e3712990100e16445b71634106acf7927cf")
|
||||
version("5.4.3", sha256="a844d3cc01613f6284a75d44db67c495ac1e9b600eacbb1eb13d2649f5d5404d")
|
||||
@ -160,7 +162,13 @@ class LlvmAmdgpu(CMakePackage):
|
||||
# as per 5.2.0 llvm code. It used to be llvm/bin/../lib/libdevice.
|
||||
# Below patch is to look in the old path.
|
||||
patch("adjust-openmp-bitcode-directory-for-llvm-link.patch", when="@5.2.0:")
|
||||
patch("patch-llvm-5.5.0.patch", when="@5.5")
|
||||
patch("patch-llvm-5.5.0.patch", when="@5.5:")
|
||||
|
||||
# i1 muls can sometimes happen after SCEV.
|
||||
# They resulted in ISel failures because we were missing the patterns for them.
|
||||
# This fix is targeting 6.1 rocm release.
|
||||
# Need patch until https://github.com/llvm/llvm-project/pull/67291 is merged.
|
||||
patch("001-Add-i1-mul-patterns.patch", when="@5.6:")
|
||||
|
||||
conflicts("^cmake@3.19.0")
|
||||
|
||||
@ -169,6 +177,8 @@ class LlvmAmdgpu(CMakePackage):
|
||||
|
||||
# Add device libs sources so they can be an external LLVM project
|
||||
for d_version, d_shasum in [
|
||||
("5.6.1", "f0dfab272ff936225bfa1e9dabeb3c5d12ce08b812bf53ffbddd2ddfac49761c"),
|
||||
("5.6.0", "efb5dcdca9b3a9fbe408d494fb4a23e0b78417eb5fa8eebd4a5d226088f28921"),
|
||||
("5.5.1", "3b5f6dd85f0e3371f6078da7b59bf77d5b210e30f1cc66ef1e2de6bbcb775833"),
|
||||
("5.5.0", "5ab95aeb9c8bed0514f96f7847e21e165ed901ed826cdc9382c14d199cbadbd3"),
|
||||
("5.4.3", "f4f7281f2cea6d268fcc3662b37410957d4f0bc23e0df9f60b12eb0fcdf9e26e"),
|
||||
|
||||
@ -243,6 +243,8 @@ class Llvm(CMakePackage, CudaPackage):
|
||||
description="Enable zstd support for static analyzer / lld",
|
||||
)
|
||||
|
||||
provides("libllvm@16", when="@16.0.0:16")
|
||||
provides("libllvm@15", when="@15.0.0:15")
|
||||
provides("libllvm@14", when="@14.0.0:14")
|
||||
provides("libllvm@13", when="@13.0.0:13")
|
||||
provides("libllvm@12", when="@12.0.0:12")
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
From 612664789657444daa88f8f28a183928e01595d0 Mon Sep 17 00:00:00 2001
|
||||
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
|
||||
Date: Mon, 25 Sep 2023 19:30:19 +0000
|
||||
Subject: [PATCH] Adding-half-include-directory-path
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 +++-
|
||||
cmake/PythonModules.cmake | 2 +-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4601cdd..9cd48ad 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -51,7 +51,7 @@ set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/lib")
|
||||
project(migraphx)
|
||||
find_package(ROCM REQUIRED)
|
||||
|
||||
-find_path(HALF_INCLUDE_DIR half.hpp PATH_SUFFIXES half)
|
||||
+find_path(HALF_INCLUDE_DIR half.hpp)
|
||||
if (NOT HALF_INCLUDE_DIR)
|
||||
message(FATAL_ERROR "Could not find half.hpp - Please check that the install path of half.hpp has been added to CMAKE_PREFIX_PATH")
|
||||
else()
|
||||
@@ -272,6 +272,8 @@ add_subdirectory(docs)
|
||||
add_subdirectory(test)
|
||||
add_subdirectory(tools)
|
||||
|
||||
+target_include_directories(migraphx PUBLIC "${NLOHMANN_JSON_INCLUDE} ${HALF_INCLUDE_DIR}")
|
||||
+
|
||||
set(DEST_DIR ${CMAKE_BINARY_DIR})
|
||||
file(GLOB backend_files ${CMAKE_SOURCE_DIR}/src/py/backend/*.py)
|
||||
file(MAKE_DIRECTORY ${DEST_DIR}/lib/onnx_migraphx)
|
||||
diff --git a/cmake/PythonModules.cmake b/cmake/PythonModules.cmake
|
||||
index b5818ce..b4bfbb3 100755
|
||||
--- a/cmake/PythonModules.cmake
|
||||
+++ b/cmake/PythonModules.cmake
|
||||
@@ -76,7 +76,7 @@ function(py_add_module NAME)
|
||||
)
|
||||
|
||||
endfunction()
|
||||
-set(PYTHON_SEARCH_VERSIONS 2.7 3.5 3.6 3.7 3.8 3.9 3.10)
|
||||
+set(PYTHON_SEARCH_VERSIONS 3.5 3.6 3.7 3.8 3.9 3.10)
|
||||
set(PYTHON_DISABLE_VERSIONS "" CACHE STRING "")
|
||||
foreach(PYTHON_DISABLE_VERSION ${PYTHON_DISABLE_VERSIONS})
|
||||
list(REMOVE_ITEM PYTHON_SEARCH_VERSIONS ${PYTHON_DISABLE_VERSION})
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -19,6 +19,8 @@ class Migraphx(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["libmigraphx"]
|
||||
|
||||
version("5.6.1", sha256="b108c33f07572ffd880b20f6de06f1934ab2a1b41ae69095612322ac412fa91c")
|
||||
version("5.6.0", sha256="eaec90535d62002fd5bb264677ad4a7e30c55f18d2a287680d0495c7e60432b2")
|
||||
version("5.5.1", sha256="e71c4744f8ef6a1a99c179bbad94b8fe9bd7686eaa9397f376b70988c3341f0c")
|
||||
version("5.5.0", sha256="6084eb596b170f5e38f22b5fa37e66aa43a8cbc626712c9f03cde48c8fecfc8f")
|
||||
version("5.4.3", sha256="f83e7bbe5d6d0951fb2cf0abf7e8b3530e9a5e45f7cec6d760da055d6905d568")
|
||||
@ -110,19 +112,21 @@ def url_for_version(self, version):
|
||||
|
||||
return url
|
||||
|
||||
patch("0001-Adding-nlohmann-json-include-directory.patch", when="@3.9.0:")
|
||||
patch("0001-Adding-nlohmann-json-include-directory.patch", when="@3.9.0:5.5")
|
||||
# Restrict Python 2.7 usage to fix the issue below
|
||||
# https://github.com/spack/spack/issues/24429
|
||||
patch("0002-restrict-python-2.7-usage.patch", when="@3.9.0:5.1.3")
|
||||
patch("0003-restrict-python-2.7-usage.patch", when="@5.2.0:5.4")
|
||||
patch("0004-restrict-python2.7-usage-for-5.5.0.patch", when="@5.5.0:")
|
||||
patch("0004-restrict-python2.7-usage-for-5.5.0.patch", when="@5.5.0")
|
||||
patch("0005-Adding-half-include-directory-path-migraphx.patch", when="@5.6.0:")
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
depends_on("protobuf", type="link")
|
||||
depends_on("blaze", type="build")
|
||||
depends_on("nlohmann-json", type="link")
|
||||
depends_on("msgpack-c", type="link")
|
||||
depends_on("half@1.12.0", type="link")
|
||||
depends_on("half@1.12.0", type="link", when="@:5.5")
|
||||
depends_on("half@2:", when="@5.6:")
|
||||
depends_on("python@3.5:", type="build")
|
||||
depends_on("py-pybind11", type="build", when="@:4.0.0")
|
||||
depends_on("py-pybind11@2.6:", type="build", when="@4.1.0:")
|
||||
@ -154,6 +158,8 @@ def url_for_version(self, version):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
@ -193,3 +199,11 @@ def cmake_args(self):
|
||||
if "@5.5.0:" in self.spec:
|
||||
args.append(self.define("CMAKE_CXX_FLAGS", "-I{0}".format(abspath)))
|
||||
return args
|
||||
|
||||
def test(self):
|
||||
if self.spec.satisfies("@:5.5.0"):
|
||||
print("Skipping: stand-alone tests")
|
||||
return
|
||||
test_dir = join_path(self.spec["migraphx"].prefix, "bin")
|
||||
with working_dir(test_dir, create=True):
|
||||
self.run_test("UnitTests")
|
||||
|
||||
@ -19,7 +19,8 @@ class MiopenHip(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["libMIOpen"]
|
||||
|
||||
version("5.6.1", sha256="ff627d68ed9e52433a3c808b5d3ff179a398b77ce81b00cfea7b2c4da5162c6c")
|
||||
version("5.6.0", sha256="d620ddab5b488bdf81242654fefa337c6b71dc410c2ff26d30a4ee86a8d22d11")
|
||||
version("5.5.1", sha256="2cd75071b8ee876c69a94f028b6c8a9346d6d2fde7d4b64e6d635f3b6c994262")
|
||||
version("5.5.0", sha256="791087242551669e546225e36123c21663f0dad14dbcfd6d0ce0e7bad0ab0de1")
|
||||
version("5.4.3", sha256="37ffe2ed3d7942da8ea2f6bdb85c7a2f58e3ccd31767db158a322769d3604efd")
|
||||
@ -144,6 +145,8 @@ class MiopenHip(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
@ -153,12 +156,11 @@ 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("mlirmiopen@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.4.0", "5.4.3", "5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("nlohmann-json", type="link")
|
||||
depends_on("composable-kernel@" + ver, when="@" + ver)
|
||||
for ver in ["5.4.0", "5.4.3", "5.5.0"]:
|
||||
depends_on("rocmlir@" + ver, when="@" + ver)
|
||||
for ver in ["5.5.1"]:
|
||||
depends_on("composable-kernel@" + ver, when="@" + ver)
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
if "@3.9.0:" in self.spec:
|
||||
@ -209,7 +211,12 @@ def cmake_args(self):
|
||||
)
|
||||
if self.spec.satisfies("@5.4.0:5.5.0"):
|
||||
args.append(self.define("MIOPEN_USE_COMPOSABLEKERNEL", "OFF"))
|
||||
args.append(self.define("MIOPEN_USE_MLIR", "ON"))
|
||||
args.append(self.define("MIOPEN_ENABLE_AI_KERNEL_TUNING", "OFF"))
|
||||
if self.spec.satisfies("@5.5.1:"):
|
||||
args.append(self.define("MIOPEN_USE_COMPOSABLEKERNEL", "ON"))
|
||||
args.append(self.define("MIOPEN_USE_MLIR", "OFF"))
|
||||
args.append(self.define("MIOPEN_ENABLE_AI_KERNEL_TUNING", "OFF"))
|
||||
args.append(
|
||||
"-DNLOHMANN_JSON_INCLUDE={0}".format(self.spec["nlohmann-json"].prefix.include)
|
||||
)
|
||||
return args
|
||||
|
||||
@ -25,6 +25,8 @@ def url_for_version(self, version):
|
||||
url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-{0}.tar.gz"
|
||||
return url.format(version)
|
||||
|
||||
version("5.6.1", sha256="b2ff95c1488e244f379482631dae4f9ab92d94a513d180e03607aa1e184b5b0a")
|
||||
version("5.6.0", sha256="34c184e202b1a6da2398b66e33c384d5bafd8f8291089c18539715c5cb73eb1f")
|
||||
version("5.5.1", sha256="e8209f87a57c4222003a936240e7152bbfa496862113358f29d4c3e80d4cdf56")
|
||||
version("5.5.0", sha256="af266550ecccad80f08954f23e47e8264eb338b0928a5314bd6efca349fc5a14")
|
||||
version("5.4.3", sha256="4da82974962a70c326ce2427c664517b1efdff436efe222e6bc28817c222a082")
|
||||
@ -115,6 +117,8 @@ def url_for_version(self, version):
|
||||
variant("opencl", default=False, description="Use OPENCL as the backend")
|
||||
variant("hip", default=True, description="Use HIP as backend")
|
||||
|
||||
conflicts("+opencl", when="@5.6.0:")
|
||||
|
||||
def patch(self):
|
||||
if self.spec.satisfies("@4.2.0"):
|
||||
filter_file(
|
||||
@ -255,13 +259,16 @@ def patch(self):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("miopen-hip@" + ver, when="@" + ver)
|
||||
for ver in ["5.3.3", "5.4.0", "5.4.3", "5.5.0", "5.5.1"]:
|
||||
for ver in ["5.3.3", "5.4.0", "5.4.3", "5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("migraphx@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
depends_on("python@3.5:", type="build")
|
||||
|
||||
def flag_handler(self, name, flags):
|
||||
spec = self.spec
|
||||
|
||||
@ -21,6 +21,8 @@ class Rccl(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["librccl"]
|
||||
version("5.6.1", sha256="27ec6b86a1a329684d808f728c1fce134517ac8e6e7047689f95dbf8386c077e")
|
||||
version("5.6.0", sha256="cce13c8a9e233e7ddf91a67b1626b7aaeaf818fefe61af8de6b6b6ff47cb358c")
|
||||
version("5.5.1", sha256="f6b9dc6dafeb49d95c085825876b09317d8252771c746ccf5aa19a9204a404b2")
|
||||
version("5.5.0", sha256="be2964b408741d046bcd606d339a233d1d1deac7b841647ec53d6d62d71452ba")
|
||||
version("5.4.3", sha256="a2524f602bd7b3b6afeb8ba9aff660216ee807fa836e46442d068b5ed5f51a4d")
|
||||
@ -143,6 +145,8 @@ class Rccl(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
@ -174,6 +178,8 @@ class Rccl(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("numactl@2:", when="@" + ver)
|
||||
for ver in [
|
||||
@ -190,12 +196,15 @@ class Rccl(CMakePackage):
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-smi-lib@" + ver, when="@" + ver)
|
||||
depends_on("chrpath", when="@5.3.0:")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
depends_on("googletest@1.11.0:", when="@5.3:")
|
||||
|
||||
|
||||
@ -26,6 +26,8 @@ def url_for_version(self, version):
|
||||
url = "https://github.com/RadeonOpenCompute/rdc/archive/rocm-{0}.tar.gz"
|
||||
return url.format(version)
|
||||
|
||||
version("5.6.1", sha256="9e9f57cebbc5ae386a405957ed2c17344cdb42db5e1a71285f2c9bc09eea6519")
|
||||
version("5.6.0", sha256="5213cd89215463862f6a1e9480ebe017944a6bb6b0db1722628afaa34af57991")
|
||||
version("5.5.1", sha256="a58a319ee702cf61cf71a4eba647c231392f68449b35419d941079c6de944844")
|
||||
version("5.5.0", sha256="56e85e77581963fbcfcc43e091a91773de470152347808ae730bcaf92c9f5ee8")
|
||||
version("5.4.3", sha256="c44f0b070b5650bc78e2eb968aae57a8ac1e1fd160e897055b79f3026c4fbad3")
|
||||
@ -130,6 +132,8 @@ def url_for_version(self, version):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-smi-lib@" + ver, type=("build", "link"), when="@" + ver)
|
||||
|
||||
@ -147,10 +151,12 @@ def url_for_version(self, version):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
def patch(self):
|
||||
|
||||
@ -24,7 +24,8 @@ class Rocalution(CMakePackage):
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
libraries = ["librocalution_hip"]
|
||||
|
||||
version("5.6.1", sha256="7197b3617a0c91e90adaa32003c04d247a5f585d216e77493d20984ba215addb")
|
||||
version("5.6.0", sha256="7397a2039e9615c0cf6776c33c4083c00b185b5d5c4149c89fea25a8976a3097")
|
||||
version("5.5.1", sha256="4612e30a0290b1732c8862eea655122abc2d22ce4345b8498fe4127697e880b4")
|
||||
version("5.5.0", sha256="626e966b67b83a1ef79f9bf27aba998c49cf65c4208092516aa1e32a6cbd8c36")
|
||||
version("5.4.3", sha256="39d00951a9b3cbdc4205a7e3ce75c026d9428c71c784815288c445f84a7f8a0e")
|
||||
@ -155,6 +156,8 @@ class Rocalution(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("rocprim@" + ver, when="@" + ver)
|
||||
|
||||
@ -21,6 +21,8 @@ class Rocblas(CMakePackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="73896ebd445162a69af97f9fd462684609b4e0cf617eab450cd4558b4a23941e")
|
||||
version("5.6.0", sha256="6a70b27eede02c45f46095a6ce8421af9a774a565e39f5e1074783ecf00c1ea7")
|
||||
version("5.5.1", sha256="7916a8d238d51cc239949d799f0b61c9d5cd63c6ccaed0e16749489b89ca8ff3")
|
||||
version("5.5.0", sha256="b5260517f199e806ae18f2c4495f163884e0d7a0a7c67af0770f7428ea50f898")
|
||||
version("5.4.3", sha256="d82cd334b7a9b40d16ec4f4bb1fb5662382dcbfc86ee5e262413ed63d9e6a701")
|
||||
@ -174,6 +176,8 @@ def check(self):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver)
|
||||
@ -191,6 +195,8 @@ def check(self):
|
||||
depends_on("py-wheel", type="build")
|
||||
depends_on("py-msgpack", type="build")
|
||||
depends_on("py-pip", type="build")
|
||||
depends_on("py-joblib", type="build", when="@5.6:")
|
||||
depends_on("procps", type="build", when="@5.6:")
|
||||
|
||||
for t_version, t_commit in [
|
||||
("@3.5.0", "f842a1a4427624eff6cbddb2405c36dec9a210cd"),
|
||||
@ -218,6 +224,8 @@ def check(self):
|
||||
("@5.4.3", "5aec08937473b27865fa969bb38a83bcf9463c2b"),
|
||||
("@5.5.0", "38d444a9f2b6cddfeaeedcb39a5688150fa27093"),
|
||||
("@5.5.1", "38d444a9f2b6cddfeaeedcb39a5688150fa27093"),
|
||||
("@5.6.0", "7d0a9d040c3bbae893df7ecef6a19d9cd1c304aa"),
|
||||
("@5.6.1", "7d0a9d040c3bbae893df7ecef6a19d9cd1c304aa"),
|
||||
]:
|
||||
resource(
|
||||
name="Tensile",
|
||||
|
||||
@ -18,6 +18,8 @@ class Rocfft(CMakePackage):
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie")
|
||||
libraries = ["librocfft"]
|
||||
version("5.6.1", sha256="a65861e453587c3e6393da75b0b1976508c61f968aecda77fbec920fea48489e")
|
||||
version("5.6.0", sha256="e3d4a6c1bdac78f9a22033f57011af783d560308103f73542f9e0e4dd133d38a")
|
||||
version("5.5.1", sha256="57423a64f5cdb1c37ff0891b6c17b59f73198d46be42db4ae23781ef2c0cd49d")
|
||||
version("5.5.0", sha256="9288152e66504b06082e4eed8cdb791b4f9ae2836b3defbeb4d2b54901b96485")
|
||||
version("5.4.3", sha256="ed9664adc9825c237327497bc4b23f020d50be7645647f14a45f4d943dd506e7")
|
||||
@ -155,6 +157,8 @@ def check(self):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
|
||||
@ -18,6 +18,8 @@ class RocmBandwidthTest(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="849af715d08dfd89e7aa5e4453b624151db1cafaa567ab5fa36a77948b90bf0d")
|
||||
version("5.6.0", sha256="ae2f7263a21a3a650068f43e3112b2b765eea80a5af2297572f850c77f83c85e")
|
||||
version("5.5.1", sha256="768b3da49fe7d4bb4e6536a8ee15be9f5e865d961e813ed4a407f32402685e1f")
|
||||
version("5.5.0", sha256="1070ce14d45f34c2c6b2fb003184f3ae735ccfd640e9df1c228988b2a5a82949")
|
||||
version("5.4.3", sha256="a2f5a75bf47db1e39a4626a9f5cd2d120bcafe56b1baf2455d794f7a4734993e")
|
||||
@ -128,12 +130,14 @@ class RocmBandwidthTest(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
build_targets = ["package"]
|
||||
|
||||
@ -16,6 +16,8 @@ class RocmClangOcl(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="c41deb1b564d939fc897b2bbdb13570b2234fa4c052a39783f5ad2dd1052f901")
|
||||
version("5.6.0", sha256="1afc47dee02d73c10de422f254067f4ef3ff921c4a1204d54ecc40e61fc63497")
|
||||
version("5.5.1", sha256="bfa62ad14830e2bd5afbc346685216c69f8cbef0eb449954f793178e10b19a38")
|
||||
version("5.5.0", sha256="43a5459165693301ba2ebcc41b2b0705df9a3a47571d43bdc2cc49cfdd0833a7")
|
||||
version("5.4.3", sha256="689e0354ea685bd488116de8eb902b902492e9ace184c3109b97b9a43f8b2d59")
|
||||
@ -126,6 +128,8 @@ class RocmClangOcl(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
@ -135,7 +139,7 @@ class RocmClangOcl(CMakePackage):
|
||||
depends_on(
|
||||
"rocm-device-libs@" + ver, when="@{0} ^llvm-amdgpu ~rocm-device-libs".format(ver)
|
||||
)
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
test_src_dir = "test"
|
||||
|
||||
@ -13,12 +13,14 @@ class RocmCmake(CMakePackage):
|
||||
|
||||
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"
|
||||
git = "https://github.com/RadeonOpenCompute/rocm-cmake.git"
|
||||
url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.5.0.tar.gz"
|
||||
url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.6.0.tar.gz"
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="98bf5fe2e6e12f55d122807d0060f1bb19c80d63d2c2f6fee579c40bfd244fa6")
|
||||
version("5.6.0", sha256="a118ca937856a4d0039955a8aef2466ef1fd1f08f7f7221cda53e1b5d02e476a")
|
||||
version("5.5.1", sha256="60113412b35d94e20e8100ed3db688c35801991b4b8fa282fdc6fd6fd413fb6e")
|
||||
version("5.5.0", sha256="b7884c346737eba70ae11044e41598b2482a92e21f3e0719b1ca11619f02a20b")
|
||||
version("5.4.3", sha256="c185b3a10d191d73b76770ca0f9d6bdc355ee91fe0c9016a3779c9cfe042ba0f")
|
||||
@ -104,7 +106,7 @@ class RocmCmake(CMakePackage):
|
||||
depends_on("cmake@3:", type="build")
|
||||
depends_on("cmake@3.6:", type="build", when="@4.1.0:")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
test_src_dir = "test"
|
||||
|
||||
@ -19,6 +19,8 @@ class RocmCore(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["librocm-core"]
|
||||
|
||||
version("5.6.1", sha256="eeef75e16e05380ccbc8df17a02dc141a66dddaadb444a97f7278f78067c498c")
|
||||
version("5.6.0", sha256="3c3d47c8b774968d768d42810a3fed42d058b7d6da248d5295df2a7ffb262568")
|
||||
version("5.5.1", sha256="bc73060432ffdc2e210394835d383890b9652476074ef4708d447473f273ce76")
|
||||
version("5.5.0", sha256="684d3312bb14f05dc280cf136f5eddff38ba340cd85c383d6a217d8e27d3d57d")
|
||||
|
||||
|
||||
@ -23,6 +23,8 @@ class RocmDbgapi(CMakePackage):
|
||||
libraries = ["librocm-dbgapi"]
|
||||
|
||||
version("master", branch="amd-master")
|
||||
version("5.6.1", sha256="c7241bf94bdb97a4cf1befbf25b8c35720797710da6f6b5b9d6a4094c1bc9c8b")
|
||||
version("5.6.0", sha256="9b66e47f4eccb3c8bbc324aade92aac6139539dda449427b7823d0c45341afc8")
|
||||
version("5.5.1", sha256="c41dfc62591bcf42003fe744d8bd03a51311d54e4b012f946ca0ede0c14dd977")
|
||||
version("5.5.0", sha256="ce572340a3fe99e4f1538eb614933153456003f8dfe9306a5735cdd25b451e25")
|
||||
version("5.4.3", sha256="d647c9121a50f2c54367c567d8f39a145cb135e1ceed931581659f57f49f61e5")
|
||||
@ -134,12 +136,14 @@ class RocmDbgapi(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("hsa-rocr-dev@" + ver, type="build", when="@" + ver)
|
||||
depends_on("comgr@" + ver, type=("build", "link"), when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
@classmethod
|
||||
|
||||
@ -18,6 +18,8 @@ class RocmDebugAgent(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["librocm-debug-agent"]
|
||||
version("5.6.1", sha256="d3b1d5d757489ed3cc66d351cec56b7b850aaa7ecf6a55b0350b89c3dee3153a")
|
||||
version("5.6.0", sha256="0bed788f07906afeb9092d0bec184a7963233ac9d8ccd20b4afeb624a1d20698")
|
||||
version("5.5.1", sha256="1bb66734f11bb57df6efa507f0217651446653bf28b3ca36acfcf94511a7c2bc")
|
||||
version("5.5.0", sha256="4f2431a395a77a06dc417ed1e9188731b031a0c680e62c6eee19d60965317f5a")
|
||||
version("5.4.3", sha256="b2c9ac198ea3cbf35e7e80f57c5d81c461de78b821d07b637ea4037a65cdf49f")
|
||||
@ -138,6 +140,8 @@ def url_for_version(self, version):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
@ -167,11 +171,13 @@ def url_for_version(self, version):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-dbgapi@" + ver, when="@" + ver)
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
# https://github.com/ROCm-Developer-Tools/rocr_debug_agent/pull/4
|
||||
|
||||
@ -18,6 +18,8 @@ class RocmDeviceLibs(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
|
||||
version("master", branch="amd-stg-open")
|
||||
version("5.6.1", sha256="f0dfab272ff936225bfa1e9dabeb3c5d12ce08b812bf53ffbddd2ddfac49761c")
|
||||
version("5.6.0", sha256="efb5dcdca9b3a9fbe408d494fb4a23e0b78417eb5fa8eebd4a5d226088f28921")
|
||||
version("5.5.1", sha256="3b5f6dd85f0e3371f6078da7b59bf77d5b210e30f1cc66ef1e2de6bbcb775833")
|
||||
version("5.5.0", sha256="5ab95aeb9c8bed0514f96f7847e21e165ed901ed826cdc9382c14d199cbadbd3")
|
||||
version("5.4.3", sha256="f4f7281f2cea6d268fcc3662b37410957d4f0bc23e0df9f60b12eb0fcdf9e26e")
|
||||
@ -138,11 +140,13 @@ class RocmDeviceLibs(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("llvm-amdgpu@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
def cmake_args(self):
|
||||
|
||||
@ -16,6 +16,8 @@ class RocmGdb(AutotoolsPackage):
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("5.6.1", sha256="d2b40d4c5aa41a6ce2a84307627b30d16a458672e03e13f9d27c12f2dc3f21d6")
|
||||
version("5.6.0", sha256="997ef1883aac2769552bc7082c70b837f4e98b57d24c133cea52b9c92fb0dee1")
|
||||
version("5.5.1", sha256="359258548bc7e6abff16bb13c301339fb96560b2b961433c9e0712e4aaf2d9e1")
|
||||
version("5.5.0", sha256="d3b100e332facd9635e328f5efd9f0565250edbe05be986baa2e0470a19bcd79")
|
||||
version("5.4.3", sha256="28c1ce39fb1fabe61f86f6e3c6940c10f9a8b8de77f7bb4fdd73b04e172f85f6")
|
||||
@ -135,11 +137,13 @@ class RocmGdb(AutotoolsPackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-dbgapi@" + ver, type="link", when="@" + ver)
|
||||
depends_on("comgr@" + ver, type="link", when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
build_directory = "spack-build"
|
||||
|
||||
@ -29,6 +29,8 @@ def url_for_version(self, version):
|
||||
return url.format(version)
|
||||
|
||||
version("master", branch="main")
|
||||
version("5.6.1", sha256="ec26049f7d93c95050c27ba65472736665ec7a40f25920a868616b2970f6b845")
|
||||
version("5.6.0", sha256="52ab260d00d279c2a86c353901ffd88ee61b934ad89e9eb480f210656705f04e")
|
||||
version("5.5.1", sha256="a8a62a7c6fc5398406d2203b8cb75621a24944688e545d917033d87de2724498")
|
||||
version("5.5.0", sha256="0df9fa0b8aa0c8e6711d34eec0fdf1ed356adcd9625bc8f1ce9b3e72090f3e4f")
|
||||
version("5.4.3", sha256="b0f8339c844a2e62773bd85cd1e7c5ecddfe71d7c8e8d604e1a1d60900c30873")
|
||||
@ -116,6 +118,8 @@ def url_for_version(self, version):
|
||||
depends_on("numactl", type="link", when="@3.7.0:")
|
||||
|
||||
for d_version, d_shasum in [
|
||||
("5.6.1", "cc9a99c7e4de3d9360c0a471b27d626e84a39c9e60e0aff1e8e1500d82391819"),
|
||||
("5.6.0", "864f87323e793e60b16905284fba381a7182b960dd4a37fb67420c174442c03c"),
|
||||
("5.5.1", "1375fc7723cfaa0ae22a78682186d4804188b0a54990bfd9c0b8eb421b85e37e"),
|
||||
("5.5.0", "efbae9a1ef2ab3de5ca44091e9bb78522e76759c43524c1349114f9596cc61d1"),
|
||||
("5.4.3", "71d9668619ab57ec8a4564d11860438c5aad5bd161a3e58fbc49555fbd59182d"),
|
||||
@ -186,12 +190,14 @@ def url_for_version(self, version):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("comgr@" + ver, type="build", when="@" + ver)
|
||||
depends_on("hsa-rocr-dev@" + ver, type="link", when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
@classmethod
|
||||
|
||||
@ -37,6 +37,8 @@
|
||||
"7f90634fb621169b21bcbd920c2e299acc88ba0eeb1a33fd40ae26e13201b652",
|
||||
"23cc7d1c82e35c74f48285a0a1c27e7b3cae1767568bb7b9367ea21f53dd6598",
|
||||
"9ec03a69cc462ada43e1fd4ca905a765b08c10e0911fb7a202c893cc577855e6",
|
||||
"0673820a81986c9e2f28f15bbb45ad18934bca56a9d08aae6c49ec3895b38487",
|
||||
"6c051bf7625f682ba3d2ea80b46a38ca2cbcd20f5d89ae3433602d3e7ef0403a",
|
||||
]
|
||||
|
||||
devlib = [
|
||||
@ -62,6 +64,8 @@
|
||||
"f4f7281f2cea6d268fcc3662b37410957d4f0bc23e0df9f60b12eb0fcdf9e26e",
|
||||
"5ab95aeb9c8bed0514f96f7847e21e165ed901ed826cdc9382c14d199cbadbd3",
|
||||
"3b5f6dd85f0e3371f6078da7b59bf77d5b210e30f1cc66ef1e2de6bbcb775833",
|
||||
"efb5dcdca9b3a9fbe408d494fb4a23e0b78417eb5fa8eebd4a5d226088f28921",
|
||||
"f0dfab272ff936225bfa1e9dabeb3c5d12ce08b812bf53ffbddd2ddfac49761c",
|
||||
]
|
||||
|
||||
llvm = [
|
||||
@ -87,6 +91,8 @@
|
||||
"a844d3cc01613f6284a75d44db67c495ac1e9b600eacbb1eb13d2649f5d5404d",
|
||||
"5dc6c99f612b69ff73145bee17524e3712990100e16445b71634106acf7927cf",
|
||||
"7d7181f20f89cb0715191aa32914186c67a34258c13457055570d47e15296553",
|
||||
"e922bd492b54d99e56ed88c81e2009ed6472059a180b10cc56ce1f9bd2d7b6ed",
|
||||
"045e43c0c4a3f4f2f1db9fb603a4f1ea3d56e128147e19ba17909eb57d7f08e5",
|
||||
]
|
||||
|
||||
flang = [
|
||||
@ -112,6 +118,8 @@
|
||||
"b283d76244d19ab16c9d087ee7de0d340036e9c842007aa9d288aa4e6bf3749f",
|
||||
"a18522588686672150c7862f2b23048a429baa4a66010c4196e969cc77bd152c",
|
||||
"7c3b4eb3e95b9e2f91234f202a76034628d230a92e57b7c5ee9dcca1097bec46",
|
||||
"fcefebddca0b373da81ff84f0f5469a1ef77a05430a5195d0f2e6399d3af31c3",
|
||||
"5ebcbca2e03bd0686e677f44ea551e97bd9395c6b119f832fa784818733aa652",
|
||||
]
|
||||
|
||||
extras = [
|
||||
@ -137,6 +145,8 @@
|
||||
"d393f27a85c9229433b50daee8154e11517160beb1049c1de9c55fc31dd11fac",
|
||||
"8f49026a80eb8685cbfb6d3d3b9898dd083df4d71893984ae5330d4804c685fb",
|
||||
"8955aa9d039fd6c1ff2e26d7298f0bf09bbcf03f09c6df92c91a9ab2510df9da",
|
||||
"017bfed52fbe08185d8dbde79377918454215683562519a9e47acf403d9a1c29",
|
||||
"437e2017cfe2ab73b15ada0fc1ea88f794f0b108cc5410f457268ae7e4e8985a",
|
||||
]
|
||||
|
||||
versions = [
|
||||
@ -162,6 +172,8 @@
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]
|
||||
versions_dict = dict() # type: Dict[str,Dict[str,str]]
|
||||
components = ["aomp", "devlib", "llvm", "flang", "extras"]
|
||||
@ -183,6 +195,8 @@ class RocmOpenmpExtras(Package):
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "estewart08")
|
||||
version("5.6.1", sha256=versions_dict["5.6.1"]["aomp"])
|
||||
version("5.6.0", sha256=versions_dict["5.6.0"]["aomp"])
|
||||
version("5.5.1", sha256=versions_dict["5.5.1"]["aomp"])
|
||||
version("5.5.0", sha256=versions_dict["5.5.0"]["aomp"])
|
||||
version("5.4.3", sha256=versions_dict["5.4.3"]["aomp"])
|
||||
@ -237,13 +251,15 @@ class RocmOpenmpExtras(Package):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
depends_on("comgr@" + ver, when="@" + ver)
|
||||
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
|
||||
depends_on("llvm-amdgpu@{0} ~openmp".format(ver), when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
# tag changed to 'rocm-' in 4.0.0
|
||||
|
||||
@ -25,6 +25,8 @@ class RocmSmiLib(CMakePackage):
|
||||
libraries = ["librocm_smi64"]
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="9e94f9a941202c3d7ce917fd1cd78c4e0f06f48d6c929f3aa916378ccef1e02c")
|
||||
version("5.6.0", sha256="88be875948a29454b8aacced8bb8ad967502a7a074ecbc579ed673c1650a2f7e")
|
||||
version("5.5.1", sha256="37f32350bfaf6c697312628696d1b1d5fd9165f183882759bc6cb9a5d65b9430")
|
||||
version("5.5.0", sha256="0703f49b1c2924cc1d3f613258eabdff1925cb5bcf7cf22bb6b955dd065e4ce8")
|
||||
version("5.4.3", sha256="34d550272e420684230ceb7845aefcef79b155e51cf9ec55e31fdba2a4ed177b")
|
||||
@ -112,14 +114,14 @@ class RocmSmiLib(CMakePackage):
|
||||
depends_on("cmake@3:", type="build")
|
||||
depends_on("python@3:", type=("build", "run"), when="@3.9.0:")
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
patch("disable_pdf_generation_with_doxygen_and_latex.patch", when="@4.5.2:")
|
||||
|
||||
def cmake_args(self):
|
||||
args = [
|
||||
self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
|
||||
self.define("CMAKE_INSTALL_LIBDIR", self.prefix.lib),
|
||||
self.define("CMAKE_INSTALL_LIBDIR", "lib"),
|
||||
]
|
||||
return args
|
||||
|
||||
|
||||
@ -18,6 +18,8 @@ class RocmTensile(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
|
||||
version("5.6.1", sha256="3e78c933563fade8781a1dca2079bff135af2f5d2c6eb0147797d2c1f24d006c")
|
||||
version("5.6.0", sha256="383728ecf49def59ab9a7f8a1d1e2eaf8b528e36b461e27030a2aab1a1ed80cb")
|
||||
version("5.5.1", sha256="b65cb7335abe51ba33be9d46a5ede992b4e5932fa33797397899a6bf33a770e9")
|
||||
version("5.5.0", sha256="70fd736d40bb4c3461f07c77ad3ae6c485e3e842671ce9b223d023d836884ae2")
|
||||
version("5.4.3", sha256="a4c5e62edd33ea6b8528eb3f017a14c28eaa67c540f5c9023f6a245340198b0f")
|
||||
@ -157,6 +159,8 @@ class RocmTensile(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-cmake@" + ver, type="build", when="@" + ver)
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
@ -174,6 +178,8 @@ class RocmTensile(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-openmp-extras@" + ver, when="@" + ver)
|
||||
|
||||
@ -201,6 +207,8 @@ class RocmTensile(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-smi-lib@" + ver, type="build", when="@" + ver)
|
||||
|
||||
|
||||
@ -0,0 +1,532 @@
|
||||
From 795e7474acf23eb2f7815fd54ffdd3fd41ff8c35 Mon Sep 17 00:00:00 2001
|
||||
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
|
||||
Date: Tue, 12 Sep 2023 07:00:31 +0000
|
||||
Subject: [PATCH] 5.6 Patch to add rocm-smi library and include path
|
||||
|
||||
---
|
||||
CMakeLists.txt | 105 ++++-----------------------------
|
||||
babel.so/CMakeLists.txt | 16 ++---
|
||||
cmake_modules/tests_unit.cmake | 2 +-
|
||||
edp.so/CMakeLists.txt | 3 +-
|
||||
gm.so/CMakeLists.txt | 4 +-
|
||||
gpup.so/CMakeLists.txt | 2 +-
|
||||
gst.so/CMakeLists.txt | 4 +-
|
||||
iet.so/CMakeLists.txt | 6 +-
|
||||
mem.so/CMakeLists.txt | 4 +-
|
||||
pbqt.so/CMakeLists.txt | 2 +-
|
||||
pebb.so/CMakeLists.txt | 2 +-
|
||||
peqt.so/CMakeLists.txt | 4 +-
|
||||
perf.so/CMakeLists.txt | 4 +-
|
||||
pesm.so/CMakeLists.txt | 2 +-
|
||||
rcqt.so/CMakeLists.txt | 2 +-
|
||||
rvs/CMakeLists.txt | 2 +-
|
||||
rvs/tests.cmake | 2 +-
|
||||
rvslib/CMakeLists.txt | 2 +-
|
||||
smqt.so/CMakeLists.txt | 2 +-
|
||||
testif.so/CMakeLists.txt | 2 +-
|
||||
20 files changed, 45 insertions(+), 127 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a12eb41..900657a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -68,13 +68,12 @@ endif(rocblas_FOUND)
|
||||
# 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(CMAKE_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE PATH "Prefix used in built packages")
|
||||
+set (CMAKE_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")
|
||||
|
||||
|
||||
#
|
||||
@@ -193,8 +192,6 @@ set(RVS_ROCBLAS "0" CACHE STRING "1 = use local rocBLAS")
|
||||
set(RVS_ROCMSMI "0" CACHE STRING "1 = use local rocm_smi_lib")
|
||||
|
||||
set(RVS_LIB_DIR "${CMAKE_BINARY_DIR}/rvslib" CACHE PATH "Contains RVS library")
|
||||
-set(YAML_INC_DIR "${CMAKE_BINARY_DIR}/yaml-src/include" CACHE PATH "Contains header files exported by yaml-cpp")
|
||||
-set(YAML_LIB_DIR "${CMAKE_BINARY_DIR}/yaml-build" CACHE PATH "Contains library files exported by yaml-cpp")
|
||||
|
||||
if (${RVS_OS_TYPE} STREQUAL "centos")
|
||||
set(ROCT_LIB_DIR "${ROCM_PATH}/lib64" CACHE PATH "Contains library files exported by ROC Trunk")
|
||||
@@ -238,86 +235,6 @@ if (NOT DEFINED CPACK_GENERATOR )
|
||||
endif()
|
||||
message (STATUS "CPACK_GENERATOR ${CPACK_GENERATOR}" )
|
||||
|
||||
-
|
||||
-################################################################################
|
||||
-# Download and unpack yaml-cpp at configure time
|
||||
-configure_file(CMakeYamlDownload.cmake yaml-download/CMakeLists.txt)
|
||||
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
|
||||
- RESULT_VARIABLE result
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-download )
|
||||
-if(result)
|
||||
- message(FATAL_ERROR "CMake step for yaml-download failed: ${result}")
|
||||
-endif()
|
||||
-execute_process(COMMAND ${CMAKE_COMMAND} --build .
|
||||
- RESULT_VARIABLE result
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-download )
|
||||
-if(result)
|
||||
- message(FATAL_ERROR "Build step for yaml-download failed: ${result}")
|
||||
-endif()
|
||||
-execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR}/yaml-src -B${CMAKE_BINARY_DIR}/yaml-build
|
||||
- RESULT_VARIABLE result
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-src )
|
||||
-if(result)
|
||||
- message(FATAL_ERROR "Config step for yaml-src failed: ${result}")
|
||||
-endif()
|
||||
-
|
||||
-add_custom_target(rvs_yaml_target
|
||||
- DEPENDS ${CMAKE_BINARY_DIR}/yaml-build/libyaml-cpp.a
|
||||
-)
|
||||
-
|
||||
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/yaml-build/libyaml-cpp.a
|
||||
- COMMAND make -C ${CMAKE_BINARY_DIR}/yaml-build
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-src
|
||||
- COMMENT "Generating yaml-cpp targets"
|
||||
- VERBATIM)
|
||||
-
|
||||
-################################################################################
|
||||
-## GOOGLE TEST
|
||||
-if(RVS_BUILD_TESTS)
|
||||
- # Download and unpack googletest at configure time
|
||||
- configure_file(CMakeGtestDownload.cmake googletest-download/CMakeLists.txt)
|
||||
- execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
|
||||
- RESULT_VARIABLE result
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
|
||||
- if(result)
|
||||
- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
|
||||
- endif()
|
||||
- execute_process(COMMAND ${CMAKE_COMMAND} --build .
|
||||
- RESULT_VARIABLE result
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
|
||||
- if(result)
|
||||
- message(FATAL_ERROR "Build step for googletest failed: ${result}")
|
||||
- endif()
|
||||
- execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR}/googletest-src -B${CMAKE_BINARY_DIR}/googletest-build
|
||||
- RESULT_VARIABLE result
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-src )
|
||||
- if(result)
|
||||
- message(FATAL_ERROR "Config step for googletest-src failed: ${result}")
|
||||
- endif()
|
||||
-
|
||||
- add_custom_target(rvs_gtest_target
|
||||
- DEPENDS ${CMAKE_BINARY_DIR}/googletest-build/lib/libgtest_main.a
|
||||
- )
|
||||
-
|
||||
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/googletest-build/lib/libgtest_main.a
|
||||
- COMMAND make -C ${CMAKE_BINARY_DIR}/googletest-build
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-src
|
||||
- COMMENT "Generating googletest targets"
|
||||
- VERBATIM)
|
||||
-
|
||||
- ## Set default unit test framework include path
|
||||
- if (NOT DEFINED UT_INC)
|
||||
- set (UT_INC "${CMAKE_BINARY_DIR}/googletest-src/googletest/include")
|
||||
- message ("UT_INC ${UT_INC}")
|
||||
- endif ()
|
||||
-
|
||||
- ## Set default unit test framework include path
|
||||
- if (NOT DEFINED UT_LIB)
|
||||
- set (UT_LIB "${CMAKE_BINARY_DIR}/googletest-build/lib")
|
||||
- message ("UT_LIB ${UT_LIB}")
|
||||
- endif()
|
||||
-
|
||||
-endif()
|
||||
################################################################################
|
||||
## rocBLAS
|
||||
|
||||
@@ -441,8 +358,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)
|
||||
@@ -457,8 +374,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")
|
||||
@@ -502,7 +419,7 @@ if (RVS_BUILD_TESTS)
|
||||
add_subdirectory(testif.so)
|
||||
endif()
|
||||
|
||||
-add_dependencies(rvshelper rvs_bin_folder rvs_doc rvs_yaml_target)
|
||||
+add_dependencies(rvshelper rvs_bin_folder rvs_doc)
|
||||
|
||||
|
||||
add_dependencies(pesm rvslib rvslibrt)
|
||||
@@ -537,7 +454,7 @@ if (RVS_BUILD_TESTS)
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
COMMENT "Create the bintest directory"
|
||||
VERBATIM)
|
||||
- add_dependencies(rvshelper rvs_bintest_folder rvs_gtest_target)
|
||||
+ add_dependencies(rvshelper rvs_bintest_folder)
|
||||
endif()
|
||||
|
||||
add_custom_target(rvs_doc ALL
|
||||
diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt
|
||||
index 7290cef..ebd55ad 100644
|
||||
--- a/babel.so/CMakeLists.txt
|
||||
+++ b/babel.so/CMakeLists.txt
|
||||
@@ -107,13 +107,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()
|
||||
|
||||
@@ -133,16 +133,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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
|
||||
diff --git a/cmake_modules/tests_unit.cmake b/cmake_modules/tests_unit.cmake
|
||||
index 586f453..c8b6560 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}" )
|
||||
diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt
|
||||
index a933061..d117e03 100644
|
||||
--- a/edp.so/CMakeLists.txt
|
||||
+++ b/edp.so/CMakeLists.txt
|
||||
@@ -129,6 +129,7 @@ endif()
|
||||
|
||||
|
||||
if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
|
||||
+ message("${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so not found")
|
||||
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()
|
||||
@@ -136,7 +137,7 @@ 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})
|
||||
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR})
|
||||
## additional libraries
|
||||
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpciaccess.so libpci.so libm.so)
|
||||
|
||||
diff --git a/gm.so/CMakeLists.txt b/gm.so/CMakeLists.txt
|
||||
index afaafcb..7c0cd79 100644
|
||||
--- a/gm.so/CMakeLists.txt
|
||||
+++ b/gm.so/CMakeLists.txt
|
||||
@@ -122,7 +122,7 @@ include_directories(./ ../ ${ROCM_SMI_INC_DIR})
|
||||
# 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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so librocm_smi64.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} rvslibrt rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
diff --git a/gpup.so/CMakeLists.txt b/gpup.so/CMakeLists.txt
|
||||
index ca1674b..a9e4d16 100644
|
||||
--- a/gpup.so/CMakeLists.txt
|
||||
+++ b/gpup.so/CMakeLists.txt
|
||||
@@ -111,7 +111,7 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ include ../include)
|
||||
# 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 rvslibrt rvslib libpci.so libm.so)
|
||||
|
||||
diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt
|
||||
index d85eadb..ca7fff4 100644
|
||||
--- a/gst.so/CMakeLists.txt
|
||||
+++ b/gst.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,7 +145,7 @@ 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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
|
||||
diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt
|
||||
index 3263d12..62f4318 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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
+set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so librocm_smi64.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} ${ROCM_SMI_LIB_DIR})
|
||||
add_dependencies(${RVS_TARGET} rvslibrt rvslib)
|
||||
|
||||
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
|
||||
diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt
|
||||
index 5a0f401..3fc4f51 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,7 +143,7 @@ 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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
|
||||
diff --git a/pbqt.so/CMakeLists.txt b/pbqt.so/CMakeLists.txt
|
||||
index d75211d..80abe22 100644
|
||||
--- a/pbqt.so/CMakeLists.txt
|
||||
+++ b/pbqt.so/CMakeLists.txt
|
||||
@@ -138,7 +138,7 @@ 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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
|
||||
diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt
|
||||
index 7ba031c..e64be8e 100644
|
||||
--- a/pebb.so/CMakeLists.txt
|
||||
+++ b/pebb.so/CMakeLists.txt
|
||||
@@ -139,7 +139,7 @@ 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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
|
||||
diff --git a/peqt.so/CMakeLists.txt b/peqt.so/CMakeLists.txt
|
||||
index 2248d91..7f5912d 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})
|
||||
## additional libraries
|
||||
set (PROJECT_LINK_LIBS rvslibrt rvslib libpci.so libm.so)
|
||||
|
||||
diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt
|
||||
index b319396..b9abe15 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,7 +145,7 @@ 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 rvslibrt rvslib libpthread.so libpci.so libm.so)
|
||||
|
||||
diff --git a/pesm.so/CMakeLists.txt b/pesm.so/CMakeLists.txt
|
||||
index ff60729..e7a2402 100644
|
||||
--- a/pesm.so/CMakeLists.txt
|
||||
+++ b/pesm.so/CMakeLists.txt
|
||||
@@ -109,7 +109,7 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ pci)
|
||||
# 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)
|
||||
|
||||
diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt
|
||||
index 32e1004..ac826ea 100644
|
||||
--- a/rcqt.so/CMakeLists.txt
|
||||
+++ b/rcqt.so/CMakeLists.txt
|
||||
@@ -110,7 +110,7 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../)
|
||||
# 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 rvslibrt rvslib)
|
||||
|
||||
diff --git a/rvs/CMakeLists.txt b/rvs/CMakeLists.txt
|
||||
index b350429..c855a32 100644
|
||||
--- a/rvs/CMakeLists.txt
|
||||
+++ b/rvs/CMakeLists.txt
|
||||
@@ -115,7 +115,7 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ ${YAML_INC_DIR} ${YAML_LIB_DIR}/include)
|
||||
## define lib directories
|
||||
-link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ASAN_LIB_PATH})
|
||||
+link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
|
||||
## additional libraries
|
||||
set (PROJECT_LINK_LIBS libdl.so "${YAML_LIB_DIR}/libyaml-cpp.a" libpthread.so)
|
||||
|
||||
diff --git a/rvs/tests.cmake b/rvs/tests.cmake
|
||||
index 32301c8..a058749 100644
|
||||
--- a/rvs/tests.cmake
|
||||
+++ b/rvs/tests.cmake
|
||||
@@ -179,7 +179,7 @@ add_test(NAME unit.ttf.rvs.config.noconfig
|
||||
## define include directories
|
||||
include_directories(${UT_INC})
|
||||
## define lib directories
|
||||
-link_directories(${UT_LIB})
|
||||
+link_directories(${UT_LIB} ${ROCM_SMI_LIB_DIR})
|
||||
## additional libraries for unit tests
|
||||
set (PROJECT_TEST_LINK_LIBS ${PROJECT_LINK_LIBS} libpci.so)
|
||||
|
||||
diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt
|
||||
index 31e6143..4ffed0f 100644
|
||||
--- a/rvslib/CMakeLists.txt
|
||||
+++ b/rvslib/CMakeLists.txt
|
||||
@@ -115,7 +115,7 @@ endif()
|
||||
|
||||
## define include directories
|
||||
include_directories(./ ../
|
||||
- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}
|
||||
+ ${ROCM_SMI_INC_DIR} ${HIP_PATH} ${ROCBLAS_INC_DIR}
|
||||
)
|
||||
link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
|
||||
|
||||
diff --git a/smqt.so/CMakeLists.txt b/smqt.so/CMakeLists.txt
|
||||
index e6b8ec4..722f329 100644
|
||||
--- a/smqt.so/CMakeLists.txt
|
||||
+++ b/smqt.so/CMakeLists.txt
|
||||
@@ -108,7 +108,7 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ pci)
|
||||
# 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 rvslibrt rvslib libpci.so libm.so)
|
||||
|
||||
diff --git a/testif.so/CMakeLists.txt b/testif.so/CMakeLists.txt
|
||||
index ed7d3d3..f09951e 100644
|
||||
--- a/testif.so/CMakeLists.txt
|
||||
+++ b/testif.so/CMakeLists.txt
|
||||
@@ -110,7 +110,7 @@ endif()
|
||||
## define include directories
|
||||
include_directories(./ ../ pci)
|
||||
# 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)
|
||||
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -21,6 +21,8 @@ class RocmValidationSuite(CMakePackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("5.6.1", sha256="d5e4100e2d07311dfa101563c15d026a8130442cdee8af9ef861832cd7866c0d")
|
||||
version("5.6.0", sha256="54cc5167055870570c97ee7114f48d24d5415f984e0c9d7b58b83467e0cf18fb")
|
||||
version("5.5.1", sha256="0fbfaa9f68642b590ef04f9778013925bbf3f17bdcd35d4c85a8ffd091169a6e")
|
||||
version("5.5.0", sha256="296add772171db67ab8838d2db1ea56df21e895c0348c038768e40146e4fe86a")
|
||||
version("5.4.3", sha256="1f0888e559104a4b8c2f5322f7463e425f2baaf12aeb1a8982a5974516e7b667")
|
||||
@ -111,7 +113,11 @@ class RocmValidationSuite(CMakePackage):
|
||||
patch("006-library-path.patch", when="@4.5.0:5.2")
|
||||
patch(
|
||||
"007-cleanup-path-reference-donot-download-googletest-yaml-library-path_5.3.patch",
|
||||
when="@5.3.0:",
|
||||
when="@5.3.0:5.5",
|
||||
)
|
||||
patch(
|
||||
"007-cleanup-path-reference-donot-download-googletest-yaml-library-path_5.6.patch",
|
||||
when="@5.6:",
|
||||
)
|
||||
|
||||
depends_on("cmake@3.5:", type="build")
|
||||
@ -150,6 +156,8 @@ def setup_build_environment(self, build_env):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("rocminfo@" + ver, when="@" + ver)
|
||||
|
||||
@ -18,6 +18,8 @@ class Rocminfo(CMakePackage):
|
||||
maintainers("srekolam", "renjithravindrankannath", "haampie")
|
||||
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="780b186ac7410a503eca1060f4bbc35db1b7b4d1d714d15c7534cd26d8af7b54")
|
||||
version("5.6.0", sha256="87d98a736e4f7510d1475d35717842068d826096a0af7c15a395bcf9d36d7fa0")
|
||||
version("5.5.1", sha256="bcab27bb3595d5a4c981e2416458d169e85c27e603c22e743d9240473bfbe98a")
|
||||
version("5.5.0", sha256="b6107d362b70e20a10911741eb44247139b4eb43489f7fa648daff880b6de37f")
|
||||
version("5.4.3", sha256="72159eed31f8deee0df9228b9e306a18fe9efdd4d6c0eead871cad4617874170")
|
||||
@ -128,12 +130,14 @@ class Rocminfo(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
"master",
|
||||
]:
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
def cmake_args(self):
|
||||
|
||||
@ -16,6 +16,8 @@ class Rocprim(CMakePackage):
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
|
||||
version("5.6.1", sha256="e9ec1b0039c07cf3096653a04224fe5fe755afc6ba000f6838b3a8bc84df27de")
|
||||
version("5.6.0", sha256="360d6ece3c4a3c289dd88043432026fb989e982ae4d05230d8cdc858bcd50466")
|
||||
version("5.5.1", sha256="63cdc682afb39efd18f097faf695ce64c851c4a550a8ad96fa89d694451b6a42")
|
||||
version("5.5.0", sha256="968d9059f93d3f0f8a602f7b989e54e36cff2f9136486b6869e4534a5bf8c7d9")
|
||||
version("5.4.3", sha256="7be6314a46195912d3203e7e59cb8880a46ed7c1fd221e92fadedd20532e0e48")
|
||||
@ -138,6 +140,8 @@ class Rocprim(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("comgr@" + ver, when="@" + ver)
|
||||
|
||||
@ -25,6 +25,8 @@ class Rocrand(CMakePackage):
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
|
||||
version("5.6.1", sha256="6bf71e687ffa0fcc1b00e3567dd43da4147a82390f1b2db5e6f1f594dee6066d")
|
||||
version("5.6.0", sha256="cc894d2f1af55e16b62c179062063946609c656043556189c656a115fd7d6f5f")
|
||||
version("5.5.1", sha256="e8bed3741b19e296bd698fc55b43686206f42f4deea6ace71513e0c48258cc6e")
|
||||
version("5.5.0", sha256="0481e7ef74c181026487a532d1c17e62dd468e508106edde0279ca1adeee6f9a")
|
||||
version("5.4.3", sha256="463aa760e9f74e45b326765040bb8a8a4fa27aaeaa5e5df16f8289125f88a619")
|
||||
@ -193,6 +195,8 @@ class Rocrand(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
|
||||
@ -39,6 +39,8 @@ class Rocsolver(CMakePackage):
|
||||
|
||||
version("develop", branch="develop")
|
||||
version("master", branch="master")
|
||||
version("5.6.1", sha256="6a8f366218aee599a0e56755030f94ee690b34f30e6d602748632226c5dc21bb")
|
||||
version("5.6.0", sha256="54baa7f35f3c53da9005054e6f7aeecece5526dafcb277af32cbcb3996b0cbbc")
|
||||
version("5.5.1", sha256="8bf843e42d2e89203ea5fdb6e6082cea90da8d02920ab4c09bcc2b6f69909760")
|
||||
version("5.5.0", sha256="6775aa5b96731208c12c5b450cf218d4c262a80b7ea20c2c3034c448bb2ca4d2")
|
||||
version("5.4.3", sha256="5308b68ea72f465239a4bb2ed1a0507f0df7c98d3df3fd1f392e6d9ed7975232")
|
||||
@ -132,7 +134,7 @@ class Rocsolver(CMakePackage):
|
||||
# Backport https://github.com/ROCmSoftwarePlatform/rocSOLVER/commit/2bbfb8976f6e4d667499c77e41a6433850063e88
|
||||
patch("fmt-8.1-compatibility.patch", when="@4.5.0:5.1.3")
|
||||
# Maximize compatibility with other libraries that are using fmt.
|
||||
patch("fmt-9-compatibility.patch", when="@5.2.0:")
|
||||
patch("fmt-9-compatibility.patch", when="@5.2.0:5.5")
|
||||
|
||||
def check(self):
|
||||
exe = join_path(self.build_directory, "clients", "staging", "rocsolver-test")
|
||||
@ -173,9 +175,13 @@ def check(self):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("rocblas@" + ver, when="@" + ver)
|
||||
for ver in ["5.6.0", "5.6.1"]:
|
||||
depends_on("rocsparse@5.2:", when="@5.6:")
|
||||
|
||||
for tgt in itertools.chain(["auto"], amdgpu_targets):
|
||||
depends_on("rocblas amdgpu_target={0}".format(tgt), when="amdgpu_target={0}".format(tgt))
|
||||
|
||||
@ -32,6 +32,9 @@ class Rocsparse(CMakePackage):
|
||||
sticky=True,
|
||||
)
|
||||
variant("test", default=False, description="Build rocsparse-test client")
|
||||
|
||||
version("5.6.1", sha256="6a50a64354507f1374e1a86aa7f5c07d1aaa96ac193ac292c279153087bb5d54")
|
||||
version("5.6.0", sha256="5797db3deb4a532e691447e3e8c923b93bd9fe4c468f3a88f00cecd80bebcae4")
|
||||
version("5.5.1", sha256="1dd2d18898dfebdf898e8fe7d1c1198e8f8451fd70ff12a1990ec1419cf359e1")
|
||||
version("5.5.0", sha256="cbee79b637691bc710c1c83fbaa91db7498d38d4df873be23e28ed5617acde72")
|
||||
version("5.4.3", sha256="9fb633f235eb0567cc54fae6bdc779f16bf0bb4e6f5bdddb40312c6d11ca8478")
|
||||
@ -142,6 +145,8 @@ class Rocsparse(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("rocprim@" + ver, when="@" + ver)
|
||||
|
||||
@ -19,6 +19,8 @@ class Rocthrust(CMakePackage):
|
||||
|
||||
maintainers("cgmb", "srekolam", "renjithravindrankannath")
|
||||
|
||||
version("5.6.1", sha256="63df61d5ab46d4cfda6066d748274bacecc77151692e372e6f7df5e91852bdc2")
|
||||
version("5.6.0", sha256="e52a27bcb4add38a5f0f3a5c7e409c230bf4ba9afae19bd2e06c2be00d39db59")
|
||||
version("5.5.1", sha256="66f126e5ea46ca761533411f81e83402773f95d3184cb7645ca73df227413023")
|
||||
version("5.5.0", sha256="c031f71cd4b6eaf98664fd2ad50fc18f7ccbfa67be415dca425169d2d1c81e9e")
|
||||
version("5.4.3", sha256="d133e14ea6d27d358d1bd4d31b79fb1562d1aea7c400e5a2d28d0f159cb6c8a8")
|
||||
@ -142,6 +144,8 @@ class Rocthrust(CMakePackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
depends_on("rocprim@" + ver, when="@" + ver)
|
||||
|
||||
@ -17,6 +17,8 @@ class RoctracerDevApi(Package):
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
version("5.6.1", sha256="007c498be25b067ad9a7631a2b0892f9129150ee9714e471a921225875d45e69")
|
||||
version("5.6.0", sha256="cbcfe4fa2e8b627006b320a93992fb3078696d8ef2ef049b4b880b6b7d57e13e")
|
||||
version("5.5.1", sha256="3afc31ebfdb14b0365185ca6b9326a83b1503a94a51d910f5ce7ced192d8c133")
|
||||
version("5.5.0", sha256="fe9ad95628fa96639db6fc33f78d334c814c7161b4a754598f5a4a7852625777")
|
||||
version("5.4.3", sha256="6b5111be5efd4d7fd6935ca99b06fab19b43d97a58d26fc1fe6e783c4de9a926")
|
||||
|
||||
@ -20,6 +20,8 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
libraries = ["libroctracer64"]
|
||||
version("5.6.1", sha256="007c498be25b067ad9a7631a2b0892f9129150ee9714e471a921225875d45e69")
|
||||
version("5.6.0", sha256="cbcfe4fa2e8b627006b320a93992fb3078696d8ef2ef049b4b880b6b7d57e13e")
|
||||
version("5.5.1", sha256="3afc31ebfdb14b0365185ca6b9326a83b1503a94a51d910f5ce7ced192d8c133")
|
||||
version("5.5.0", sha256="fe9ad95628fa96639db6fc33f78d334c814c7161b4a754598f5a4a7852625777")
|
||||
version("5.4.3", sha256="6b5111be5efd4d7fd6935ca99b06fab19b43d97a58d26fc1fe6e783c4de9a926")
|
||||
@ -72,6 +74,8 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("hsakmt-roct@" + ver, when="@" + ver)
|
||||
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
|
||||
@ -94,7 +98,7 @@ class RoctracerDev(CMakePackage, ROCmPackage):
|
||||
]:
|
||||
depends_on("rocprofiler-dev@" + ver, when="@" + ver)
|
||||
|
||||
for ver in ["5.5.0", "5.5.1"]:
|
||||
for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]:
|
||||
depends_on("rocm-core@" + ver, when="@" + ver)
|
||||
|
||||
patch("0001-include-rocprofiler-dev-path.patch", when="@5.3:5.4")
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From 099ac638f41d9224f649fe23a64783bb408a2b09 Mon Sep 17 00:00:00 2001
|
||||
From: Sreenivasa Murthy Kolam <sreenivasamurthy.kolam@amd.com>
|
||||
Date: Wed, 30 Aug 2023 09:41:15 +0000
|
||||
Subject: [PATCH] add rocm-smi-lib path for building tests
|
||||
|
||||
---
|
||||
test/CMakeLists.txt | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 85f98d0..269f517 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -69,11 +69,12 @@ function(add_rocwmma_test TEST_TARGET TEST_SOURCE)
|
||||
|
||||
list(APPEND TEST_SOURCE ${ARGN})
|
||||
add_executable(${TEST_TARGET} ${TEST_SOURCE})
|
||||
- target_link_libraries(${TEST_TARGET} rocwmma gtest)
|
||||
+ target_link_libraries(${TEST_TARGET} rocwmma gtest ${ROCM_SMI_DIR}/lib)
|
||||
target_link_libraries(${TEST_TARGET} OpenMP::OpenMP_CXX "-L${HIP_CLANG_ROOT}/lib" "-Wl,-rpath=${HIP_CLANG_ROOT}/lib")
|
||||
target_include_directories(${TEST_TARGET} PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
- ${ROCWMMA_TEST_INCLUDE_DIRS})
|
||||
+ ${ROCWMMA_TEST_INCLUDE_DIRS}
|
||||
+ ${ROCM_SMI_DIR}/include)
|
||||
|
||||
# Add support to include extended test coverage
|
||||
if(ROCWMMA_BUILD_EXTENDED_TESTS)
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -25,7 +25,8 @@ class Rocwmma(CMakePackage):
|
||||
tags = ["rocm"]
|
||||
|
||||
maintainers("srekolam", "renjithravindrankannath")
|
||||
|
||||
version("5.6.1", sha256="41a5159ee1ad5fc411fe6220f37bd754e26d3883c24c0f2378f50ef628bc1b8f")
|
||||
version("5.6.0", sha256="78b6ab10fce71d10a9d762b2eaab3390eb13b05c764f47a3b0a303ec3d37acf8")
|
||||
version("5.5.1", sha256="ada30d5e52df5da0d3f4e212a25efb492dbedc129628f4db4ef4ed77667da228")
|
||||
version("5.5.0", sha256="b9e1938cba111eeea295414c42de34d54a878f0d41a26e433809d60c12d31dbf")
|
||||
version("5.4.3", sha256="0968366c83b78a9d058d483be536aba03e79b300ccb6890d3da43298be54c288")
|
||||
@ -59,16 +60,33 @@ class Rocwmma(CMakePackage):
|
||||
|
||||
depends_on("googletest@1.10.0:", type="test")
|
||||
|
||||
for ver in ["5.2.0", "5.2.1", "5.2.3", "5.3.0", "5.3.3", "5.4.0", "5.4.3", "5.5.0", "5.5.1"]:
|
||||
for ver in [
|
||||
"5.2.0",
|
||||
"5.2.1",
|
||||
"5.2.3",
|
||||
"5.3.0",
|
||||
"5.3.3",
|
||||
"5.4.0",
|
||||
"5.4.3",
|
||||
"5.5.0",
|
||||
"5.5.1",
|
||||
"5.6.0",
|
||||
"5.6.1",
|
||||
]:
|
||||
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
|
||||
depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver)
|
||||
depends_on("hip@" + ver, when="@" + ver)
|
||||
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"]:
|
||||
depends_on("rocm-smi-lib@" + ver, when="@" + ver)
|
||||
|
||||
for tgt in itertools.chain(["auto"], amdgpu_targets):
|
||||
depends_on("rocblas amdgpu_target={0}".format(tgt), when="amdgpu_target={0}".format(tgt))
|
||||
|
||||
patch("0001-add-rocm-smi-lib-path-for-building-tests.patch", when="@5.6:")
|
||||
|
||||
def setup_build_environment(self, env):
|
||||
env.set("CXX", self.spec["hip"].hipcc)
|
||||
|
||||
@ -93,5 +111,7 @@ def cmake_args(self):
|
||||
tgt = self.spec.variants["amdgpu_target"]
|
||||
if "auto" not in tgt:
|
||||
args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target"))
|
||||
if self.spec.satisfies("@5.6.0:"):
|
||||
args.append(self.define("ROCM_SMI_DIR", self.spec["rocm-smi-lib"].prefix))
|
||||
|
||||
return args
|
||||
|
||||
Loading…
Reference in New Issue
Block a user