Browse Source

change TupleGetitem to TupleGetItem

tags/v1.1.1
l00591931 5 years ago
parent
commit
c2ae934259
59 changed files with 73 additions and 73 deletions
  1. +1
    -1
      mindspore/ccsrc/frontend/parallel/graph_util/node_info.cc
  2. +5
    -5
      mindspore/ccsrc/frontend/parallel/step_auto_parallel.cc
  3. +6
    -6
      mindspore/ccsrc/frontend/parallel/step_parallel.cc
  4. +3
    -3
      mindspore/ccsrc/transform/graph_ir/convert.cc
  5. +2
    -2
      mindspore/core/base/core_ops.h
  6. +1
    -1
      mindspore/core/utils/parallel_node_check.cc
  7. +1
    -1
      mindspore/ops/_constants.py
  8. +1
    -1
      mindspore/ops/_grad/grad_implementations.py
  9. +1
    -1
      mindspore/ops/functional.py
  10. +1
    -1
      tests/ut/cpp/operator/ops_test.cc
  11. +2
    -2
      tests/ut/cpp/python_input/gtest_input/optimizer/opt_test.py
  12. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/adam_apply_one_fusion_test.py
  13. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/adam_apply_one_with_decay_rule.py
  14. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/batch_norm_bert_fission_test.py
  15. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/batch_norm_grad_infer_fission_test.py
  16. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/batch_norm_grad_split.py
  17. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/batchnorm_to_bninfer.py
  18. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/batchnormgrad_to_bninfergrad.py
  19. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/bn_grad_split.py
  20. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/bn_split.py
  21. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/clip_by_norm_no_div_square_sum_fusion.py
  22. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/clip_by_value_fusion.py
  23. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/confusion_mul_grad_fusion.py
  24. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/confusion_softmax_grad_rule.py
  25. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/convert_tuple_output_to_maketuple_test.py
  26. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/derelu_fusion.py
  27. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/fused_batch_norm_fusion_test.py
  28. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/getitem_tuple.py
  29. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/hw_opt_test.py
  30. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/insert_memcpy_async_for_getnext.py
  31. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/insert_memcpy_async_for_hccl_op.py
  32. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/insert_trans_op_test.py
  33. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/ir_fusion_test.py
  34. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_mv_rule_test.py
  35. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_mv_with_decay_rule_test.py
  36. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_mv_with_decay_v1_rule.py
  37. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_right_rule_test.py
  38. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_update_with_lr_rule_fusion.py
  39. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_update_with_lr_v2_test.py
  40. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/lars_v2_fission_test.py
  41. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/layer_norm_beta_gamma_backprop_fusion_test.py
  42. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/layer_norm_grad_split.py
  43. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/mixed_precision_test.py
  44. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/momentum_lossscale_fusion_test.py
  45. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/mul_add_fusion_test.py
  46. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/mul_addn_fusion_test.py
  47. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/reduce_min_fission_test.py
  48. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/remove_internal_output_test.py
  49. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/single_batch_norm_fission_test.py
  50. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/softmax_grad_ext_fusion.py
  51. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/split_fission_test.py
  52. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/square_sum_fusion.py
  53. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/tensor_scatter_update_fission_test.py
  54. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/topk_split_test.py
  55. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/transdata_split_test.py
  56. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/transpose_transdata_fusion_test.py
  57. +1
    -1
      tests/ut/cpp/python_input/gtest_input/pre_activate/unsorted_segment_sum_fission.py
  58. +1
    -1
      tests/ut/cpp/python_input/gtest_input/session/session_test.py
  59. +2
    -2
      tests/ut/python/optimizer/test_python_pass.py

+ 1
- 1
mindspore/ccsrc/frontend/parallel/graph_util/node_info.cc View File

