resolved merge conflicts

5a3c2297 · Jing Zhang · b5ada11b · 5a3c2297
Commit 5a3c2297 authored Jun 01, 2022 by Jing Zhang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

include/ck/tensor_operation/gpu/device/device_grouped_gemm_transpose_xdl.hpp ...peration/gpu/device/device_grouped_gemm_transpose_xdl.hpp +2 -4

No files found.
--- a/include/ck/tensor_operation/gpu/device/device_grouped_gemm_transpose_xdl.hpp
+++ b/include/ck/tensor_operation/gpu/device/device_grouped_gemm_transpose_xdl.hpp
@@ -332,7 +332,6 @@ struct DeviceGroupedGemmTransposeXdl : public DeviceGroupedGemmTranspose<AElemen
            return block_2_ctile_map_.CheckValidity(c_grid_desc_m_n);
        }
-        private:
        typename GridwiseGemm::DefaultBlock2CTileMap block_2_ctile_map_;
        ck::index_t BlockStart_;
    };
@@ -413,9 +412,8 @@ struct DeviceGroupedGemmTransposeXdl : public DeviceGroupedGemmTranspose<AElemen
                        gemm_transpose_desc[i].StrideN1);
                const index_t grid_size_grp =
-                    typename GroupedGemmBlock2CTileMap::UnderlyingBlock2CTileMap(
+                    GroupedGemmBlock2CTileMap(c_grid_desc_m_n_, M01, N01, 0)
-                        c_grid_desc_m_n_, M01, N01)
+                        .block_2_ctile_map_.CalculateGridSize(c_grid_desc_m_n_);
-                        .CalculateGridSize(c_grid_desc_m_n_);
                const index_t BlockStart = grid_size_;
                const index_t BlockEnd   = grid_size_ + grid_size_grp;