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/onnx/randomuniform_generated_seed_test.onnx
+++ b/test/onnx/randomuniform_generated_seed_test.onnx
--- a/test/onnx/roialign_default_test.onnx
+++ b/test/onnx/roialign_default_test.onnx
--- a/test/onnx/roialign_test.onnx
+++ b/test/onnx/roialign_test.onnx
--- a/test/onnx/softplus_nd_test.onnx
+++ b/test/onnx/softplus_nd_test.onnx
--- a/test/onnx/softplus_test.onnx
+++ b/test/onnx/softplus_test.onnx
--- a/test/onnx/softsign_nd_test.onnx
+++ b/test/onnx/softsign_nd_test.onnx
--- a/test/onnx/softsign_test.onnx
+++ b/test/onnx/softsign_test.onnx
--- a/test/onnx/spacetodepth_invalid_blocksize_test.onnx
+++ b/test/onnx/spacetodepth_invalid_blocksize_test.onnx
--- a/test/onnx/spacetodepth_nondivisibility_test.onnx
+++ b/test/onnx/spacetodepth_nondivisibility_test.onnx
--- a/test/onnx/spacetodepth_simple_test.onnx
+++ b/test/onnx/spacetodepth_simple_test.onnx
--- a/test/onnx/spacetodepth_test.onnx
+++ b/test/onnx/spacetodepth_test.onnx
--- a/test/onnx/upsample_linear_test.onnx
+++ b/test/onnx/upsample_linear_test.onnx
--- a/test/onnx/verify_onnx.cpp
+++ b/test/onnx/verify_onnx.cpp
--- a/test/op_shape_test.cpp
+++ b/test/op_shape_test.cpp
--- a/test/perf_report.cpp
+++ b/test/perf_report.cpp
--- a/test/py/onnx_backend_test.py
+++ b/test/py/onnx_backend_test.py
--- a/test/ref_ops_nonstd_shape_test.cpp
+++ b/test/ref_ops_nonstd_shape_test.cpp
--- a/test/ref_ops_test.cpp
+++ b/test/ref_ops_test.cpp
--- a/test/run_loop_test.cpp
+++ b/test/run_loop_test.cpp
--- a/test/simplify_reshapes_test.cpp
+++ b/test/simplify_reshapes_test.cpp