saltyfish
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!5318 Fix wrong error 

Merge pull request !5318 from fanglei/r0.7
This commit is contained in:
mindspore-ci-bot 2020-08-27 15:00:04 +08:00 committed by Gitee
parent f9609e4ca7 08c1d4bf44
commit ee6ab2980d
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mindspore/ccsrc/vm/transform.cc
View File

@ -438,8 +438,9 @@ VectorRef CompileGraph::SplitNodes(const FuncGraphPtr &graph) {
void CompileGraph::Push(const AnfNodePtr &node) {
MS_EXCEPTION_IF_NULL(node);
if (slots_.count(node) > 0) {
MS_LOG(EXCEPTION) << "Push failed node in slots:" << node->DebugString()
<< " NodeInfo: " << trace::GetDebugInfo(node->debug_info());
MS_LOG(WARNING) << "Push failed node in slots:" << node->DebugString()
<< " NodeInfo: " << trace::GetDebugInfo(node->debug_info());
return;
}
MS_LOG(DEBUG) << "Push node: " << node->DebugString(true) << " height_: " << height_
<< " is parameter: " << node->isa<Parameter>();

6
mindspore/ccsrc/vm/vm.cc
View File

@ -341,13 +341,15 @@ void FinalVM::InstSwitchLayer(const VectorRef &args) {
if (!backend_->GetIndex(index, &idx_value)) {
MS_LOG(EXCEPTION) << "Not supported type to be casted to int.";
}
auto ori_value = idx_value;
if (idx_value < 0) {
// Add support negative index range [-size, -1].
idx_value += size;
}
if (idx_value < 0 || idx_value >= size) {
MS_LOG(EXCEPTION) << __FUNCTION__ << " given index " << idx_value << " out of range. Please make sure the value "
<< "of index in [" << -size << ", " << size << "), and the type is int32.";
MS_EXCEPTION(IndexError) << __FUNCTION__ << " given index " << ori_value
<< " out of range. Please make sure the value "
<< "of index in [" << -size << ", " << size << "), and the type is int32.";
}
Push(branches[idx_value]);
MS_LOG(DEBUG) << "End";

2
tests/st/control/test_switch_layer.py
View File

@ -52,5 +52,5 @@ def test_switch_layer():
assert ret
idx3 = Tensor(3, mstype.int32)
with pytest.raises(RuntimeError):
with pytest.raises(IndexError):
value = net(data, idx3, idx2)