Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
25a67602
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
25a67602
编写于
8月 11, 2020
作者:
L
liubuyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bug fix for glog level don't work
上级
d46a0e4d
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
28 addition
and
8 deletion
+28
-8
cmake/package.cmake
cmake/package.cmake
+6
-0
mindspore/ccsrc/CMakeLists.txt
mindspore/ccsrc/CMakeLists.txt
+3
-1
mindspore/ccsrc/minddata/dataset/CMakeLists.txt
mindspore/ccsrc/minddata/dataset/CMakeLists.txt
+1
-1
mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt
mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt
+2
-2
mindspore/core/CMakeLists.txt
mindspore/core/CMakeLists.txt
+2
-1
mindspore/core/gvar/CMakeLists.txt
mindspore/core/gvar/CMakeLists.txt
+11
-0
serving/CMakeLists.txt
serving/CMakeLists.txt
+1
-1
tests/ut/cpp/CMakeLists.txt
tests/ut/cpp/CMakeLists.txt
+2
-2
未找到文件。
cmake/package.cmake
浏览文件 @
25a67602
...
...
@@ -52,6 +52,12 @@ install(
COMPONENT mindspore
)
install
(
TARGETS mindspore_gvar
DESTINATION
${
INSTALL_LIB_DIR
}
COMPONENT mindspore
)
if
(
USE_GLOG
)
file
(
GLOB_RECURSE GLOG_LIB_LIST
${
glog_LIBPATH
}
/libglog*
)
install
(
...
...
mindspore/ccsrc/CMakeLists.txt
浏览文件 @
25a67602
...
...
@@ -235,6 +235,7 @@ set_target_properties(_c_expression PROPERTIES INSTALL_RPATH ${ORIGIN_PATH})
if
(
CMAKE_SYSTEM_NAME MATCHES
"Windows"
)
target_link_libraries
(
mindspore mindspore::pybind11_module
)
target_link_libraries
(
mindspore mindspore_gvar
)
target_link_libraries
(
_c_expression PRIVATE -Wl,--whole-archive mindspore -Wl,--no-whole-archive
)
else
()
if
(
ENABLE_CPU
AND
(
ENABLE_D OR ENABLE_GPU
))
...
...
@@ -245,6 +246,7 @@ else ()
endif
()
target_link_libraries
(
_c_expression PRIVATE -Wl,--whole-archive mindspore -Wl,--no-whole-archive
)
target_link_libraries
(
_c_expression PRIVATE mindspore::pybind11_module
)
target_link_libraries
(
_c_expression PRIVATE mindspore_gvar
)
endif
()
if
(
USE_GLOG
)
...
...
@@ -288,7 +290,7 @@ add_library(inference SHARED
${
LOAD_ONNX_SRC
}
)
target_link_libraries
(
inference PRIVATE
${
PYTHON_LIBRARIES
}
${
SECUREC_LIBRARY
}
-Wl,--whole-archive mindspore -Wl,--no-whole-archive mindspore::protobuf
)
-Wl,--whole-archive mindspore -Wl,--no-whole-archive mindspore
_gvar mindspore
::protobuf
)
if
(
ENABLE_CPU
)
target_link_libraries
(
inference PRIVATE mindspore::dnnl mindspore::mkldnn
)
...
...
mindspore/ccsrc/minddata/dataset/CMakeLists.txt
浏览文件 @
25a67602
...
...
@@ -126,7 +126,7 @@ endif()
######################################################################
################# Link with external libraries ########################
target_link_libraries
(
_c_dataengine PRIVATE mindspore
)
target_link_libraries
(
_c_dataengine PRIVATE mindspore
mindspore_gvar
)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Windows"
)
if
(
ENABLE_PYTHON
)
target_link_libraries
(
_c_dataengine PRIVATE mindspore::pybind11_module
${
PYTHON_LIBRARIES
}
mindspore::protobuf
${
SECUREC_LIBRARY
}
)
...
...
mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt
浏览文件 @
25a67602
...
...
@@ -28,9 +28,9 @@ set_target_properties(_c_mindrecord PROPERTIES
# add link library
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Windows"
)
target_link_libraries
(
_c_mindrecord PRIVATE mindspore::sqlite mindspore mindspore::protobuf
)
target_link_libraries
(
_c_mindrecord PRIVATE mindspore::sqlite mindspore mindspore
_gvar mindspore
::protobuf
)
else
()
target_link_libraries
(
_c_mindrecord PRIVATE mindspore::sqlite
${
PYTHON_LIB
}
${
SECUREC_LIBRARY
}
mindspore mindspore::protobuf
)
target_link_libraries
(
_c_mindrecord PRIVATE mindspore::sqlite
${
PYTHON_LIB
}
${
SECUREC_LIBRARY
}
mindspore mindspore
_gvar mindspore
::protobuf
)
endif
()
if
(
USE_GLOG
)
...
...
mindspore/core/CMakeLists.txt
浏览文件 @
25a67602
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
include_directories
(
${
CMAKE_BINARY_DIR
}
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
/mindspore/core
)
add_subdirectory
(
gvar
)
message
(
"************build core***************"
)
if
(
CMAKE_SYSTEM_NAME MATCHES
"Windows"
)
...
...
@@ -14,10 +15,10 @@ file(GLOB_RECURSE CORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"c_ops/*.cc"
"ir/*.cc"
"utils/*.cc"
"gvar/*.cc"
)
set_property
(
SOURCE
${
CORE_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_CORE
)
add_library
(
mindspore_core STATIC
${
CORE_SRC_LIST
}
)
target_link_libraries
(
mindspore_core PRIVATE mindspore_gvar
)
if
(
USE_GLOG
)
target_link_libraries
(
mindspore_core PRIVATE mindspore::glog
)
endif
()
mindspore/core/gvar/CMakeLists.txt
0 → 100644
浏览文件 @
25a67602
file
(
GLOB_RECURSE MS_GVAR_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cc
)
set_property
(
SOURCE
${
MS_GVAR_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_COMMON
)
if
(
CMAKE_SYSTEM_NAME MATCHES
"Windows"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-attributes -DHAVE_SNPRINTF"
)
add_compile_definitions
(
BUILDING_DLL
)
endif
()
add_library
(
mindspore_gvar SHARED
${
MS_GVAR_SRC_LIST
}
)
if
(
APPLE
)
set_target_properties
(
mindspore_gvar PROPERTIES MACOSX_RPATH ON
)
endif
()
\ No newline at end of file
serving/CMakeLists.txt
浏览文件 @
25a67602
...
...
@@ -110,5 +110,5 @@ if (ENABLE_ACL)
target_link_libraries
(
ms_serving
${
ALC_LIB_SO
}
)
target_link_libraries
(
ms_serving jpeg_turbo::jpeg
)
else
()
target_link_libraries
(
ms_serving inference
)
target_link_libraries
(
ms_serving inference
mindspore_gvar
)
endif
()
tests/ut/cpp/CMakeLists.txt
浏览文件 @
25a67602
...
...
@@ -180,12 +180,12 @@ if (ENABLE_GE)
endif
()
if
(
CMAKE_SYSTEM_NAME MATCHES
"Linux"
)
target_link_libraries
(
ut_tests PRIVATE mindspore::gtest
${
PYTHON_LIBRARIES
}
pthread util dl
)
target_link_libraries
(
ut_tests PRIVATE mindspore::gtest
mindspore_gvar
${
PYTHON_LIBRARIES
}
pthread util dl
)
if
(
ENABLE_MINDDATA
)
target_link_libraries
(
ut_tests PRIVATE _c_dataengine _c_mindrecord
)
endif
()
else
()
target_link_libraries
(
ut_tests PRIVATE mindspore::gtest
${
PYTHON_LIBRARIES
}
)
target_link_libraries
(
ut_tests PRIVATE mindspore::gtest
mindspore_gvar
${
PYTHON_LIBRARIES
}
)
endif
()
if
(
USE_GLOG
)
target_link_libraries
(
ut_tests PRIVATE mindspore::glog
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录