diff --git a/mindspore/ccsrc/backend/common/pass/dynamic_sequence_ops_adaptation.cc b/mindspore/ccsrc/backend/common/pass/dynamic_sequence_ops_adaptation.cc index c34a33c46a6..68065be7187 100644 --- a/mindspore/ccsrc/backend/common/pass/dynamic_sequence_ops_adaptation.cc +++ b/mindspore/ccsrc/backend/common/pass/dynamic_sequence_ops_adaptation.cc @@ -38,7 +38,7 @@ const AnfNodePtr DynamicSequenceOpsAdaptation::Process(const FuncGraphPtr &, con if (common::AnfAlgo::HasDynamicTupleInput(cnode) || common::AnfAlgo::IsDynamicSequence(cnode)) { auto primitive = GetCNodePrimitive(cnode); MS_EXCEPTION_IF_NULL(primitive); - constexpr auto kDynamicTupleInputOpNamePrefix = "Tuple"; + constexpr auto kDynamicTupleInputOpNamePrefix = "Sequence"; auto new_op_name = kDynamicTupleInputOpNamePrefix + op_name; primitive->set_name(new_op_name); // reset full scope name diff --git a/mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.cc b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.cc index c4826da23b0..1c434edde8d 100644 --- a/mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.cc @@ -363,22 +363,28 @@ void GPUKernelExecutor::OptimizeGraphWithDeviceInfo(const KernelGraphPtr &graph) pm->AddPass(std::make_shared()); // PrintReduceFusion depends on the input expansion of Print, so must be after the operator select. pm->AddPass(std::make_shared("print_reduce")); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - if (ms_context->get_param(MS_CTX_EXECUTION_MODE) == kGraphMode) { - // Remove node only used by UpdateState, in order to ensure the correct execution sequence in CudnnInplaceAggregate. - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); + + // The fusion operator generates a new primitive and can't be supported in dynamic shape scene. + if (!graph->is_dynamic_shape()) { + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + if (ms_context->get_param(MS_CTX_EXECUTION_MODE) == kGraphMode) { + // Remove node only used by UpdateState, in order to ensure the correct execution sequence in + // CudnnInplaceAggregate. + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + } + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); } - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); - pm->AddPass(std::make_shared()); + pm->AddPass(std::make_shared()); pm->AddPass(std::make_shared()); pm->AddPass(std::make_shared()); diff --git a/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.cc b/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.cc index 02c87ae036f..771bc89babc 100644 --- a/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.cc @@ -2049,7 +2049,10 @@ void GraphScheduler::LinkControlArrowForCustomActor(const ActorSet *actor_set, auto to_kernel_type = FetchKernelTransformType(to_node, graph, graph_compiler_info.origin_parameters_order_, graph_compiler_info.strategy_); auto to_actor = FetchActor(to_kernel_type, graph_compiler_info.name_, to_node, graph); - MS_EXCEPTION_IF_NULL(to_actor); + if (to_actor == nullptr) { + MS_LOG(EXCEPTION) << "Fetch no actor for node:" << to_node->fullname_with_scope() + << ", from node:" << from_node->fullname_with_scope(); + } AbstractActor *from_actor = nullptr; // InternalParameter --> CustomActor.