1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
|
From: Cordell Bloor <cgmb@debian.org>
Date: Thu, 20 Nov 2025 14:51:13 -0700
Subject: no rocm core tarball fixes
This change addresses the removal of ROCM_VERSION from the generated
files in the tarball. It doesn't need to be upstreamed, as these are
generated files.
Forwarded: not-needed
---
interface_hip/blas_c_v2.cpp | 2 +-
interface_hip/blas_d_v2.cpp | 2 +-
interface_hip/blas_s_v2.cpp | 2 +-
interface_hip/blas_z_v2.cpp | 2 +-
interface_hip/interface.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/interface_hip/blas_c_v2.cpp b/interface_hip/blas_c_v2.cpp
index ce6cc65..bce6c06 100644
--- a/interface_hip/blas_c_v2.cpp
+++ b/interface_hip/blas_c_v2.cpp
@@ -1859,7 +1859,7 @@ magma_ctrmm(
int(m), int(n),
(hipblasComplex*)&alpha, (const hipblasComplex*)dA, int(ldda),
(hipblasComplex*)dB, int(lddb)
- #if (ROCM_VERSION >= 60000)
+ #if (hipblasVersionMajor >= 2)
, (hipblasComplex*)dB, int(lddb)
#endif
);
diff --git a/interface_hip/blas_d_v2.cpp b/interface_hip/blas_d_v2.cpp
index c28be5b..f6d5850 100644
--- a/interface_hip/blas_d_v2.cpp
+++ b/interface_hip/blas_d_v2.cpp
@@ -1859,7 +1859,7 @@ magma_dtrmm(
int(m), int(n),
(double*)&alpha, (const double*)dA, int(ldda),
(double*)dB, int(lddb)
- #if (ROCM_VERSION >= 60000)
+ #if (hipblasVersionMajor >= 2)
, (double*)dB, int(lddb)
#endif
);
diff --git a/interface_hip/blas_s_v2.cpp b/interface_hip/blas_s_v2.cpp
index eabd9f7..31db285 100644
--- a/interface_hip/blas_s_v2.cpp
+++ b/interface_hip/blas_s_v2.cpp
@@ -1859,7 +1859,7 @@ magma_strmm(
int(m), int(n),
(float*)&alpha, (const float*)dA, int(ldda),
(float*)dB, int(lddb)
- #if (ROCM_VERSION >= 60000)
+ #if (hipblasVersionMajor >= 2)
, (float*)dB, int(lddb)
#endif
);
diff --git a/interface_hip/blas_z_v2.cpp b/interface_hip/blas_z_v2.cpp
index 63ffa8f..9705c4f 100644
--- a/interface_hip/blas_z_v2.cpp
+++ b/interface_hip/blas_z_v2.cpp
@@ -1859,7 +1859,7 @@ magma_ztrmm(
int(m), int(n),
(hipblasDoubleComplex*)&alpha, (const hipblasDoubleComplex*)dA, int(ldda),
(hipblasDoubleComplex*)dB, int(lddb)
- #if (ROCM_VERSION >= 60000)
+ #if (hipblasVersionMajor >= 2)
, (hipblasDoubleComplex*)dB, int(lddb)
#endif
);
diff --git a/interface_hip/interface.cpp b/interface_hip/interface.cpp
index 860278e..15a607a 100644
--- a/interface_hip/interface.cpp
+++ b/interface_hip/interface.cpp
@@ -540,7 +540,7 @@ magma_is_devptr( const void* A )
#endif
#elif defined(MAGMA_HAVE_HIP)
- #if ROCM_VERSION >= 60000
+ #if (hipblasVersionMajor >= 2)
return (attr.type == hipMemoryTypeDevice);
#else
return (attr.memoryType == hipMemoryTypeDevice);
|