OSSInnovation
/
mindspore
1
0
Fork 26
Code Issues Pull Requests 7 Releases Wiki Activity

!14623 Add IsDynamic func to BaseShape && PyNative perf opt 

From: @jojobugfree
Reviewed-by: @zhoufeng54,@kisnwang
Signed-off-by: @zhoufeng54
This commit is contained in:
mindspore-ci-bot 2021-04-06 19:23:37 +08:00 committed by Gitee
parent c8107390d1 23476a783e
commit c543e121ed
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mindspore/ccsrc/pipeline/pynative/pynative_execute.cc
View File

@ -850,8 +850,8 @@ void ForwardExecutor::GetOpOutputAbstract(const OpExecInfoPtr &op_exec_info,
MS_EXCEPTION_IF_NULL(abstract); MS_EXCEPTION_IF_NULL(abstract);
auto shape = abstract->BuildShape(); auto shape = abstract->BuildShape();
MS_EXCEPTION_IF_NULL(shape); MS_EXCEPTION_IF_NULL(shape);
auto shape_info = shape->ToString();
if (shape_info.find("-1") != string::npos) { if (shape->IsDynamic()) {
op_exec_info->is_dynamic_shape = true; op_exec_info->is_dynamic_shape = true;
} }
} }

12
mindspore/core/abstract/dshape.h
View File

@ -46,6 +46,7 @@ class BaseShape : public Base {
virtual bool operator==(const BaseShape &other) const; virtual bool operator==(const BaseShape &other) const;
bool operator!=(const BaseShape &other) const; bool operator!=(const BaseShape &other) const;
std::size_t hash() const override { return tid(); } std::size_t hash() const override { return tid(); }
virtual bool IsDynamic() const = 0;
// return a deep copy // return a deep copy
virtual BaseShapePtr Clone() const = 0; virtual BaseShapePtr Clone() const = 0;
@ -57,6 +58,7 @@ class NoShape : public BaseShape {
MS_DECLARE_PARENT(NoShape, BaseShape) MS_DECLARE_PARENT(NoShape, BaseShape)
BaseShapePtr Clone() const override { return std::make_shared<NoShape>(); } BaseShapePtr Clone() const override { return std::make_shared<NoShape>(); }
std::string ToString() const override { return type_name(); } std::string ToString() const override { return type_name(); }
bool IsDynamic() const override { return false; }
}; };
extern const std::shared_ptr<NoShape> kNoShape; extern const std::shared_ptr<NoShape> kNoShape;
@ -78,10 +80,13 @@ class Shape : public BaseShape {
ShapeVector &shape() { return shape_; } ShapeVector &shape() { return shape_; }
ShapeVector &min_shape() { return min_shape_; } ShapeVector &min_shape() { return min_shape_; }
ShapeVector &max_shape() { return max_shape_; } ShapeVector &max_shape() { return max_shape_; }
bool IsDynamic() const override {
return std::any_of(shape_.begin(), shape_.end(), [](int64_t s) { return s < 0; });
}
ShapeVector shape_; // use SHP_ANY to implement the any shape in python ShapeVector shape_; // use SHP_ANY to implement the any shape in python
ShapeVector min_shape_; // record mininum length for each dynamic dimention ShapeVector min_shape_; // record minimum length for each dynamic dimension
ShapeVector max_shape_; // record maximum length for each dynamic dimention ShapeVector max_shape_; // record maximum length for each dynamic dimension
}; };
using ShapePtr = std::shared_ptr<Shape>; using ShapePtr = std::shared_ptr<Shape>;
using ShapePtrList = std::vector<ShapePtr>; using ShapePtrList = std::vector<ShapePtr>;
@ -102,6 +107,9 @@ class SequeueShape : public BaseShape {
const BaseShapePtrList &shape() const { return p_shapes_; } const BaseShapePtrList &shape() const { return p_shapes_; }
size_t size() const { return p_shapes_.size(); } size_t size() const { return p_shapes_.size(); }
const BaseShapePtr operator[](std::size_t dim) const { return p_shapes_[dim]; } const BaseShapePtr operator[](std::size_t dim) const { return p_shapes_[dim]; }
bool IsDynamic() const override {
return std::any_of(p_shapes_.begin(), p_shapes_.end(), [](const BaseShapePtr &bs) { return bs->IsDynamic(); });
}
protected: protected:
BaseShapePtrList p_shapes_; // shape list of each elements BaseShapePtrList p_shapes_; // shape list of each elements