merge develop and resolve conflict

bccc6d8b · wangshaojie6 · c6b52884 · 91d8b7d6 · bccc6d8b · bccc6d8b
Commit bccc6d8b authored May 30, 2022 by wangshaojie6
5 changed files
--- a/test/gemm/gemm_xdl_int8.cpp
+++ b/test/gemm/gemm_xdl_int8.cpp
--- a/test/grouped_gemm/grouped_gemm_fp16.cpp
+++ b/test/grouped_gemm/grouped_gemm_fp16.cpp
--- a/test/reduce/reduce_no_index.cpp
+++ b/test/reduce/reduce_no_index.cpp
--- a/test/reduce/reduce_util.hpp
+++ b/test/reduce/reduce_util.hpp
--- a/test/reduce/reduce_with_index.cpp
+++ b/test/reduce/reduce_with_index.cpp