From 48a894c8e3babed74c2f9ab8832fe6cefe3967aa Mon Sep 17 00:00:00 2001 From: 游雁 <zhifu.gzf@alibaba-inc.com> Date: 星期四, 16 五月 2024 14:50:27 +0800 Subject: [PATCH] Merge branch 'dev_gzf_deepspeed' of github.com:alibaba-damo-academy/FunASR into dev_gzf_deepspeed merge --- runtime/onnxruntime/third_party/glog/src/stacktrace_unittest.cc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/runtime/onnxruntime/third_party/glog/src/stacktrace_unittest.cc b/runtime/onnxruntime/third_party/glog/src/stacktrace_unittest.cc index b92961c..6d3c21a 100644 --- a/runtime/onnxruntime/third_party/glog/src/stacktrace_unittest.cc +++ b/runtime/onnxruntime/third_party/glog/src/stacktrace_unittest.cc @@ -27,15 +27,14 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "stacktrace.h" +#include "utilities.h" #include <cstdio> #include <cstdlib> - -#include "base/commandlineflags.h" #include "config.h" -#include "glog/logging.h" -#include "utilities.h" +#include "base/commandlineflags.h" +#include <glog/logging.h> +#include "stacktrace.h" #ifdef HAVE_EXECINFO_BACKTRACE_SYMBOLS # include <execinfo.h> -- Gitblit v1.9.1