merge changes from develop branch and resolve merge conflicts

712f6134 · Shucai Xiao · 4a39a0f7 · b20e3d4d · 712f6134 · 712f6134
Commit 712f6134 authored Feb 02, 2022 by Shucai Xiao
20 changed files
--- a/test/include/pointwise.hpp
+++ b/test/include/pointwise.hpp
--- a/test/marker.cpp
+++ b/test/marker.cpp
--- a/test/msgpack.cpp
+++ b/test/msgpack.cpp
--- a/test/onnx/gen_onnx.py
+++ b/test/onnx/gen_onnx.py
--- a/test/onnx/gen_onnx.pyc
+++ b/test/onnx/gen_onnx.pyc
--- a/test/onnx/greaterorequal_test.onnx
+++ b/test/onnx/greaterorequal_test.onnx
--- a/test/onnx/hardsigmoid_default_test.onnx
+++ b/test/onnx/hardsigmoid_default_test.onnx
--- a/test/onnx/hardsigmoid_double_test.onnx
+++ b/test/onnx/hardsigmoid_double_test.onnx
--- a/test/onnx/hardsigmoid_half_test.onnx
+++ b/test/onnx/hardsigmoid_half_test.onnx
--- a/test/onnx/hardsigmoid_verify_test.onnx
+++ b/test/onnx/hardsigmoid_verify_test.onnx
--- a/test/onnx/hardswish_test.onnx
+++ b/test/onnx/hardswish_test.onnx
--- a/test/onnx/mean_broadcast_test.onnx
+++ b/test/onnx/mean_broadcast_test.onnx
--- a/test/onnx/mean_fp16_test.onnx
+++ b/test/onnx/mean_fp16_test.onnx
--- a/test/onnx/mean_invalid_broadcast_test.onnx
+++ b/test/onnx/mean_invalid_broadcast_test.onnx
--- a/test/onnx/mean_single_input_test.onnx
+++ b/test/onnx/mean_single_input_test.onnx
--- a/test/onnx/mean_test.onnx
+++ b/test/onnx/mean_test.onnx
--- a/test/onnx/multinomial_generated_seed_test.onnx
+++ b/test/onnx/multinomial_generated_seed_test.onnx
--- a/test/onnx/nms_test.onnx
+++ b/test/onnx/nms_test.onnx
--- a/test/onnx/onnx_test.cpp
+++ b/test/onnx/onnx_test.cpp
--- a/test/onnx/randomnormal_generated_seed_test.onnx
+++ b/test/onnx/randomnormal_generated_seed_test.onnx