merge conflict

b43ac5ef · Jing Zhang · b892a14a · bc1108bb · b43ac5ef · b43ac5ef
Commit b43ac5ef authored Sep 28, 2023 by Jing Zhang
19 changed files
--- a/profiler/include/profiler/profile_image_to_column_impl.hpp
+++ b/profiler/include/profiler/profile_image_to_column_impl.hpp
--- a/profiler/include/profiler/profile_gemm_impl.hpp
+++ b/profiler/include/profiler/profile_gemm_impl.hpp
--- a/profiler/src/CMakeLists.txt
+++ b/profiler/src/CMakeLists.txt
--- a/profiler/src/profile_image_to_column.cpp
+++ b/profiler/src/profile_image_to_column.cpp
--- a/profiler/src/profile_gemm.cpp
+++ b/profiler/src/profile_gemm.cpp
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
--- a/test/batchnorm/batchnorm_bwd_rank_4.cpp
+++ b/test/batchnorm/batchnorm_bwd_rank_4.cpp
--- a/test/batchnorm/batchnorm_fwd_rank_4.cpp
+++ b/test/batchnorm/batchnorm_fwd_rank_4.cpp
--- a/test/batchnorm/batchnorm_infer_rank_4.cpp
+++ b/test/batchnorm/batchnorm_infer_rank_4.cpp
--- a/test/conv_tensor_rearrange/CMakeLists.txt
+++ b/test/conv_tensor_rearrange/CMakeLists.txt
--- a/test/image_to_column/test_image_to_column.cpp
+++ b/test/image_to_column/test_image_to_column.cpp
--- a/test/image_to_column/test_image_to_column_interface.cpp
+++ b/test/image_to_column/test_image_to_column_interface.cpp
--- a/test/data_type/CMakeLists.txt
+++ b/test/data_type/CMakeLists.txt
--- a/test/data_type/type_convert_const.cpp
+++ b/test/data_type/type_convert_const.cpp
--- a/test/gemm_split_k/test_gemm_splitk_ut_cases.inc
+++ b/test/gemm_split_k/test_gemm_splitk_ut_cases.inc
--- a/test/grouped_convnd_fwd/CMakeLists.txt
+++ b/test/grouped_convnd_fwd/CMakeLists.txt
--- a/test/grouped_convnd_fwd/grouped_convnd_fwd.cpp
+++ b/test/grouped_convnd_fwd/grouped_convnd_fwd.cpp
--- a/test/grouped_convnd_fwd/test_grouped_convnd_fwd.cpp
+++ b/test/grouped_convnd_fwd/test_grouped_convnd_fwd.cpp
--- a/test/image_to_column/CMakeLists.txt
+++ b/test/image_to_column/CMakeLists.txt