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

Jump to bottom

Fixed minor issue in Gemm & updated Gemm doc #456

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Fixed minor issue in Gemm & updated Gemm doc #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 38 additions & 22 deletions doc/Gemm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,34 +191,41 @@ namespace blas {
/*!
* @brief Wrapper around Gemm. Creates the views, then makes and launches Gemm
*/
template <int WgSize, bool DoubleBuffer, bool ConflictA, bool ConflictB,
int ClSize, typename TileT, bool TransA, bool TransB,
int GemmMemoryType, int GemmAlgorithm, int GemmVectorization,
bool is_beta_zero, int VectorSize, int BatchType>
template <int WgSize, bool DoubleBuffer, bool ConflictA, bool ConflictB,
int ClSize, typename TileT, bool TransA, bool TransB, bool SymmA,
bool SymmB, int GemmMemoryType, int GemmAlgorithm,
int GemmVectorization, bool is_beta_zero, int VectorSize,
int BatchType, bool UseJointMatrix>

template <typename SB_Handle, typename container_t0, typename container_t1,
template <typename sb_handle_t, typename container_t0, typename container_t1,
typename container_t2, typename element_t, typename index_t>

typename SB_Handle::event_t Gemm_Launcher<
WgSize, DoubleBuffer, ConflictA, ConflictB, ClSize, TileT, TransA, TransB,
GemmMemoryType, GemmAlgorithm, GemmVectorization, is_beta_zero, VectorSize,
BatchType>::_select_gemm(SB_Handle& sb_handle, index_t _M, index_t _N, index_t _K,
element_t _alpha, container_t0 a_, index_t _lda,
container_t1 b_, index_t _ldb, element_t _beta,
container_t2 _C, index_t _ldc,
index_t batch_size) {
typename sb_handle_t::event_t
Gemm_Launcher<WgSize, DoubleBuffer, ConflictA, ConflictB, ClSize, TileT, TransA,
TransB, SymmA, SymmB, GemmMemoryType, GemmAlgorithm,
GemmVectorization, is_beta_zero, VectorSize, BatchType,
UseJointMatrix>::_select_gemm(sb_handle_t& sb_handle, index_t _M,
index_t _N, index_t _K,
element_t _alpha, container_t0 a_,
index_t _lda, index_t _stridea,
container_t1 b_, index_t _ldb,
index_t _strideb, element_t _beta,
container_t2 _C, index_t _ldc,
index_t _stridec,
index_t batch_size) {

//Helper functions used to make matrix views
auto buffer_a = make_matrix_view<col_major>(a_, _M, _K, _lda);
auto buffer_b = make_matrix_view<col_major>(b_, _K, _N, _ldb);
auto buffer_a = make_matrix_view<col_major>(a_, _M, _K, _lda);
auto buffer_b = make_matrix_view<col_major>(b_, _K, _N, _ldb);
auto buffer_c = make_matrix_view<col_major>(_C, _M, _N, _ldc);

//Helper function to construct the Gemm object
auto gemm = make_gemm<DoubleBuffer, ConflictA, ConflictB, ClSize, TileT,
TransA, TransB, GemmMemoryType, GemmAlgorithm,
GemmVectorization, is_beta_zero, VectorSize, BatchType>(
auto gemm = make_gemm<DoubleBuffer, ConflictA, ConflictB, ClSize, TileT,
TransA, TransB, SymmA, SymmB, GemmMemoryType,
GemmAlgorithm, GemmVectorization, is_beta_zero,
VectorSize, BatchType, UseJointMatrix>(
buffer_a, buffer_b, buffer_c, element_t(_alpha), element_t(_beta),
batch_size);
batch_size, index_t(_stridea), index_t(_strideb), index_t(_stridec));

//Execute the gemm and return the associated event
return sb_handle.execute(gemm);
Expand Down Expand Up @@ -259,6 +266,14 @@ template typename SB_Handle::event_t _gemm_batched(
${INDEX_TYPE} _lda, ${INDEX_TYPE} _stridea, ${container_t1} b_, ${INDEX_TYPE} _ldb,
${INDEX_TYPE} _strideb, ${DATA_TYPE} _beta, ${container_t2} _C, ${INDEX_TYPE} _ldc,
${INDEX_TYPE} _stridec, ${INDEX_TYPE} batch_size, gemm_batch_type_t batch_type);
// strided batched gemm
template typename SB_Handle::event_t _gemm_strided_batched(
SB_Handle& sb_handle, char _TransA, char _TransB, ${INDEX_TYPE} _M,
${INDEX_TYPE} _N, ${INDEX_TYPE} _K, ${DATA_TYPE} _alpha, ${container_t0} a_,
${INDEX_TYPE} _lda, ${INDEX_TYPE} _stridea, ${container_t1} b_,
${INDEX_TYPE} _ldb, ${INDEX_TYPE} _strideb, ${DATA_TYPE} _beta,
${container_t2} _C, ${INDEX_TYPE} _ldc, ${INDEX_TYPE} _stridec,
${INDEX_TYPE} batch_size);
} // namespace internal
} // namespace blas
```
Expand Down Expand Up @@ -300,9 +315,10 @@ template <bool _t_a, bool _t_b, bool is_beta_zero, typename sb_handle_t,
typename container_2_t, typename element_t, typename index_t>

typename sb_handle_t::event_t _gemm(
sb_handle_t& sb_handle, index_t _M, index_t _N, index_t _K, element_t _alpha,
container_0_t _a, index_t _lda, container_1_t _b, index_t _ldb,
element_t _beta, container_2_t _c, index_t _ldc, index_t batch_size,
sb_handle_t& sb_handle, index_t _M, index_t _N, index_t _K,
element_t _alpha, container_0_t _a, index_t _lda, index_t _stridea,
container_1_t _b, index_t _ldb, index_t _strideb, element_t _beta,
container_2_t _c, index_t _ldc, index_t _stridec, index_t batch_size,
gemm_batch_type_t batch_type) {
if (batch_type == gemm_batch_type_t::interleaved) {
return blas::Gemm_Launcher<
Expand Down
4 changes: 2 additions & 2 deletions include/operations/blas3_trees.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ inline Gemm<input_t, output_t, DoubleBuffer, ConflictA, ConflictB, ClSize,
GemmMemoryType, GemmAlgorithm, GemmVectorization, VectorSize,
BatchType, UseJointMatrix>
make_gemm(input_t buffer_a, input_t buffer_b, output_t buffer_c,
element_t alpha, element_t beta, index_t batch_size,
element_t _stridea, element_t _strideb, element_t _stridec) {
element_t alpha, element_t beta, index_t batch_size, index_t _stridea,
index_t _strideb, index_t _stridec) {
return Gemm<input_t, output_t, DoubleBuffer, ConflictA, ConflictB, ClSize,
TileType, TransA, TransB, SymmA, SymmB, element_t, is_beta_zero,
GemmMemoryType, GemmAlgorithm, GemmVectorization, VectorSize,
Expand Down
3 changes: 1 addition & 2 deletions src/interface/gemm_launcher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ Gemm_Launcher<WgSize, DoubleBuffer, ConflictA, ConflictB, ClSize, TileT, TransA,
GemmAlgorithm, GemmVectorization, is_beta_zero,
VectorSize, BatchType, UseJointMatrix>(
buffer_a, buffer_b, buffer_c, element_t(_alpha), element_t(_beta),
batch_size, element_t(_stridea), element_t(_strideb),
element_t(_stridec));
batch_size, index_t(_stridea), index_t(_strideb), index_t(_stridec));
return sb_handle.execute(gemm);
}

Expand Down