Commit b91cb13a authored by Jing Zhang's avatar Jing Zhang
Browse files

resolve merge conflicts

parents bbb2cb69 57462a35
...@@ -247,7 +247,7 @@ bool run_gemm_splitk_example(int argc, char* argv[]) ...@@ -247,7 +247,7 @@ bool run_gemm_splitk_example(int argc, char* argv[])
ProblemSizeSplitK problem_size; ProblemSizeSplitK problem_size;
ExecutionConfig config; ExecutionConfig config;
return !parse_cmd_args(argc, argv, problem_size, config) || run_gemm(problem_size, config); return parse_cmd_args(argc, argv, problem_size, config) && run_gemm(problem_size, config);
} }
int main(int argc, char* argv[]) { return !run_gemm_splitk_example(argc, argv); } int main(int argc, char* argv[]) { return !run_gemm_splitk_example(argc, argv); }
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// Copyright (c) 2018-2023, Advanced Micro Devices, Inc. All rights reserved. // Copyright (c) 2024, Advanced Micro Devices, Inc. All rights reserved.
#include "common.hpp" #include "common.hpp"
...@@ -23,7 +23,6 @@ static constexpr auto GemmDefault = ck::tensor_operation::device::GemmSpecializa ...@@ -23,7 +23,6 @@ static constexpr auto GemmDefault = ck::tensor_operation::device::GemmSpecializa
static constexpr bool PermuteA = false; static constexpr bool PermuteA = false;
static constexpr bool PermuteB = true; static constexpr bool PermuteB = true;
static constexpr ck::index_t KPerBlock = 128; static constexpr ck::index_t KPerBlock = 128;
// clang-format off // clang-format off
...@@ -300,7 +299,7 @@ bool run_gemm_splitk_example(int argc, char* argv[]) ...@@ -300,7 +299,7 @@ bool run_gemm_splitk_example(int argc, char* argv[])
ProblemSizeSplitK problem_size; ProblemSizeSplitK problem_size;
ExecutionConfig config; ExecutionConfig config;
return !parse_cmd_args(argc, argv, problem_size, config) || run_gemm(problem_size, config); return parse_cmd_args(argc, argv, problem_size, config) && run_gemm(problem_size, config);
} }
int main(int argc, char* argv[]) { return !run_gemm_splitk_example(argc, argv); } int main(int argc, char* argv[]) { return !run_gemm_splitk_example(argc, argv); }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment