Skip to content

GitLab

"git@developer.sourcefind.cn:gaoqiong/composable_kernel.git" did not exist on "bef0cb20dba0d9b315df46899310478a81c21852"
Commit 6352dfd8 authored by Junhao's avatar Junhao
Browse files

Merge branch 'junhzhan/develop' of... 

Merge branch 'junhzhan/develop' of https://github.com/ROCmSoftwarePlatform/composable_kernel into HEAD
parents 99c249cb 12ac9ebf
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
.gitignore
View file @ 6352dfd8
...@@ -47,6 +47,13 @@ build* ...@@ -47,6 +47,13 @@ build*
# GDB temporary files # GDB temporary files
.gdb_history .gdb_history
install.dir* install.dir*
<<<<<<< HEAD
library/src/utility/convolution_parameter.cu library/src/utility/convolution_parameter.cu
library/src/utility/host_tensor.cu library/src/utility/host_tensor.cu
library/src/utility/device_memory.cu library/src/utility/device_memory.cu
=======
library/src/utility/convolution_parameter.cu
library/src/utility/host_tensor.cu
library/src/utility/device_memory.cu
>>>>>>> 12ac9ebf5f8723dcb9815070c1d86223cfbb0ce9
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