Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
36ffb667
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看板
提交
36ffb667
编写于
4月 16, 2020
作者:
Y
yangzhenzhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add parallel op for square
上级
08985a1e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
100 addition
and
4 deletion
+100
-4
mindspore/ccsrc/parallel/dynamic_creator.h
mindspore/ccsrc/parallel/dynamic_creator.h
+1
-0
mindspore/ccsrc/parallel/ops_info/activation_info.h
mindspore/ccsrc/parallel/ops_info/activation_info.h
+8
-0
mindspore/ccsrc/parallel/ops_info/ops_utils.h
mindspore/ccsrc/parallel/ops_info/ops_utils.h
+2
-1
mindspore/ccsrc/parallel/step_auto_parallel.cc
mindspore/ccsrc/parallel/step_auto_parallel.cc
+4
-3
tests/ut/python/parallel/test_square.py
tests/ut/python/parallel/test_square.py
+85
-0
未找到文件。
mindspore/ccsrc/parallel/dynamic_creator.h
浏览文件 @
36ffb667
...
@@ -128,6 +128,7 @@ REGISTER(BatchMatMulInfo);
...
@@ -128,6 +128,7 @@ REGISTER(BatchMatMulInfo);
REGISTER
(
ExpandDimsInfo
);
REGISTER
(
ExpandDimsInfo
);
REGISTER
(
SqueezeInfo
);
REGISTER
(
SqueezeInfo
);
REGISTER
(
SigmoidCrossEntropyWithLogitsInfo
);
REGISTER
(
SigmoidCrossEntropyWithLogitsInfo
);
REGISTER
(
SquareInfo
);
}
// namespace parallel
}
// namespace parallel
}
// namespace mindspore
}
// namespace mindspore
...
...
mindspore/ccsrc/parallel/ops_info/activation_info.h
浏览文件 @
36ffb667
...
@@ -203,6 +203,14 @@ class SqueezeInfo : public ActivationOther {
...
@@ -203,6 +203,14 @@ class SqueezeInfo : public ActivationOther {
private:
private:
ValueTuplePtr
axis_
;
ValueTuplePtr
axis_
;
};
};
class
SquareInfo
:
public
ActivationOther
{
public:
SquareInfo
(
const
std
::
string
&
name
,
const
Shapes
&
inputs_shape
,
const
Shapes
&
outputs_shape
,
const
PrimitiveAttrs
&
attrs
)
:
ActivationOther
(
name
,
inputs_shape
,
outputs_shape
,
attrs
)
{}
~
SquareInfo
()
override
=
default
;
};
}
// namespace parallel
}
// namespace parallel
}
// namespace mindspore
}
// namespace mindspore
#endif // MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ACTIVATION_INFO_H_
#endif // MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ACTIVATION_INFO_H_
mindspore/ccsrc/parallel/ops_info/ops_utils.h
浏览文件 @
36ffb667
...
@@ -202,9 +202,10 @@ constexpr char SQRT[] = "Sqrt";
...
@@ -202,9 +202,10 @@ constexpr char SQRT[] = "Sqrt";
constexpr
char
ASSIGN
[]
=
"Assign"
;
constexpr
char
ASSIGN
[]
=
"Assign"
;
constexpr
char
GET_NEXT
[]
=
"GetNext"
;
constexpr
char
GET_NEXT
[]
=
"GetNext"
;
constexpr
char
SQUEEZE
[]
=
"Squeeze"
;
constexpr
char
SQUEEZE
[]
=
"Squeeze"
;
constexpr
char
N
eg
[]
=
"Neg"
;
constexpr
char
N
EG
[]
=
"Neg"
;
constexpr
char
BATCH_MATMUL
[]
=
"BatchMatMul"
;
constexpr
char
BATCH_MATMUL
[]
=
"BatchMatMul"
;
constexpr
char
EXPAND_DIMS
[]
=
"ExpandDims"
;
constexpr
char
EXPAND_DIMS
[]
=
"ExpandDims"
;
constexpr
char
SQUARE
[]
=
"Square"
;
// Parallel don't care
// Parallel don't care
constexpr
char
TUPLE_GETITEM
[]
=
"tuple_getitem"
;
constexpr
char
TUPLE_GETITEM
[]
=
"tuple_getitem"
;
...
...
mindspore/ccsrc/parallel/step_auto_parallel.cc
浏览文件 @
36ffb667
...
@@ -104,13 +104,14 @@ std::vector<std::string> splittable_op_ = {MATMUL,
...
@@ -104,13 +104,14 @@ std::vector<std::string> splittable_op_ = {MATMUL,
SQRT
,
SQRT
,
GET_NEXT
,
GET_NEXT
,
CAST
,
CAST
,
Neg
,
NEG
,
SQUARE
,
BATCH_MATMUL
,
BATCH_MATMUL
,
EXPAND_DIMS
,
EXPAND_DIMS
,
SQUEEZE
};
SQUEEZE
};
std
::
vector
<
std
::
string
>
elementwise_op_
=
{
ACTIVATION
,
GELU
,
TANH
,
SOFTMAX
,
LOG_SOFTMAX
,
RELU
,
SQR
T
,
std
::
vector
<
std
::
string
>
elementwise_op_
=
{
ACTIVATION
,
GELU
,
TANH
,
SOFTMAX
,
LOG_SOFTMAX
,
RELU
,
SQRT
,
CAS
T
,
CAST
,
POW
,
EXP
,
LOG
,
COS
,
ACOS
,
LOGICALNOT
};
POW
,
EXP
,
LOG
,
COS
,
ACOS
,
LOGICALNOT
,
NEG
,
SQUARE
};
bool
StepAutoParallel
(
const
FuncGraphPtr
&
root
,
const
opt
::
OptimizerPtr
&
)
{
bool
StepAutoParallel
(
const
FuncGraphPtr
&
root
,
const
opt
::
OptimizerPtr
&
)
{
MS_EXCEPTION_IF_NULL
(
root
);
MS_EXCEPTION_IF_NULL
(
root
);
...
...
tests/ut/python/parallel/test_square.py
0 → 100644
浏览文件 @
36ffb667
# Copyright 2020 Huawei Technologies Co., Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import
numpy
as
np
import
mindspore
as
ms
from
mindspore
import
context
,
Tensor
,
Parameter
from
mindspore.nn
import
Cell
,
TrainOneStepCell
,
Momentum
from
mindspore.ops
import
operations
as
P
from
mindspore.common.api
import
_executor
class
Net
(
Cell
):
def
__init__
(
self
,
mul_weight
,
strategy1
=
None
,
strategy2
=
None
):
super
(
Net
,
self
).
__init__
()
self
.
mul
=
P
.
Mul
().
set_strategy
(
strategy1
)
self
.
square
=
P
.
Square
().
set_strategy
(
strategy2
)
self
.
mul2
=
P
.
Mul
().
set_strategy
(
strategy1
)
self
.
mul_weight
=
Parameter
(
mul_weight
,
"w1"
)
def
construct
(
self
,
x
,
b
):
out
=
self
.
mul
(
x
,
self
.
mul_weight
)
out
=
self
.
square
(
out
)
out
=
self
.
mul2
(
out
,
b
)
return
out
_x
=
Tensor
(
np
.
ones
([
128
,
64
,
32
]),
dtype
=
ms
.
float32
)
_w1
=
Tensor
(
np
.
ones
([
128
,
64
,
32
]),
dtype
=
ms
.
float32
)
_b
=
Tensor
(
np
.
ones
([
128
,
64
,
32
]),
dtype
=
ms
.
float32
)
def
compile_net
(
net
):
optimizer
=
Momentum
(
net
.
trainable_params
(),
learning_rate
=
0.1
,
momentum
=
0.9
)
train_net
=
TrainOneStepCell
(
net
,
optimizer
)
_executor
.
compile
(
train_net
,
_x
,
_b
)
context
.
reset_auto_parallel_context
()
def
test_square_data_parallel
():
context
.
set_auto_parallel_context
(
parallel_mode
=
"semi_auto_parallel"
,
device_num
=
16
,
global_rank
=
0
)
strategy1
=
((
16
,
1
,
1
),
(
16
,
1
,
1
))
strategy2
=
((
16
,
1
,
1
),
)
net
=
Net
(
_w1
,
strategy1
,
strategy2
)
compile_net
(
net
)
def
test_square_model_parallel
():
context
.
set_auto_parallel_context
(
parallel_mode
=
"semi_auto_parallel"
,
device_num
=
16
,
global_rank
=
0
)
strategy1
=
((
1
,
1
,
16
),
(
1
,
1
,
16
))
strategy2
=
((
1
,
1
,
16
),
)
net
=
Net
(
_w1
,
strategy1
,
strategy2
)
compile_net
(
net
)
def
test_square_hybrid_parallel
():
context
.
set_auto_parallel_context
(
parallel_mode
=
"semi_auto_parallel"
,
device_num
=
16
,
global_rank
=
0
)
strategy1
=
((
2
,
2
,
4
),
(
2
,
2
,
4
))
strategy2
=
((
2
,
2
,
4
),
)
net
=
Net
(
_w1
,
strategy1
,
strategy2
)
compile_net
(
net
)
def
test_square_auto_parallel
():
context
.
set_auto_parallel_context
(
parallel_mode
=
"auto_parallel"
,
device_num
=
16
,
global_rank
=
0
)
net
=
Net
(
_w1
)
compile_net
(
net
)
def
test_square_repeat_calc
():
context
.
set_auto_parallel_context
(
parallel_mode
=
"semi_auto_parallel"
,
device_num
=
16
,
global_rank
=
0
)
strategy1
=
((
2
,
2
,
4
),
(
2
,
2
,
4
))
strategy2
=
((
1
,
2
,
2
),
)
net
=
Net
(
_w1
,
strategy1
,
strategy2
)
compile_net
(
net
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录