mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

!6860 change glog pack path 

Merge pull request !6860 from yeyunpeng2020/master
This commit is contained in:
mindspore-ci-bot 2020-09-24 23:19:42 +08:00 committed by Gitee
parent 2f3add4acd 89c05d956e
commit e69d868016
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/external_libs/glog.cmake
View File

@ -5,6 +5,6 @@ mindspore_add_pkg(glog
LIBS glog
URL https://github.com/google/glog/archive/v0.4.0.tar.gz
MD5 0daea8785e6df922d7887755c3d100d0
CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON)
CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON -DWITH_GFLAGS=OFF)
include_directories(${glog_INC})
add_library(mindspore::glog ALIAS glog::glog)

2
mindspore/lite/test/run_benchmark_nets.sh
View File

@ -9,7 +9,7 @@ function Run_Converter() {
tar -zxf mindspore-lite-${version}-converter-ubuntu.tar.gz || exit 1
cd ${x86_path}/mindspore-lite-${version}-converter-ubuntu || exit 1
cp converter/converter_lite ./ || exit 1
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:./lib/:./third_party/protobuf/lib:./third_party/flatbuffers/lib
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:./lib/:./third_party/protobuf/lib:./third_party/flatbuffers/lib:./third_party/glog/lib
# Convert the models
cd ${x86_path}/mindspore-lite-${version}-converter-ubuntu || exit 1

2
mindspore/lite/tools/converter/CMakeLists.txt
View File

@ -177,5 +177,5 @@ if (NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32)
install(FILES ${TOP_DIR}/mindspore/lite/build/tools/converter/mindspore_core/gvar/libmindspore_gvar.so
DESTINATION ${MAIN_DIR}-${COMPONENT_NAME}/lib COMPONENT ${COMPONENT_NAME})
install(FILES ${glog_LIBPATH}/libglog.so.0.4.0
DESTINATION ${MAIN_DIR}-${COMPONENT_NAME}/lib RENAME libglog.so.0 COMPONENT ${COMPONENT_NAME})
DESTINATION ${MAIN_DIR}-${COMPONENT_NAME}/third_party/glog/lib RENAME libglog.so.0 COMPONENT ${COMPONENT_NAME})
endif ()