Skip to content

GitLab

Commit 8d7d048d authored by Chao Liu's avatar Chao Liu
Browse files

fix merge conflict

parent c7c15ea5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
composable_kernel/include/kernel_algorithm/gridwise_convolution_backward_data_implicit_gemm_v4r3_nchw_kcyx_nkhw.hpp
View file @ 8d7d048d
...@@ -441,11 +441,11 @@ struct GridwiseConvolutionBackwardDataImplicitGemm_v4r3_nchw_kcyx_nkhw ...@@ -441,11 +441,11 @@ struct GridwiseConvolutionBackwardDataImplicitGemm_v4r3_nchw_kcyx_nkhw
decltype(c_m_n_thread_mtx_desc), decltype(c_m_n_thread_mtx_desc),
GemmMPerThread, GemmMPerThread,
GemmNPerThread, GemmNPerThread,
GemmKPerThread,
GemmMLevel0Cluster, GemmMLevel0Cluster,
GemmNLevel0Cluster, GemmNLevel0Cluster,
GemmMLevel1Cluster, GemmMLevel1Cluster,
GemmNLevel1Cluster, GemmNLevel1Cluster,
GemmKPerThread,
ThreadGemmDataPerRead_GemmM, ThreadGemmDataPerRead_GemmM,
ThreadGemmDataPerRead_GemmN>{}; ThreadGemmDataPerRead_GemmN>{};
......
driver/include/device_convolution_backward_data_implicit_gemm_v4r2_nchw_kcyx_nkhw.hpp
View file @ 8d7d048d
#pragma once #pragma once
#include <unistd.h> #include <unistd.h>
#include "device.hpp" #include "device.hpp"
#include "tensor.hpp" #include "host_tensor.hpp"
#include "gridwise_convolution_backward_data_implicit_gemm_v4r2_nchw_kcyx_nkhw.hpp" #include "gridwise_convolution_backward_data_implicit_gemm_v4r2_nchw_kcyx_nkhw.hpp"
namespace launcher { namespace launcher {
......
driver/include/device_convolution_backward_data_implicit_gemm_v4r3_nchw_kcyx_nkhw.hpp
View file @ 8d7d048d
#pragma once #pragma once
#include <unistd.h> #include <unistd.h>
#include "device.hpp" #include "device.hpp"
#include "tensor.hpp" #include "host_tensor.hpp"
#include "gridwise_convolution_backward_data_implicit_gemm_v4r3_nchw_kcyx_nkhw.hpp" #include "gridwise_convolution_backward_data_implicit_gemm_v4r3_nchw_kcyx_nkhw.hpp"
namespace launcher { namespace launcher {
......
driver/src/conv_bwd_data_driver.cpp
View file @ 8d7d048d
...@@ -254,7 +254,7 @@ int main(int argc, char* argv[]) ...@@ -254,7 +254,7 @@ int main(int argc, char* argv[])
device_convolution_backward_data_implicit_gemm_v4r1_nchw_kcyx_nkhw device_convolution_backward_data_implicit_gemm_v4r1_nchw_kcyx_nkhw
#elif 0 #elif 0
device_convolution_backward_data_implicit_gemm_v4r2_nchw_kcyx_nkhw device_convolution_backward_data_implicit_gemm_v4r2_nchw_kcyx_nkhw
#elif 1 #elif 0
device_convolution_backward_data_implicit_gemm_v4r3_nchw_kcyx_nkhw device_convolution_backward_data_implicit_gemm_v4r3_nchw_kcyx_nkhw
#elif 1 #elif 1
device_convolution_backward_data_implicit_gemm_v5r1_nhwc_kyxc_nhwk device_convolution_backward_data_implicit_gemm_v5r1_nhwc_kyxc_nhwk
......
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