saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-30 20:18:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Android] Output error message to android log instead of stderr (#8114)

Browse source 
* Output error message to android log instead of stderr

* Address CR comments, move macro to a helper function

* Address CR comments

* Fix ort minimal build break
This commit is contained in:
Guoyu Wang 2021-06-22 17:50:06 -07:00 committed by GitHub
parent 9003df5d87
commit f6292d9b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cmake/onnxruntime_unittests.cmake
View file

@ -859,11 +859,11 @@ if (NOT onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
)
add_executable(onnxruntime_eager_mode_test ${onnxruntime_eager_mode_test_src})
target_include_directories(onnxruntime_eager_mode_test PRIVATE ${ONNXRUNTIME_ROOT}
${onnxruntime_graph_header}
${onnxruntime_graph_header}
${onnxruntime_exec_src_dir}
${CMAKE_CURRENT_BINARY_DIR}
"${TEST_SRC_DIR}/util/include")
set(onnxruntime_eager_mode_libs
set(onnxruntime_eager_mode_libs
onnxruntime_eager
onnxruntime_session
onnxruntime_optimizer
@ -871,11 +871,11 @@ if (NOT onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
onnxruntime_util
onnxruntime_framework
flatbuffers
onnxruntime_graph
onnxruntime_graph
onnxruntime_common
onnxruntime_mlas
onnx
onnx_proto
onnx
onnx_proto
${PROTOBUF_LIB}
GTest::gtest
re2::re2
@ -883,7 +883,7 @@ if (NOT onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
${CMAKE_DL_LIBS}
)
if(onnxruntime_ENABLE_TRAINING)
list(APPEND onnxruntime_eager_mode_libs onnxruntime_training tensorboard)
list(APPEND onnxruntime_eager_mode_libs onnxruntime_training tensorboard)
endif()
IF(NOT WIN32)
list(APPEND onnxruntime_eager_mode_libs nsync_cpp)
@ -1074,6 +1074,9 @@ if (NOT onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
if(NOT WIN32)
list(APPEND onnxruntime_mlas_test_libs nsync_cpp ${CMAKE_DL_LIBS})
endif()
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
list(APPEND onnxruntime_mlas_test_libs ${android_shared_libs})
endif()
if (onnxruntime_USE_OPENMP)
list(APPEND onnxruntime_mlas_test_libs OpenMP::OpenMP_CXX)
endif()
@ -1144,7 +1147,7 @@ if (NOT onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
endif()
# limit to only test on windows first, due to a runtime path issue on linux
if (NOT onnxruntime_MINIMAL_BUILD AND NOT onnxruntime_EXTENDED_MINIMAL_BUILD
if (NOT onnxruntime_MINIMAL_BUILD AND NOT onnxruntime_EXTENDED_MINIMAL_BUILD
AND NOT onnxruntime_ENABLE_TRAINING
AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin|iOS"
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Android")

69
include/onnxruntime/core/common/common.h
View file

@ -40,10 +40,6 @@
#include <mimalloc.h>
#endif
#ifdef ORT_NO_EXCEPTIONS
#include <iostream>
#endif
namespace onnxruntime {
using TimePoint = std::chrono::high_resolution_clock::time_point;
@ -77,6 +73,14 @@ using common::Status;
#define ORT_ATTRIBUTE_UNUSED
#endif
#ifdef ORT_NO_EXCEPTIONS
// Print the given final message, the message must be a null terminated char*
// ORT will abort after printing the message.
// For Android, will print to Android system log
// For other platforms, will print to stderr
void PrintFinalMessage(const char* msg);
#endif
// macro to explicitly ignore the return value from a function call so Code Analysis doesn't complain
#define ORT_IGNORE_RETURN_VALUE(fn) \
static_cast<void>(fn)
@ -110,49 +114,46 @@ void LogRuntimeError(uint32_t session_id, const common::Status& status, const ch
// a lambda function. otherwise the exception referred will be undefined and cause build break
#define ORT_HANDLE_EXCEPTION(func)
// TODO, consider changing the output of the error message from std::cerr to logging when the
// exceptions are disabled, since using std::cerr might increase binary size, and std::cerr output
// might not be easily accesible on some systems such as mobile
// Throw an exception with optional message.
// NOTE: The arguments get streamed into a string via ostringstream::operator<<
// DO NOT use a printf format string, as that will not work as you expect.
#define ORT_THROW(...) \
do { \
std::cerr << ::onnxruntime::OnnxRuntimeException(ORT_WHERE_WITH_STACK, \
::onnxruntime::MakeString(__VA_ARGS__)) \
.what() \
<< std::endl; \
abort(); \
#define ORT_THROW(...) \
do { \
::onnxruntime::PrintFinalMessage( \
::onnxruntime::OnnxRuntimeException( \
ORT_WHERE_WITH_STACK, ::onnxruntime::MakeString(__VA_ARGS__)) \
.what()); \
abort(); \
} while (false)
// Just in order to mark things as not implemented. Do not use in final code.
#define ORT_NOT_IMPLEMENTED(...) \
do { \
std::cerr << ::onnxruntime::NotImplementedException(::onnxruntime::MakeString(__VA_ARGS__)) \
.what() \
<< std::endl; \
abort(); \
#define ORT_NOT_IMPLEMENTED(...) \
do { \
::onnxruntime::PrintFinalMessage( \
::onnxruntime::NotImplementedException(::onnxruntime::MakeString(__VA_ARGS__)) \
.what()); \
abort(); \
} while (false)
// Check condition.
// NOTE: The arguments get streamed into a string via ostringstream::operator<<
// DO NOT use a printf format string, as that will not work as you expect.
#define ORT_ENFORCE(condition, ...) \
do { \
if (!(condition)) { \
std::cerr << ::onnxruntime::OnnxRuntimeException(ORT_WHERE_WITH_STACK, #condition, \
::onnxruntime::MakeString(__VA_ARGS__)) \
.what() \
<< std::endl; \
abort(); \
} \
#define ORT_ENFORCE(condition, ...) \
do { \
if (!(condition)) { \
::onnxruntime::PrintFinalMessage( \
::onnxruntime::OnnxRuntimeException(ORT_WHERE_WITH_STACK, #condition, \
::onnxruntime::MakeString(__VA_ARGS__)) \
.what()); \
abort(); \
} \
} while (false)
#define ORT_THROW_EX(ex, ...) \
do { \
std::cerr << #ex << "(" << ::onnxruntime::MakeString(__VA_ARGS__) << ")" << std::endl; \
abort(); \
#define ORT_THROW_EX(ex, ...) \
do { \
::onnxruntime::PrintFinalMessage( \
::onnxruntime::MakeString(#ex, "(", ::onnxruntime::MakeString(__VA_ARGS__), ")").c_str()); \
abort(); \
} while (false)
#else

30
onnxruntime/core/common/str_helper.cc → onnxruntime/core/common/helper.cc
View file

@ -1,11 +1,23 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#ifdef _WIN32
#include "core/common/common.h"
#ifdef _WIN32
#include <Windows.h>
#include <assert.h>
#endif
#ifdef ORT_NO_EXCEPTIONS
#if defined(__ANDROID__)
#include <android/log.h>
#else
#include <iostream>
#endif
#endif
namespace onnxruntime {
#ifdef _WIN32
std::string ToMBString(const std::wstring& s) {
if (s.size() >= static_cast<size_t>(std::numeric_limits<int>::max()))
ORT_THROW("length overflow");
@ -31,6 +43,20 @@ std::wstring ToWideString(const std::string& s) {
assert(len == r);
return ret;
}
#endif //#ifdef _WIN32
#ifdef ORT_NO_EXCEPTIONS
void PrintFinalMessage(const char* msg) {
#if defined(__ANDROID__)
__android_log_print(ANDROID_LOG_ERROR, "onnxruntime", "%s", msg);
#else
// TODO, consider changing the output of the error message from std::cerr to logging when the
// exceptions are disabled, since using std::cerr might increase binary size, and std::cerr output
// might not be easily accesible on some systems such as mobile
// TODO, see if we need to change the output of the error message from std::cerr to NSLog for iOS
std::cerr << msg << std::endl;
#endif
}
#endif //#ifdef ORT_NO_EXCEPTIONS
} // namespace onnxruntime
#endif