From 1205240218e8113b1057983378c2185a32b4d11e Mon Sep 17 00:00:00 2001 From: Liyan Zheng Date: Mon, 8 Aug 2022 15:52:07 +0800 Subject: [PATCH] Add: mutator abstract class --- include/core/common.h | 1 + include/core/mutator.h | 14 +++++++++ include/core/operator.h | 53 ---------------------------------- include/operators/matmul.h | 59 ++++++++++++++++++++++++++++++++++++++ src/core/operator.cc | 45 ----------------------------- src/kerels/cpu/matmul.cc | 1 + src/operators/matmul.cc | 49 +++++++++++++++++++++++++++++++ test/core/test_graph.cc | 1 + 8 files changed, 125 insertions(+), 98 deletions(-) create mode 100644 include/core/mutator.h create mode 100644 include/operators/matmul.h create mode 100644 src/operators/matmul.cc diff --git a/include/core/common.h b/include/core/common.h index 8dd6a108..0c69ef35 100644 --- a/include/core/common.h +++ b/include/core/common.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include #include #include diff --git a/include/core/mutator.h b/include/core/mutator.h new file mode 100644 index 00000000..ac2c169d --- /dev/null +++ b/include/core/mutator.h @@ -0,0 +1,14 @@ +#pragma once +#include "core/graph.h" + +namespace infini { + +class Mutator { + public: + Mutator(){}; + virtual ~Mutator(){}; + + virtual vector run(const Graph &in_graph) = 0; +}; + +} // namespace infini \ No newline at end of file diff --git a/include/core/operator.h b/include/core/operator.h index c8146378..bf54737f 100644 --- a/include/core/operator.h +++ b/include/core/operator.h @@ -145,57 +145,4 @@ class OperatorNode : public Object { virtual int numOutputs() const = 0; }; -class MatmulNode : public OperatorNode { - public: - struct MatmulArgs : public OpAttrs { - int b, m, n, k; - // PET assume a row-major tensor layout. transA=false means default - // dims, true means A should be transposed before matmul. This is in - // oppsite to column-major BLAS. - bool transA, transB; - ActType act; - - MatmulArgs(int b, int m, int n, int k, bool transA, bool transB, - ActType act) - : b(b), m(m), n(n), k(k), transA(transA), transB(transB), act(act) { - } - - bool operator<(const OpAttrs &rhsGeneric) { - auto rhs = dynamic_cast(rhsGeneric); - return std::tie(b, m, n, k, transA, transB, act) < - std::tie(rhs.b, rhs.m, rhs.n, rhs.k, rhs.transA, rhs.transB, - rhs.act); - } - }; - - private: - MatmulArgs args; - - public: - MatmulNode(Tensor A, Tensor B, Tensor C, bool transA = false, - bool transB = false, Tensor bias = nullptr, - ActType act = ActType::None); - - std::string toString() const override; - vector computeShape() const override; - - int numInputs() const override { return 2; } - int numOutputs() const override { return 1; } - - Tensor getBias() const { return inputs[2]; } - void setAct(ActType act) { this->args.act = act; } - ActType getAct() const { return args.act; } - bool getTransA() const { return args.transA; } - bool getTransB() const { return args.transB; } - - MatmulArgs getArgs() const { return args; } - OpAttrs getOpAttrs() const override { return args; } - - private: - // Q: whether to check the output? Since we can build an Op first and then - // assure output. - // Fix 1: make shape inference a static method. - bool checkValid(const TensorVec &inputs) const; -}; - } // namespace infini \ No newline at end of file diff --git a/include/operators/matmul.h b/include/operators/matmul.h new file mode 100644 index 00000000..3a70920b --- /dev/null +++ b/include/operators/matmul.h @@ -0,0 +1,59 @@ +#pragma once +#include "core/operator.h" + +namespace infini { + +class MatmulNode : public OperatorNode { + public: + struct MatmulArgs : public OpAttrs { + int b, m, n, k; + // PET assume a row-major tensor layout. transA=false means default + // dims, true means A should be transposed before matmul. This is in + // oppsite to column-major BLAS. + bool transA, transB; + ActType act; + + MatmulArgs(int b, int m, int n, int k, bool transA, bool transB, + ActType act) + : b(b), m(m), n(n), k(k), transA(transA), transB(transB), act(act) { + } + + bool operator<(const OpAttrs &rhsGeneric) { + auto rhs = dynamic_cast(rhsGeneric); + return std::tie(b, m, n, k, transA, transB, act) < + std::tie(rhs.b, rhs.m, rhs.n, rhs.k, rhs.transA, rhs.transB, + rhs.act); + } + }; + + private: + MatmulArgs args; + + public: + MatmulNode(Tensor A, Tensor B, Tensor C, bool transA = false, + bool transB = false, Tensor bias = nullptr, + ActType act = ActType::None); + + std::string toString() const override; + vector computeShape() const override; + + int numInputs() const override { return 2; } + int numOutputs() const override { return 1; } + + Tensor getBias() const { return inputs[2]; } + void setAct(ActType act) { this->args.act = act; } + ActType getAct() const { return args.act; } + bool getTransA() const { return args.transA; } + bool getTransB() const { return args.transB; } + + MatmulArgs getArgs() const { return args; } + OpAttrs getOpAttrs() const override { return args; } + + private: + // Q: whether to check the output? Since we can build an Op first and then + // assure output. + // Fix 1: make shape inference a static method. But OpAttrs are required. + bool checkValid(const TensorVec &inputs) const; +}; + +} // namespace infini \ No newline at end of file diff --git a/src/core/operator.cc b/src/core/operator.cc index 7a9dd38e..b215cb8a 100644 --- a/src/core/operator.cc +++ b/src/core/operator.cc @@ -29,49 +29,4 @@ bool OperatorNode::isMemBoundOp() const { type == OpType::Transpose; } -vector MatmulNode::computeShape() const { - Shape ret{args.b, args.m, args.n}; - return {ret}; -} - -MatmulNode::MatmulNode(Tensor A, Tensor B, Tensor C, bool transA, bool transB, - Tensor bias, ActType act) - : OperatorNode(OpType::Matmul, {A, B, bias}, {C}), - args(A->getDims()[0], transA ? A->getDims()[2] : A->getDims()[1], - transB ? B->getDims()[1] : B->getDims()[2], - transA ? A->getDims()[1] : A->getDims()[2], transA, transB, act) { - IT_ASSERT(checkValid(inputs)); -} - -string MatmulNode::toString() const { - std::ostringstream os; - MatmulArgs args = getArgs(); - os << "Matmul([" << (args.transA ? "A^T" : "A") << "," - << (args.transB ? "B^T" : "B") << ",act=" << (int)args.act - << "],A=" << inputs[0]->getGuid() << ",B=" << inputs[1]->getGuid() - << ",C=" << outputs[0]->getGuid() << ")"; - return os.str(); -} - -bool MatmulNode::checkValid(const TensorVec &inputs) const { - auto A = inputs[0], B = inputs[1]; - // if (A->getType() == Tensor::Weight && B->getType() == Tensor::Weight) - // return false; - IT_ASSERT(A->getDims().size() == 3 && B->getDims().size() == 3); - IT_ASSERT(A->getDims()[0] == B->getDims()[0]); - IT_ASSERT((args.transA ? A->getDims()[1] : A->getDims()[2]) == - (args.transB ? B->getDims()[2] : B->getDims()[1])); - // if (A->getDims().size() != 3 || B->getDims().size() != 3) { - // return false; - // } - // if (A->getDims()[0] != B->getDims()[0]) { - // return false; - // } - // if ((args.transA ? A->getDims()[1] : A->getDims()[2]) != - // (args.transB ? B->getDims()[2] : B->getDims()[1])) { - // return false; - // } - return true; -} - } // namespace infini \ No newline at end of file diff --git a/src/kerels/cpu/matmul.cc b/src/kerels/cpu/matmul.cc index bc850730..45c46eab 100644 --- a/src/kerels/cpu/matmul.cc +++ b/src/kerels/cpu/matmul.cc @@ -1,3 +1,4 @@ +#include "operators/matmul.h" #include "core/kernel.h" namespace infini { diff --git a/src/operators/matmul.cc b/src/operators/matmul.cc new file mode 100644 index 00000000..bdd11e2f --- /dev/null +++ b/src/operators/matmul.cc @@ -0,0 +1,49 @@ +#include "operators/matmul.h" + +namespace infini { + +vector MatmulNode::computeShape() const { + Shape ret{args.b, args.m, args.n}; + return {ret}; +} + +MatmulNode::MatmulNode(Tensor A, Tensor B, Tensor C, bool transA, bool transB, + Tensor bias, ActType act) + : OperatorNode(OpType::Matmul, {A, B, bias}, {C}), + args(A->getDims()[0], transA ? A->getDims()[2] : A->getDims()[1], + transB ? B->getDims()[1] : B->getDims()[2], + transA ? A->getDims()[1] : A->getDims()[2], transA, transB, act) { + IT_ASSERT(checkValid(inputs)); +} + +string MatmulNode::toString() const { + std::ostringstream os; + MatmulArgs args = getArgs(); + os << "Matmul([" << (args.transA ? "A^T" : "A") << "," + << (args.transB ? "B^T" : "B") << ",act=" << (int)args.act + << "],A=" << inputs[0]->getGuid() << ",B=" << inputs[1]->getGuid() + << ",C=" << outputs[0]->getGuid() << ")"; + return os.str(); +} + +bool MatmulNode::checkValid(const TensorVec &inputs) const { + auto A = inputs[0], B = inputs[1]; + // if (A->getType() == Tensor::Weight && B->getType() == Tensor::Weight) + // return false; + IT_ASSERT(A->getDims().size() == 3 && B->getDims().size() == 3); + IT_ASSERT(A->getDims()[0] == B->getDims()[0]); + IT_ASSERT((args.transA ? A->getDims()[1] : A->getDims()[2]) == + (args.transB ? B->getDims()[2] : B->getDims()[1])); + // if (A->getDims().size() != 3 || B->getDims().size() != 3) { + // return false; + // } + // if (A->getDims()[0] != B->getDims()[0]) { + // return false; + // } + // if ((args.transA ? A->getDims()[1] : A->getDims()[2]) != + // (args.transB ? B->getDims()[2] : B->getDims()[1])) { + // return false; + // } + return true; +} +} // namespace infini \ No newline at end of file diff --git a/test/core/test_graph.cc b/test/core/test_graph.cc index 067b83c7..b8a12333 100644 --- a/test/core/test_graph.cc +++ b/test/core/test_graph.cc @@ -1,5 +1,6 @@ #include "core/graph.h" #include "core/run_enigne.h" +#include "operators/matmul.h" #include "test.h" namespace infini {