From f7f9954db259cd44a9d63c20ea6608b08d791491 Mon Sep 17 00:00:00 2001 From: Harisankar Sadasivan Date: Tue, 25 Jun 2024 18:05:59 +0000 Subject: [PATCH] removed conflicts in struct members between streamk and unievrsal streamk --- example/01_gemm/common.hpp | 12 ++++++++++++ example/01_gemm/gemm_xdl_fp16_streamk_v3.cpp | 2 +- example/01_gemm/run_gemm_example_streamk_v2.inc | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/example/01_gemm/common.hpp b/example/01_gemm/common.hpp index 7aab237751..7fd5772308 100755 --- a/example/01_gemm/common.hpp +++ b/example/01_gemm/common.hpp @@ -43,6 +43,18 @@ struct ProblemSizeStreamK final ck::index_t StrideB = 4096; ck::index_t StrideC = 4096; + ck::index_t NumSKBlocks = -1; +}; +struct ProblemSizeStreamK_universal final +{ + ck::index_t M = 3840; + ck::index_t N = 4096; + ck::index_t K = 4096; + + ck::index_t StrideA = 4096; + ck::index_t StrideB = 4096; + ck::index_t StrideC = 4096; + ck::index_t Grid_size = -1; // defaults to max occupancy ck::index_t Streamk_sel = 1; // defaults to 1-tile SK }; diff --git a/example/01_gemm/gemm_xdl_fp16_streamk_v3.cpp b/example/01_gemm/gemm_xdl_fp16_streamk_v3.cpp index 02ec3a0434..a4bb74876b 100755 --- a/example/01_gemm/gemm_xdl_fp16_streamk_v3.cpp +++ b/example/01_gemm/gemm_xdl_fp16_streamk_v3.cpp @@ -45,4 +45,4 @@ using ReferenceGemmInstance = ck::tensor_operation::host:: #include "run_gemm_example_streamk_v2.inc" -int main(int argc, char* argv[]) { return !run_gemm_splitk_example(argc, argv); } +int main(int argc, char* argv[]) { return !run_gemm_universal_streamk_example(argc, argv); } diff --git a/example/01_gemm/run_gemm_example_streamk_v2.inc b/example/01_gemm/run_gemm_example_streamk_v2.inc index 3f79746192..d6ed16a122 100755 --- a/example/01_gemm/run_gemm_example_streamk_v2.inc +++ b/example/01_gemm/run_gemm_example_streamk_v2.inc @@ -290,9 +290,9 @@ bool run_gemm(const ProblemType& problem_size, const ExecutionConfig& config) return pass; } -bool run_gemm_splitk_example(int argc, char* argv[]) +bool run_gemm_universal_streamk_example(int argc, char* argv[]) { - ProblemSizeStreamK problem_size; + ProblemSizeStreamK_universal problem_size; ExecutionConfig config; return !parse_cmd_args(argc, argv, problem_size, config) || run_gemm(problem_size, config);