Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rocblas -> hipblas changes for ROCm #5401

Merged
merged 9 commits into from
May 17, 2024
Merged

rocblas -> hipblas changes for ROCm #5401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
392147a
rocblas -> hipblas changes
rraminen Mar 22, 2024
cd50f08
Use HIPBLAS_COMPUTE_32F for if HIPBLAS_V2
rraminen Apr 18, 2024
9b2ceca
Changes required to enable transformer and stochastic_transformer ext…
rraminen Apr 19, 2024
b339161
Added defined(HIPBLAS_V2)
rraminen Apr 23, 2024
6d9fee9
Added comments
rraminen May 16, 2024
ee3372f
Formatting fix
rraminen May 16, 2024
c5b808e
Merge branch 'master' into rocblas_to_hipblas_fix
loadams May 16, 2024
e24e586
Formatting fixes
loadams May 16, 2024
b3ccff3
Fix torch version check
rraminen May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions csrc/includes/gemm_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ class StridedGemmTest {
stride_b,
stride_c,
bsz,
#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
static_cast<rocblas_gemm_algo>(algo));
#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
static_cast<rocblas_gemm_algo>(algo));
loadams marked this conversation as resolved.
Show resolved Hide resolved
#else
static_cast<cublasGemmAlgo_t>(algo));
#endif
Expand Down
4 changes: 2 additions & 2 deletions csrc/includes/strided_batch_gemm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ class StridedBatchGemm {
stride_b,
stride_c,
bsz,
#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
rocblas_gemm_algo(_config.gemm_algos[2]));
#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
rocblas_gemm_algo(_config.gemm_algos[2]));
#else
cublasGemmAlgo_t(_config.gemm_algos[2]));
#endif
Expand Down
6 changes: 3 additions & 3 deletions csrc/transformer/cublas_wrappers.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ int cublas_gemm_ex(cublasHandle_t handle,
algo);
#endif

#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
if (status != rocblas_status_success) {
#else
if (status != CUBLAS_STATUS_SUCCESS) {
Expand Down Expand Up @@ -335,7 +335,7 @@ int cublas_strided_batched_gemm(cublasHandle_t handle,
algo);
#endif

#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
if (status != rocblas_status_success) {
#else
if (status != CUBLAS_STATUS_SUCCESS) {
Expand Down Expand Up @@ -463,7 +463,7 @@ int cublas_strided_batched_gemm(cublasHandle_t handle,
algo);
#endif

#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
#if defined(__HIP_PLATFORM_AMD__) && TORCH_VERSION_MAJOR <= 2 && TORCH_VERSION_MINOR <=0
if (status != rocblas_status_success) {
#else
if (status != CUBLAS_STATUS_SUCCESS) {
Expand Down