未验证 提交 61b8c311 编写于 作者: K kalcohol 提交者: GitHub

fix some issues, main is about ohos (#646)

* remove generated file

* generate file to bin dir

* building issues for OHOS

* fix vs2019 script
上级 5e4e6cb5
......@@ -17,7 +17,7 @@
mkdir build-msvc16-tensorrt
pushd build-msvc16-tensorrt
%CMAKE_EXE% -G "Visual Studio 16 2019 Win64" ^
%CMAKE_EXE% -G "Visual Studio 16 2019" -A x86_64 ^
-DTENGINE_OPENMP=OFF ^
-DTENGINE_ENABLE_TENSORRT=ON ^
-DCUDA_INCLUDE_DIR=%CUDA_ROOT%/include ^
......
......@@ -287,13 +287,15 @@ ENDIF()
UNSET (_has_openmp)
# pthread
INCLUDE (${PROJECT_SOURCE_DIR}/cmake/libraries/pthread.cmake)
TENGINE_CHECK_LIB_PTHREAD (_has_pthread)
IF (_has_pthread)
TENGINE_USE_LIB_PTHREAD (${TENGINE_LITE_NAME}-static ON)
TENGINE_USE_LIB_PTHREAD (${TENGINE_LITE_NAME} OFF)
IF (NOT OHOS)
INCLUDE (${PROJECT_SOURCE_DIR}/cmake/libraries/pthread.cmake)
TENGINE_CHECK_LIB_PTHREAD (_has_pthread)
IF (_has_pthread)
TENGINE_USE_LIB_PTHREAD (${TENGINE_LITE_NAME}-static ON)
TENGINE_USE_LIB_PTHREAD (${TENGINE_LITE_NAME} OFF)
ENDIF()
UNSET (_has_pthread)
ENDIF()
UNSET (_has_pthread)
#
......
......@@ -239,7 +239,7 @@ GENERATE_REGISTER_HEADER_FILE ("register_" "unregister_" "_op" "${CMAKE_SOURCE_D
IF (TENGINE_COMPILER_GCC OR TENGINE_COMPILER_CLANG)
IF (${TENGINE_TARGET_PROCESSOR} MATCHES "ARM")
IF (TENGINE_TARGET_PROCESSOR_32Bit)
IF ((NOT (DEFINED TENGINE_TOOLCHAIN_FLAG)) AND (NOT(ANDROID OR OHOS)) AND (NOT CMAKE_CROSSCOMPILING))
IF ((NOT (DEFINED TENGINE_TOOLCHAIN_FLAG)) AND (NOT ANDROID) AND (NOT CMAKE_CROSSCOMPILING) OR (CMAKE_CROSSCOMPILING AND OHOS))
LIST (APPEND _CPU_COMPILER_OPTIONS "-march=armv7-a")
LIST (APPEND _CPU_COMPILER_OPTIONS "-mfpu=neon")
......
......@@ -30,7 +30,8 @@ SET (_SRL_BIN_ROOT "${CMAKE_BINARY_DIR}/source/serializer")
# set header searching path
LIST (APPEND _SRL_HEADER_PATH "${CMAKE_SOURCE_DIR}/source/serializer")
LIST (APPEND _SRL_HEADER_PATH "${_SRL_SRC_ROOT}")
LIST (APPEND _SRL_HEADER_PATH "${_SRL_BIN_ROOT}")
# gather all serializer
......@@ -44,7 +45,7 @@ GENERATE_REGISTER_HEADER_FILE("register_" "unregister_" "" "${_SRL_SRC_ROOT}/reg
# generator ops for serializer
AUX_SOURCE_DIRECTORY("${_SRL_SRC_ROOT}/tmfile/op" _TENGINE_TM2_OPS_SOURCE)
GENERATE_REGISTER_HEADER_FILE("register_" "unregister_" "_op" "${_SRL_SRC_ROOT}/tmfile/tm2_ops.h.in" "${_SRL_SRC_ROOT}/tmfile/tm2_ops.h" "${_SRL_TM2_OPS_SOURCE}")
GENERATE_REGISTER_HEADER_FILE("register_" "unregister_" "_op" "${_SRL_SRC_ROOT}/tmfile/tm2_ops.h.in" "${_SRL_BIN_ROOT}/tmfile/tm2_ops.h" "${_SRL_TM2_OPS_SOURCE}")
# gather
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册