Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_77200941
mindspore
提交
5314702c
M
mindspore
项目概览
2301_77200941
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5314702c
编写于
8月 28, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 28, 2020
浏览文件
操作
浏览文件
下载
差异文件
!5412 majoy->major
Merge pull request !5412 from 徐安越/master
上级
a8c5dfae
19f3dba4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
10 deletion
+20
-10
mindspore/lite/CMakeLists.txt
mindspore/lite/CMakeLists.txt
+4
-4
mindspore/lite/include/version.h
mindspore/lite/include/version.h
+3
-3
mindspore/lite/java/native/CMakeLists.txt
mindspore/lite/java/native/CMakeLists.txt
+3
-3
mindspore/lite/src/ops/primitive_c.cc
mindspore/lite/src/ops/primitive_c.cc
+10
-0
未找到文件。
mindspore/lite/CMakeLists.txt
浏览文件 @
5314702c
...
...
@@ -5,15 +5,15 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_
message
(
FATAL_ERROR
"GCC vesion
${
CMAKE_CXX_COMPILER_VERSION
}
must not be less than 7.3.0"
)
endif
()
set
(
MS_VERSION_MAJO
Y
0
)
set
(
MS_VERSION_MAJO
R
0
)
set
(
MS_VERSION_MINOR 7
)
set
(
MS_VERSION_REVISION 0
)
set
(
DIR_PREFIX mindspore-lite
)
set
(
MS_VERSION
${
MS_VERSION_MAJO
Y
}
.
${
MS_VERSION_MINOR
}
.
${
MS_VERSION_REVISION
}
)
set
(
MS_VERSION
${
MS_VERSION_MAJO
R
}
.
${
MS_VERSION_MINOR
}
.
${
MS_VERSION_REVISION
}
)
set
(
MAIN_DIR
${
DIR_PREFIX
}
-
${
MS_VERSION
}
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DMS_VERSION_MAJO
Y=
${
MS_VERSION_MAJOY
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMS_VERSION_MAJO
Y=
${
MS_VERSION_MAJOY
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DMS_VERSION_MAJO
R=
${
MS_VERSION_MAJOR
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMS_VERSION_MAJO
R=
${
MS_VERSION_MAJOR
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
if
(
SUPPORT_GPU
)
set
(
PROCESS_UNIT gpu
)
...
...
mindspore/lite/include/version.h
浏览文件 @
5314702c
...
...
@@ -24,8 +24,8 @@ namespace lite {
/// \brief Global method to get a version string.
///
/// \return The version string of MindSpore Lite.
#ifndef MS_VERSION_MAJO
Y
#define MS_VERSION_MAJO
Y
0
#ifndef MS_VERSION_MAJO
R
#define MS_VERSION_MAJO
R
0
#endif
#ifndef MS_VERSION_MINOR
#define MS_VERSION_MINOR 7
...
...
@@ -34,7 +34,7 @@ namespace lite {
#define MS_VERSION_REVISION 0
#endif
std
::
string
Version
()
{
return
"MindSpore Lite "
+
std
::
to_string
(
MS_VERSION_MAJO
Y
)
+
"."
+
std
::
to_string
(
MS_VERSION_MINOR
)
+
"."
+
return
"MindSpore Lite "
+
std
::
to_string
(
MS_VERSION_MAJO
R
)
+
"."
+
std
::
to_string
(
MS_VERSION_MINOR
)
+
"."
+
std
::
to_string
(
MS_VERSION_REVISION
);
}
}
// namespace lite
...
...
mindspore/lite/java/native/CMakeLists.txt
浏览文件 @
5314702c
cmake_minimum_required
(
VERSION 3.14
)
project
(
Lite-java
)
set
(
MS_VERSION_MAJO
Y
0
)
set
(
MS_VERSION_MAJO
R
0
)
set
(
MS_VERSION_MINOR 7
)
set
(
MS_VERSION_REVISION 0
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DMS_VERSION_MAJO
Y=
${
MS_VERSION_MAJOY
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMS_VERSION_MAJO
Y=
${
MS_VERSION_MAJOY
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DMS_VERSION_MAJO
R=
${
MS_VERSION_MAJOR
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMS_VERSION_MAJO
R=
${
MS_VERSION_MAJOR
}
-DMS_VERSION_MINOR=
${
MS_VERSION_MINOR
}
-DMS_VERSION_REVISION=
${
MS_VERSION_REVISION
}
"
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../lite/
)
...
...
mindspore/lite/src/ops/primitive_c.cc
浏览文件 @
5314702c
...
...
@@ -118,6 +118,8 @@
#include "src/ops/make_tuple.h"
#include "src/ops/quant.h"
#include "src/ops/tuple_get_item.h"
#include "src/ops/l2_norm.h"
#include "src/ops/sparse_to_dense.h"
namespace
mindspore
{
namespace
lite
{
...
...
@@ -434,6 +436,10 @@ PrimitiveC *PrimitiveC::UnPackFromSchemaPrimitiveT(mindspore::schema::PrimitiveT
return
new
ScatterND
(
primitive
);
case
schema
::
PrimitiveType_ConstantOfShape
:
return
new
ConstantOfShape
(
primitive
);
case
schema
::
PrimitiveType_L2Norm
:
return
new
L2Norm
(
primitive
);
case
schema
::
PrimitiveType_SparseToDense
:
return
new
SparseToDense
(
primitive
);
default:
MS_LOG
(
ERROR
)
<<
"Unsupported primitive type in UnPackFromSchemaPrimitiveT : "
<<
schema
::
EnumNamePrimitiveType
(
op_type
);
...
...
@@ -642,6 +648,10 @@ PrimitiveC *PrimitiveC::UnPackFromSchemaPrimitive(mindspore::schema::Primitive *
return
new
ScatterND
(
const_cast
<
schema
::
Primitive
*>
(
primitive
));
case
schema
::
PrimitiveType_ConstantOfShape
:
return
new
ConstantOfShape
(
const_cast
<
schema
::
Primitive
*>
(
primitive
));
case
schema
::
PrimitiveType_L2Norm
:
return
new
L2Norm
(
const_cast
<
schema
::
Primitive
*>
(
primitive
));
case
schema
::
PrimitiveType_SparseToDense
:
return
new
SparseToDense
(
const_cast
<
schema
::
Primitive
*>
(
primitive
));
default:
MS_LOG
(
ERROR
)
<<
"Unsupported primitive type in UnPackFromSchemaPrimitive : "
<<
schema
::
EnumNamePrimitiveType
(
op_type
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录