@@ -307,7 +307,7 @@ bool FindReshapePreNodeStraCosts(const AnfNodePtr &node, OperatorInfoPtr *pre_op
}
ValueNodePtr prim_anf_node = cnode->input(0)->cast<ValueNodePtr>();
PrimitivePtr prim = prim_anf_node->value()->cast<PrimitivePtr>();
if (prim->name() == prim::kTupleGetitem) {
if (prim->name() == prim::kTupleGetItem) {
*out_index = GetTupleGetItemIndex(cnode);
// find tuple_get_item's previous node
auto pre_node = cnode->input(1);


+ 5
- 5
mindspore/ccsrc/frontend/parallel/step_auto_parallel.cc View File

@@ -598,7 +598,7 @@ void ConstructCostGraphEdges(const std::vector<AnfNodePtr> &all_nodes) {
PrimitivePtr prev_prim = prev_prim_anf_node->value()->cast<PrimitivePtr>();
size_t output_index = 0;

bool bool_result = (IsAutoParallelCareNode(prev_cnode)) || (prev_prim->name() == prim::kTupleGetitem) ||
bool bool_result = (IsAutoParallelCareNode(prev_cnode)) || (prev_prim->name() == prim::kTupleGetItem) ||
(prev_prim->name() == DEPEND);
while (bool_result) {
if (IsAutoParallelCareNode(prev_cnode)) {
@@ -638,7 +638,7 @@ void ConstructCostGraphEdges(const std::vector<AnfNodePtr> &all_nodes) {
edge_count++;

break;
} else if (prev_prim->name() == prim::kTupleGetitem) {
} else if (prev_prim->name() == prim::kTupleGetItem) {
// In this case, 'prev_anf_node' is 'tuple_getitem', the actual precursor node is node before
// this 'tuple_getitem'
MS_LOG(INFO) << "Jumping the 'tuple_getitem' operator.";
@@ -671,7 +671,7 @@ void ConstructCostGraphEdges(const std::vector<AnfNodePtr> &all_nodes) {
<< "and creating an edge between the Operator before "
<< "'depend' and the Operator after 'depend'.";
}
bool_result = (IsAutoParallelCareNode(prev_cnode)) || (prev_prim->name() == prim::kTupleGetitem) ||
bool_result = (IsAutoParallelCareNode(prev_cnode)) || (prev_prim->name() == prim::kTupleGetItem) ||
(prev_prim->name() == DEPEND);
}
}
@@ -959,13 +959,13 @@ std::vector<std::vector<std::string>> RecInputTensorNames(const std::map<std::st

CNodePtr GetInternalOperatorInfo(const CNodePtr &cnode, const ValueNodePtr &prim_anf_node) {
PrimitivePtr prim = GetValueNode<PrimitivePtr>(prim_anf_node);
if (prim->name() == prim::kTupleGetitem || prim->name() == DEPEND) {
if (prim->name() == prim::kTupleGetItem || prim->name() == DEPEND) {
auto prev_cnode = cnode->input(1)->cast<CNodePtr>();
if (prev_cnode == nullptr || !IsValueNode<Primitive>(prev_cnode->input(0))) {
return nullptr;
}
auto prev_prim = prev_cnode->input(0)->cast<ValueNodePtr>()->value()->cast<PrimitivePtr>();
while (prev_prim->name() == prim::kTupleGetitem || prev_prim->name() == DEPEND) {
while (prev_prim->name() == prim::kTupleGetItem || prev_prim->name() == DEPEND) {
prev_cnode = prev_cnode->input(1)->cast<CNodePtr>();
if (prev_cnode == nullptr || !IsValueNode<Primitive>(prev_cnode->input(0))) {
return nullptr;


+ 6
- 6
mindspore/ccsrc/frontend/parallel/step_parallel.cc View File

@@ -181,7 +181,7 @@ void ForwardCommunication(OperatorVector forward_op, const CNodePtr &node) {
}
PrimitivePtr value_node_prim = GetValueNode<PrimitivePtr>(uses_cnode->input(0));
MS_EXCEPTION_IF_NULL(value_node_prim);
if (value_node_prim->name() == prim::kTupleGetitem) {
if (value_node_prim->name() == prim::kTupleGetItem) {
if (uses_set.size() > 1) {
MS_LOG(EXCEPTION) << "Now only support one output, but got " << uses_set.size();
}
@@ -279,7 +279,7 @@ void InsertGetTensorSliceOp(const Operator &op, const CNodePtr &node, const Func
TensorLayout GetTensorInLayout(const CNodePtr &middle_node, const PrimitivePtr &middle_prim,
const OperatorInfoPtr &distribute_operator) {
TensorInfo tensorinfo_in;
if (middle_prim->name() == prim::kTupleGetitem) {
if (middle_prim->name() == prim::kTupleGetItem) {
auto value_node = middle_node->input(2)->cast<ValueNodePtr>();
MS_EXCEPTION_IF_NULL(value_node);
size_t index_s = LongToSize(GetValue<int64_t>(value_node->value()));
@@ -473,7 +473,7 @@ void StepRedistribution(const CNodePtr &node, const OperatorInfoPtr &distribute_
MS_EXCEPTION_IF_NULL(current_value);
PrimitivePtr current_prim = current_value->value()->cast<PrimitivePtr>();
MS_EXCEPTION_IF_NULL(current_prim);
insert_node_new = ((current_prim->name() == prim::kTupleGetitem) ? node : insert_node);
insert_node_new = ((current_prim->name() == prim::kTupleGetItem) ? node : insert_node);
} else {
insert_node_new = insert_node;
}
@@ -1964,7 +1964,7 @@ std::shared_ptr<TensorLayout> FindPrevLayout(const AnfNodePtr &node) {
}
ValueNodePtr prim_anf_node = cnode->input(0)->cast<ValueNodePtr>();
PrimitivePtr prim = prim_anf_node->value()->cast<PrimitivePtr>();
if (prim->name() == prim::kTupleGetitem) {
if (prim->name() == prim::kTupleGetItem) {
auto tuple_index = GetTupleGetItemIndex(cnode);
auto layout_ptr = FindPrevParallelCareNodeLayout(cnode->input(1), LongToSize(tuple_index));
if (!layout_ptr) {
@@ -2081,7 +2081,7 @@ LossNodeInfo FindLossCNode(const FuncGraphPtr &func_graph) {
}

// return -> tuple_getitem -> loss
if (current_prim->name() == prim::kTupleGetitem) {
if (current_prim->name() == prim::kTupleGetItem) {
auto tuple_index = GetTupleGetItemIndex(pre_cnode);
AnfNodePtr pre_pre_node = pre_cnode->input(1);
MS_EXCEPTION_IF_NULL(pre_pre_node);
@@ -2338,7 +2338,7 @@ std::vector<std::pair<CNodePtr, LossNodeInfo>> GetSensLossPairs(const FuncGraphP
}

auto expect_tuple_getitem_cnode = expect_tuple_getitem->cast<CNodePtr>();
if (!IsSomePrimitive(expect_tuple_getitem_cnode, prim::kTupleGetitem)) {
if (!IsSomePrimitive(expect_tuple_getitem_cnode, prim::kTupleGetItem)) {
continue;
}



+ 3
- 3
mindspore/ccsrc/transform/graph_ir/convert.cc View File

@@ -632,7 +632,7 @@ void DfGraphConvertor::TraceOutput(const AnfNodePtr node) {
MS_LOG(EXCEPTION) << "length of inputs is " << c->inputs().size() << ", which is less than 3";
}
TraceOutput(c->input(1));
} else if (name == prim::kTupleGetitem) {
} else if (name == prim::kTupleGetItem) {
TraceOutputFromTupleGetItem(anf_out);
} else {
// add outputs;
@@ -1015,7 +1015,7 @@ void DfGraphConvertor::SetOpInput(const OpAdapterPtr &adpt, const CNodePtr &node
if (it != out_handle_cache_.end()) {
int ret = adpt->setInput(src, SizeToInt(i), it->second);
if (ret == 0) {
if (pred->isa<CNode>() && GetCNodeTargetFuncName(pred->cast<CNodePtr>()) == prim::kTupleGetitem) {
if (pred->isa<CNode>() && GetCNodeTargetFuncName(pred->cast<CNodePtr>()) == prim::kTupleGetItem) {
compute_sout_ << op_draw_name_[pred->cast<CNodePtr>()->input(1).get()] << " -> " << op_draw_name_[node.get()]
<< ":" << i << endl;
} else if (pred->isa<Parameter>()) {
@@ -1539,7 +1539,7 @@ bool DfGraphConvertor::CheckCNode(const std::string &name, const CNodePtr node)
}

// As for nodes with multi outputs, convert tuple_getitem to OutHandle
if (name == prim::kTupleGetitem) {
if (name == prim::kTupleGetItem) {
ConvertTupleGetItem(node);
return false;
}


+ 2
- 2
mindspore/core/base/core_ops.h View File

@@ -37,7 +37,7 @@ constexpr auto kScalarTrunc = "ScalarTrunc";
constexpr auto kScalarFloor = "ScalarFloor";
constexpr auto kScalarUadd = "ScalarUadd";
constexpr auto kScalarUsub = "ScalarUsub";
constexpr auto kTupleGetitem = "TupleGetitem";
constexpr auto kTupleGetItem = "TupleGetitem";
constexpr auto kMakeTuple = "MakeTuple";
constexpr auto kReturn = "Return";
constexpr auto kSGD = "SGD";
@@ -379,7 +379,7 @@ inline const PrimitivePtr kPrimCall = std::make_shared<Primitive>("call");

inline const PrimitivePtr kPrimMakeTuple = std::make_shared<Primitive>(kMakeTuple);
inline const PrimitivePtr kPrimMakeSlice = std::make_shared<Primitive>("make_slice");
inline const PrimitivePtr kPrimTupleGetItem = std::make_shared<Primitive>(kTupleGetitem);
inline const PrimitivePtr kPrimTupleGetItem = std::make_shared<Primitive>(kTupleGetItem);
inline const PrimitivePtr kPrimArrayGetItem = std::make_shared<Primitive>("array_getitem");
inline const PrimitivePtr kPrimTupleSetItem = std::make_shared<Primitive>("tuple_setitem");
inline const PrimitivePtr kPrimArraySetItem = std::make_shared<Primitive>("array_setitem");


+ 1
- 1
mindspore/core/utils/parallel_node_check.cc View File

@@ -22,7 +22,7 @@

namespace mindspore {
// clang-format off
static const std::set<std::string> PARALLEL_BLACK_LIST_ = {prim::kTupleGetitem, "J", "list_getitem",
static const std::set<std::string> PARALLEL_BLACK_LIST_ = {prim::kTupleGetItem, "J", "list_getitem",
"array_getitem", "tuple_setitem", "Depend", "list_setitem", "array_setitem", "dict_getitem",
"list_append", "list_map", "list_reduce", "tuple_reversed", "tile_shape", "tuple_div", "tuple_to_array",
"make_dict", "make_slice", "make_record", "string_equal", "VirtualLoss", prim::kReturn, "env_getitem",


+ 1
- 1
mindspore/ops/_constants.py View File

@@ -30,5 +30,5 @@ kScalarFloor = "ScalarFloor"
kScalarUadd = "ScalarUadd"
kScalarUsub = "ScalarUsub"

kTupleGetitem = "TupleGetitem"
kTupleGetItem = "TupleGetitem"
kMakeTuple = "MakeTuple"

+ 1
- 1
mindspore/ops/_grad/grad_implementations.py View File

@@ -141,7 +141,7 @@ def bprop_scalar_cast(x, t, out, dout):
return F.scalar_cast(dout, F.typeof(x)), t


@bprops.register(Constants.kTupleGetitem)
@bprops.register(Constants.kTupleGetItem)
def bprop_tuple_getitem(data, idx, out, dout):
"""Backpropagator for primitive `tuple_getitem`."""
return F.tuple_setitem(C.zeros_like(data), idx, dout), C.zeros_like(idx)


+ 1
- 1
mindspore/ops/functional.py View File

@@ -86,7 +86,7 @@ depend = P.Depend()
identity = P.identity()

tuple_setitem = Primitive('tuple_setitem')
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
list_getitem = Primitive('list_getitem')
list_setitem = Primitive('list_setitem')
dict_getitem = Primitive('dict_getitem')


+ 1
- 1
tests/ut/cpp/operator/ops_test.cc View File

@@ -189,7 +189,7 @@ TEST_F(TestOps, MakeRecordTest) {
}

TEST_F(TestOps, TupleGetItemTest) {
auto prim = std::make_shared<Primitive>(kTupleGetitem);
auto prim = std::make_shared<Primitive>(kTupleGetItem);
ASSERT_EQ(prim->name(), kPrimTupleGetItem->name());
}



+ 2
- 2
tests/ut/cpp/python_input/gtest_input/optimizer/opt_test.py View File

@@ -29,7 +29,7 @@ from mindspore.ops.operations import _grad_ops as G

scalar_add = Primitive(Constants.kScalarAdd)
scalar_mul = Primitive(Constants.kScalarMul)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
switch = Primitive('switch')


@@ -923,7 +923,7 @@ def test_convert_switch_ops(tag):
merge = Primitive('Merge')
add = Primitive(Constants.kScalarAdd)
neg = Primitive('Neg')
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
make_tuple = Primitive(Constants.kMakeTuple)

@fns


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/adam_apply_one_fusion_test.py View File

@@ -25,7 +25,7 @@ Sqrt = P.Sqrt()
Square = P.Square()
Assign = P.Assign()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
AdamApplyOne = Primitive('AdamApplyOne')
AdamApplyOneAssign = Primitive('AdamApplyOneAssign')



+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/adam_apply_one_with_decay_rule.py View File

@@ -26,7 +26,7 @@ real_div = P.RealDiv()
sub = P.Sub()
Assign = P.Assign()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
adam_apply_one_with_decay = Primitive('AdamApplyOneWithDecay')
adam_apply_one_with_decay_assign = Primitive('AdamApplyOneWithDecayAssign')



+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/batch_norm_bert_fission_test.py View File

@@ -17,7 +17,7 @@ from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
BatchNorm = P.BatchNorm()
BNTrainingReduce = Primitive('BNTrainingReduce')
BNTrainingUpdateV2 = Primitive('BNTrainingUpdateV2')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/batch_norm_grad_infer_fission_test.py View File

@@ -17,7 +17,7 @@ from mindspore.ops.operations import _grad_ops as G
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
BatchNormGradTraining = G.BatchNormGrad(is_training=True)
BatchNormGradInfer = G.BatchNormGrad(is_training=False)
BNInferGrad = Primitive('BNInferGrad')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/batch_norm_grad_split.py View File

@@ -21,7 +21,7 @@ batch_norm_grad = G.BatchNormGrad(is_training=True)
bn_training_update_grad = Primitive('BNTrainingUpdateGrad')
bn_training_reduce_grad = Primitive('BNTrainingReduceGrad')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/batchnorm_to_bninfer.py View File

@@ -20,7 +20,7 @@ from mindspore.ops import _constants as Constants
batch_norm = P.BatchNorm(is_training=False)
bn_infer = Primitive('BNInfer')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/batchnormgrad_to_bninfergrad.py View File

@@ -20,7 +20,7 @@ from mindspore.ops import _constants as Constants
batch_norm_grad = G.BatchNormGrad(is_training=False)
bn_infer_grad = Primitive('BNInferGrad')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/bn_grad_split.py View File

@@ -18,7 +18,7 @@ from mindspore.ops.operations import _grad_ops as G
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
bn_grad = G.BatchNormGrad(is_training=True)
bn_grad1 = Primitive('BNGrad1')
bn_grad2 = Primitive('BNGrad2')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/bn_split.py View File

@@ -18,7 +18,7 @@ from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
bn = P.BatchNorm(is_training=True)
fused_bn1 = Primitive('FusedBN1')
fused_bn2 = Primitive('FusedBN2')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/clip_by_norm_no_div_square_sum_fusion.py View File

@@ -22,7 +22,7 @@ sqrt = P.Sqrt()
greater = P.Greater()
clip_by_norm_no_div_square_sum = Primitive('ClipByNormNoDivSum')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/clip_by_value_fusion.py View File

@@ -20,7 +20,7 @@ maximum = P.Maximum()
minimum = P.Minimum()
clip_by_value = Primitive('ClipByValue')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/confusion_mul_grad_fusion.py View File

@@ -21,7 +21,7 @@ mul = P.Mul()
reduce_sum = P.ReduceSum()
confusion_mul_grad = Primitive('ConfusionMulGrad')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
axis = 1




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/confusion_softmax_grad_rule.py View File

@@ -21,7 +21,7 @@ reduce_sum = P.ReduceSum(keep_dims=True)
sub = P.Sub()
confusion_softmax_grad = Primitive('ConfusionSoftmaxGrad')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
axis = 2




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/convert_tuple_output_to_maketuple_test.py View File

@@ -17,7 +17,7 @@ from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_get_item = Primitive(Constants.kTupleGetitem)
tuple_get_item = Primitive(Constants.kTupleGetItem)
LSTM = P.LSTM(input_size=10, hidden_size=2, num_layers=1, has_bias=True, bidirectional=False, dropout=0.0)
add = P.TensorAdd()



+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/derelu_fusion.py View File

@@ -21,7 +21,7 @@ relu_grad = Primitive('ReluGrad')
relu_v2 = Primitive('ReLUV2')
relu_grad_v2 = Primitive('ReluGradV2')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/fused_batch_norm_fusion_test.py View File

@@ -23,7 +23,7 @@ AssignSub = P.AssignSub()
Mul = P.Mul()
Sub = P.Sub()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
BatchNorm = P.BatchNorm()
Cast = P.Cast()
BNTrainingReduce = Primitive('BNTrainingReduce')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/getitem_tuple.py View File

@@ -17,7 +17,7 @@ from mindspore.ops import Primitive
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/hw_opt_test.py View File

@@ -16,7 +16,7 @@ from mindspore.ops import Primitive
from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
depend = P.Depend()
addn = P.AddN()
add = P.TensorAdd()


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/insert_memcpy_async_for_getnext.py View File

@@ -21,7 +21,7 @@ from mindspore.ops import _constants as Constants
get_next = P.GetNext([ms.float32, ms.int32], [[32, 64], [32]], 2, "")
memcpy_async = Primitive('memcpy_async')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/insert_memcpy_async_for_hccl_op.py View File

@@ -21,7 +21,7 @@ all_reduce = P.AllReduce()
broadcast = P.Broadcast(1)
memcpy_async = Primitive('memcpy_async')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
apply_momentun = P.ApplyMomentum()
control_depend = P.ControlDepend()
relu = P.ReLU()


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/insert_trans_op_test.py View File

@@ -16,7 +16,7 @@ from mindspore.ops import Primitive
from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
add = P.TensorAdd()
max_pool = P.MaxPoolWithArgmax(pad_mode="same", kernel_size=3, strides=2)
make_tuple = Primitive(Constants.kMakeTuple)


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/ir_fusion_test.py View File

@@ -19,7 +19,7 @@ from mindspore.ops import _constants as Constants

# pylint: disable=unused-variable

tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
add = P.TensorAdd()
allreduce = P.AllReduce()
allreduce.add_prim_attr('fusion', 1)


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_mv_rule_test.py View File

@@ -22,7 +22,7 @@ RealDiv = P.RealDiv()
Rsqrt = P.Rsqrt()
Sqrt = P.Sqrt()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
LambNextMV = Primitive('LambNextMV')

class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_mv_with_decay_rule_test.py View File

@@ -22,7 +22,7 @@ RealDiv = P.RealDiv()
Rsqrt = P.Rsqrt()
Sqrt = P.Sqrt()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
LambNextMVWithDecay = Primitive('LambNextMVWithDecay')

class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_mv_with_decay_v1_rule.py View File

@@ -22,7 +22,7 @@ real_div = P.RealDiv()
rsqrt = P.Rsqrt()
sqrt = P.Sqrt()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
LambNextMVWithDecayV1 = Primitive('LambNextMVWithDecayV1')




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_next_right_rule_test.py View File

@@ -21,7 +21,7 @@ Mul = P.Mul()
Sqrt = P.Sqrt()
Square = P.Square()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
LambNextRight = Primitive('LambNextRight')




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_update_with_lr_rule_fusion.py View File

@@ -25,7 +25,7 @@ mul = P.Mul()
sub = P.Sub()
lamb_update_with_lr = Primitive('LambUpdateWithLR')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/lamb_update_with_lr_v2_test.py View File

@@ -22,7 +22,7 @@ RealDiv = P.RealDiv()
Select = P.Select()
Greater = P.Greater()
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
LambUpdateWithLrV2 = Primitive('LambUpdateWithLrV2')




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/lars_v2_fission_test.py View File

@@ -20,7 +20,7 @@ lars_v2 = Primitive('LarsV2')
square_sum_all = Primitive('SquareSumAll')
lars_v2_update = Primitive('LarsV2Update')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/layer_norm_beta_gamma_backprop_fusion_test.py View File

@@ -19,7 +19,7 @@ from mindspore.ops import _constants as Constants
Add = P.TensorAdd()
Cast = P.Cast()
LayerNormBetaGammaBackprop = Primitive('LayerNormBetaGammaBackprop')
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/layer_norm_grad_split.py View File

@@ -18,7 +18,7 @@ from mindspore.ops.operations import _grad_ops as G
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
layer_norm_grad = G.LayerNormGrad()
layer_norm_x_backprop = Primitive('LayerNormXBackprop')
layer_norm_beta_gamma_backprop = Primitive('LayerNormBetaGammaBackprop')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/mixed_precision_test.py View File

@@ -16,7 +16,7 @@ from mindspore.ops import Primitive
from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
depend = P.Depend()
addn = P.AddN()
add = P.TensorAdd()


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/momentum_lossscale_fusion_test.py View File

@@ -22,7 +22,7 @@ Mul = P.Mul()
ApplyMomentum = P.ApplyMomentum()
FusedMulApplyMomentum = Primitive('FusedMulApplyMomentum')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
constant = Tensor(1.0, mstype.float32)




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/mul_add_fusion_test.py View File

@@ -20,7 +20,7 @@ add = P.TensorAdd()
mul = P.Mul()
fused_mul_add = Primitive('FusedMulAdd')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/mul_addn_fusion_test.py View File

@@ -22,7 +22,7 @@ addn = P.AddN()
mul = P.Mul()
fused_mul_addn = Primitive('FusedMulAddN')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
scalar = Tensor(1.0, mstype.float32)




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/reduce_min_fission_test.py View File

@@ -18,7 +18,7 @@ from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
reduce_min = P.ReduceMin(keep_dims=False)
reduce_min1 = Primitive('ReduceMin')
reduce_min2 = Primitive('ReduceMin')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/remove_internal_output_test.py View File

@@ -16,7 +16,7 @@ from mindspore.ops import Primitive
from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
add = P.TensorAdd()
max_pool = P.MaxPoolWithArgmax(pad_mode="same", kernel_size=3, strides=2)
make_tuple = Primitive(Constants.kMakeTuple)


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/single_batch_norm_fission_test.py View File

@@ -16,7 +16,7 @@ from mindspore.ops import Primitive
from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
BatchNorm = P.BatchNorm(is_training=True)
BNTrainingReduce = Primitive('BNTrainingReduce')
BNTrainingUpdateV3 = Primitive('BNTrainingUpdateV3')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/softmax_grad_ext_fusion.py View File

@@ -21,7 +21,7 @@ ReduceSum = P.ReduceSum(keep_dims=True)
Sub = P.Sub()
SoftmaxGradExt = Primitive('SoftmaxGradExt')
MakeTuple = Primitive(Constants.kMakeTuple)
TupleGetItem = Primitive(Constants.kTupleGetitem)
TupleGetItem = Primitive(Constants.kTupleGetItem)
axes = (2, 3)




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/split_fission_test.py View File

@@ -19,7 +19,7 @@ from mindspore.ops import _constants as Constants

split = P.Split(0, 8)
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
splitv = Primitive('SplitV')




+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/square_sum_fusion.py View File

@@ -17,7 +17,7 @@ from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
square = P.Square()
reduce_sum = P.ReduceSum()
square_sumv1 = Primitive('SquareSumV1')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/tensor_scatter_update_fission_test.py View File

@@ -20,7 +20,7 @@ tensor_scatter_update = P.TensorScatterUpdate()
tensor_move = Primitive('TensorMove')
scatter_nd_update = Primitive('ScatterNdUpdate')
make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/topk_split_test.py View File

@@ -18,7 +18,7 @@ from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

TopK = P.TopK()
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)


class FnDict:


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/transdata_split_test.py View File

@@ -16,7 +16,7 @@ from mindspore.ops import Primitive
from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
add = P.TensorAdd()
max_pool = P.MaxPoolWithArgmax(pad_mode="same", kernel_size=3, strides=2)
make_tuple = Primitive(Constants.kMakeTuple)


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/transpose_transdata_fusion_test.py View File

@@ -16,7 +16,7 @@ from mindspore.ops import Primitive
from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
add = P.TensorAdd()
max_pool = P.MaxPoolWithArgmax(pad_mode="same", kernel_size=3, strides=2)
make_tuple = Primitive(Constants.kMakeTuple)


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/pre_activate/unsorted_segment_sum_fission.py View File

@@ -17,7 +17,7 @@ from mindspore.ops import operations as P
from mindspore.ops import _constants as Constants

make_tuple = Primitive(Constants.kMakeTuple)
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
unsorted_segment_sum = P.UnsortedSegmentSum()
num_segments = 4
padding = Primitive('Padding')


+ 1
- 1
tests/ut/cpp/python_input/gtest_input/session/session_test.py View File

@@ -21,7 +21,7 @@ addn = P.AddN()
add = P.TensorAdd()
reshape = P.Reshape()
cast = P.Cast()
tuple_getitem = Primitive(Constants.kTupleGetitem)
tuple_getitem = Primitive(Constants.kTupleGetItem)
max_pool = P.MaxPoolWithArgmax(pad_mode="same", kernel_size=3, strides=2)




+ 2
- 2
tests/ut/python/optimizer/test_python_pass.py View File

@@ -297,12 +297,12 @@ def test_imm_target():
pattern = Call(P.Softmax(), [x])
imm = Imm(0)
target_0 = Call(Constants.kMakeTuple, [pattern])
target = Call(Constants.kTupleGetitem, [target_0, imm])
target = Call(Constants.kTupleGetItem, [target_0, imm])
return pattern, target
transformed_repr = get_func_graph(softmax_model, inputs).get_return().expanded_str(5)
unregiste_pass(softmax_pass)
assert Constants.kMakeTuple in transformed_repr
assert Constants.kTupleGetitem in transformed_repr
assert Constants.kTupleGetItem in transformed_repr
assert "Softmax" in transformed_repr

def test_gen_new_parameter():


Loading…
Cancel
Save