Skip to content

GitLab

Commit 9d000309 authored by Chao Liu's avatar Chao Liu
Browse files

fix merge bug

parent b60eddb0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 15 deletions
composable_kernel/include/utility/in_memory_operation.amd.hpp.in
View file @ 9d000309
...@@ -149,30 +149,17 @@ struct AtomicAddData ...@@ -149,30 +149,17 @@ struct AtomicAddData
template <> template <>
__device__ void Run<AddressSpace::Vgpr, AddressSpace::Global>(const T* p_src, __device__ void Run<AddressSpace::Vgpr, AddressSpace::Global>(const T* p_src,
index_t src_offset, index_t src_offset,
<<<<<<< HEAD
index_t /* src_range */,
bool src_valid T* p_dst,
=======
bool src_valid, bool src_valid,
index_t /* src_range */, index_t /* src_range */,
T* p_dst, T* p_dst,
>>>>>>> origin/master
index_t dst_offset, index_t dst_offset,
bool dst_valid, bool dst_valid,
index_t dst_range) const index_t dst_range) const
{ {
const auto zeros = vector_t(0); const auto zeros = vector_t(0);
<<<<<<< HEAD
amd_buffer_atomic_add<T, DataPerAccess>(src_valid ? &(p_src[src_offset]) : &zeros,
p_dst,
dst_offset,
dst_valid,
index_t dst_range);
=======
amd_buffer_atomic_add<T, DataPerAccess>( amd_buffer_atomic_add<T, DataPerAccess>(
src_valid ? &(p_src[src_offset]) : &zeros, p_dst, dst_offset, dst_valid, dst_range); src_valid ? &(p_src[src_offset]) : &zeros, p_dst, dst_offset, dst_valid, dst_range);
>>>>>>> origin/master
} }
#endif #endif
}; };
......
driver/include/device_convolution_backward_data_implicit_gemm_v1r1_nchw_kcyx_nkhw.hpp
View file @ 9d000309
...@@ -183,7 +183,7 @@ void device_convolution_backward_data_implicit_gemm_v1r1_nchw_kcyx_nkhw(InDesc i ...@@ -183,7 +183,7 @@ void device_convolution_backward_data_implicit_gemm_v1r1_nchw_kcyx_nkhw(InDesc i
GemmBBlockCopyDstDataPerWrite_GemmN, GemmBBlockCopyDstDataPerWrite_GemmN,
GemmCThreadCopyDstDataPerWrite_GemmN1>; GemmCThreadCopyDstDataPerWrite_GemmN1>;
for(index_t i = 0; i < 5; ++i) for(index_t i = 0; i < 1; ++i)
{ {
std::cout << "Start running " << nrepeat << " times..." << std::endl; std::cout << "Start running " << nrepeat << " times..." << std::endl;
......
driver/src/conv_bwd_data_driver.cpp
View file @ 9d000309
...@@ -241,7 +241,7 @@ int main(int argc, char* argv[]) ...@@ -241,7 +241,7 @@ int main(int argc, char* argv[])
#endif #endif
} }
#if 0 #if 1
device_convolution_backward_data_implicit_gemm_v1r1_nchw_kcyx_nkhw device_convolution_backward_data_implicit_gemm_v1r1_nchw_kcyx_nkhw
#elif 0 #elif 0
device_convolution_backward_data_implicit_gemm_v1r2_nchw_kcyx_nkhw device_convolution_backward_data_implicit_gemm_v1r2_nchw_kcyx_nkhw
......
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