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
18 changed files
--- a/test/stringutils.cpp
+++ b/test/stringutils.cpp
--- a/test/verify/main.cpp
+++ b/test/verify/main.cpp
--- a/test/verify/run_verify.cpp
+++ b/test/verify/run_verify.cpp
--- a/test/verify/test_arg_ops.cpp
+++ b/test/verify/test_arg_ops.cpp
--- a/test/verify/test_conv_bias_clipped_relu.cpp
+++ b/test/verify/test_conv_bias_clipped_relu.cpp
--- a/test/verify/test_conv_bn_add.cpp
+++ b/test/verify/test_conv_bn_add.cpp
--- a/test/verify/test_hsqrt.cpp
+++ b/test/verify/test_hsqrt.cpp
--- a/test/verify/test_nms.cpp
+++ b/test/verify/test_nms.cpp
--- a/test/verify/test_nonstd_gather.cpp
+++ b/test/verify/test_nonstd_gather.cpp
--- a/test/verify/test_roialign.cpp
+++ b/test/verify/test_roialign.cpp
--- a/test/verify/test_roialign_nondefault.cpp
+++ b/test/verify/test_roialign_nondefault.cpp
--- a/tools/api.py
+++ b/tools/api.py
--- a/tools/api/api.cpp
+++ b/tools/api/api.cpp
--- a/tools/generate.sh
+++ b/tools/generate.sh
--- a/tools/include/marker.hpp
+++ b/tools/include/marker.hpp
--- a/tools/include/operation.hpp
+++ b/tools/include/operation.hpp
--- a/tools/roctx.py
+++ b/tools/roctx.py
--- a/tools/test_runner.py
+++ b/tools/test_runner.py