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

Fix compilation with libc++ #1516

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+27 −25
Open

Fix compilation with libc++ #1516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f9835c
Fix compilation with libc++
AngryLoki Jan 6, 2025
d33241d
apply clang-format
jichangjichang Feb 4, 2025
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
52 changes: 27 additions & 25 deletions library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* MIT License
*
* Copyright (C) 2022-2024 Advanced Micro Devices, Inc.
* Copyright (C) 2022-2025 Advanced Micro Devices, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -28,6 +28,7 @@
#include "handle.h"
#include "rocblaslt_mat_utils.hpp"
#include "tensile_host.hpp"
#include <array>

#include <hip/hip_runtime_api.h>

Expand Down Expand Up @@ -376,24 +377,24 @@ rocblaslt_status
hipDataType type_c = matC[0]->type;
hipDataType type_d = matD[0]->type;

std::vector<const void*> A_vec, B_vec, C_vec, alpha_vec, beta_vec;
std::vector<void*> D_vec, E_vec, amaxD_vec;
std::vector<const void*> bias_vec;
std::vector<const void*> scaleA_vec;
std::vector<const void*> scaleB_vec;
std::vector<const void*> scaleC_vec;
std::vector<const void*> scaleD_vec;
std::vector<const void*> scaleE_vec;
std::vector<const void*> scaleAlpha_vec;
std::vector<hipDataType> bias_type_vec;
std::vector<rocblaslt_epilogue> epilogue_vec;
std::vector<int64_t> m_vec, n_vec, k_vec;
std::vector<int64_t> lda_vec, batch_stride_a_vec, num_batches_a_vec;
std::vector<int64_t> ldb_vec, batch_stride_b_vec, num_batches_b_vec;
std::vector<int64_t> ldc_vec, batch_stride_c_vec, num_batches_c_vec;
std::vector<int64_t> ldd_vec, batch_stride_d_vec, num_batches_d_vec;
std::vector<int64_t> lde_vec, batch_stride_e_vec, num_batches_e_vec;
std::vector<int8_t[16]> alpha_1(matmul_descr.size());
std::vector<const void*> A_vec, B_vec, C_vec, alpha_vec, beta_vec;
std::vector<void*> D_vec, E_vec, amaxD_vec;
std::vector<const void*> bias_vec;
std::vector<const void*> scaleA_vec;
std::vector<const void*> scaleB_vec;
std::vector<const void*> scaleC_vec;
std::vector<const void*> scaleD_vec;
std::vector<const void*> scaleE_vec;
std::vector<const void*> scaleAlpha_vec;
std::vector<hipDataType> bias_type_vec;
std::vector<rocblaslt_epilogue> epilogue_vec;
std::vector<int64_t> m_vec, n_vec, k_vec;
std::vector<int64_t> lda_vec, batch_stride_a_vec, num_batches_a_vec;
std::vector<int64_t> ldb_vec, batch_stride_b_vec, num_batches_b_vec;
std::vector<int64_t> ldc_vec, batch_stride_c_vec, num_batches_c_vec;
std::vector<int64_t> ldd_vec, batch_stride_d_vec, num_batches_d_vec;
std::vector<int64_t> lde_vec, batch_stride_e_vec, num_batches_e_vec;
std::vector<std::array<int8_t, 16>> alpha_1(matmul_descr.size());

std::vector<bool> gradient_vec;

Expand Down Expand Up @@ -493,10 +494,10 @@ rocblaslt_status
return validArgs;

const void* alphaTmp = nullptr;
memset(alpha_1[i], 0, sizeof(int8_t) * 16);
memset(alpha_1[i].data(), 0, sizeof(int8_t) * 16);
if(scaleAlphaVec)
{
setTo1(compute_type, (void*)alpha_1[i], &alphaTmp);
setTo1(compute_type, (void*)alpha_1[i].data(), &alphaTmp);
}
else
{
Expand Down Expand Up @@ -736,7 +737,8 @@ rocblaslt_status rocblaslt_matmul(rocblaslt_handle handle,
"workSpaceSizeInBytes",
workspaceSizeInBytes,
(matmul_descr->pointermode) ? "alphaVector" : "alpha",
*(reinterpret_cast<const float*>(alpha)), // TODO: Add casts for f16 and int types of alpha.
*(reinterpret_cast<const float*>(
alpha)), // TODO: Add casts for f16 and int types of alpha.
"beta",
*(reinterpret_cast<const float*>(beta)),
"stream",
Expand Down Expand Up @@ -1193,7 +1195,7 @@ rocblaslt_status rocblaslt_groupedgemm_create_cpp_impl_2(const rocblaslt_handle
std::vector<int64_t> lde_vec, batch_stride_e_vec, num_batches_e_vec;
std::vector<bool> gradient_vec;

std::vector<int8_t[16]> alpha_1(m.size());
std::vector<std::array<int8_t, 16>> alpha_1(m.size());

for(int i = 0; i < m.size(); i++)
{
Expand Down Expand Up @@ -1287,10 +1289,10 @@ rocblaslt_status rocblaslt_groupedgemm_create_cpp_impl_2(const rocblaslt_handle
return validArgs;

const void* alphaTmp = nullptr;
memset(alpha_1[i], 0, sizeof(int8_t) * 16);
memset(alpha_1[i].data(), 0, sizeof(int8_t) * 16);
if(scaleAlphaVec)
{
setTo1(compute_type, (void*)alpha_1[i], &alphaTmp);
setTo1(compute_type, (void*)alpha_1[i].data(), &alphaTmp);
}
else
{
Expand Down