Neel task4 (#15)

* Fusing MatMul and Add operater into Gemm operater

* Update RModelParser_ONNX.cxx

* Update RModelParser_ONNX.cxx

* Update RModelParser_ONNX.hxx

* Update RModelParser_ONNX.cxx

* Update RModelParser_ONNX.cxx

* Update RModelParser_ONNX.cxx

Co-authored-by: Neel Shah <neelshah29042002.com>
Co-authored-by: Neel-Shah-29 <[email protected]>

Author: lmoneta

tmva/sofie_parsers/inc/TMVA/RModelParser_ONNX.hxx

@@ -35,6 +35,7 @@ std::unique_ptr<ROperator> make_ROperator_LSTM(const onnx::NodeProto& nodeproto,
 std::unique_ptr<ROperator> make_ROperator_BatchNormalization(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
 std::unique_ptr<ROperator> make_ROperator_Pool(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
 std::unique_ptr<ROperator> make_ROperator_Add(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
+std::unique_ptr<ROperator> make_ROperator_GemmFromMatMulandAdd(const onnx::NodeProto& nodeproto1,const onnx::NodeProto& nodeproto2, const onnx::GraphProto& graphproto , std::unordered_map<std::string, ETensorType>& tensor_type);
 std::unique_ptr<ROperator> make_ROperator_Reshape(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
 std::unique_ptr<ROperator> make_ROperator_Slice(const onnx::NodeProto &nodeproto, const onnx::GraphProto &graphproto, std::unordered_map<std::string, ETensorType> &tensor_type);
 std::unique_ptr<ROperator> make_ROperator_GRU(const onnx::NodeProto& nodeproto, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
@@ -64,6 +65,10 @@ const factoryMethodMap mapOptypeOperator = {
    {"Flatten", &make_ROperator_Reshape}
 };
 
+using factoryMethodMap1 = std::unordered_map<std::string, std::unique_ptr<ROperator> (*)(const onnx::NodeProto&,const onnx::NodeProto&, const onnx::GraphProto&, std::unordered_map<std::string, ETensorType>&)>;
+const factoryMethodMap1 mapOptypeOperator1 = {
+    {"MatMul", &make_ROperator_GemmFromMatMulandAdd}
+};
 std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type);
 }//INTERNAL
 

tmva/sofie_parsers/src/RModelParser_ONNX.cxx

@@ -14,6 +14,13 @@ namespace INTERNAL{
 std::unique_ptr<ROperator> make_ROperator(size_t idx, const onnx::GraphProto& graphproto, std::unordered_map<std::string, ETensorType>& tensor_type){
    const auto& nodeproto = graphproto.node(idx);
    auto find = mapOptypeOperator.find(nodeproto.op_type());
+   // operator_type = nodeproto.op_type();
+   if(nodeproto.op_type()=="MatMul"){
+      if(graphproto.node(idx+1).op_type()=="Add"){
+         return make_ROperator_GemmFromMatMulandAdd(graphproto.node(idx),graphproto.node(idx+1),graphproto,tensor_type);
+      }
+   }
+
    if (find == mapOptypeOperator.end()){
       throw std::runtime_error("TMVA::SOFIE - Operator type " + nodeproto.op_type() + " is not yet supported");
       // std::unique_ptr<ROperator> op;
@@ -195,6 +202,65 @@ std::unique_ptr<ROperator> make_ROperator_Sigmoid(const onnx::NodeProto& nodepro
    return op;
 }
 
+
+std::unique_ptr<ROperator> make_ROperator_GemmFromMatMulandAdd(const onnx::NodeProto& nodeproto1,const onnx::NodeProto& nodeproto2, const onnx::GraphProto& /*graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
+
+   ETensorType input_type = ETensorType::UNDEFINED;
+
+   for (int i = 0; i < 2; ++i) {
+      auto input_name = nodeproto1.input(i);
+      auto it = tensor_type.find(input_name);
+      if (it != tensor_type.end()){
+         // according to ONNX both inputs have same time
+         if (i == 0) input_type = it->second;
+         else
+            assert(it->second == input_type);
+      } else {
+         throw std::runtime_error("TMVA::SOFIE ONNX Parser MatMul op has input tensor" + input_name + " but its type is not yet registered");
+      }
+   }
+
+   for (int i = 0; i < 2; ++i) {
+      auto input_name = nodeproto2.input(i);
+      auto it = tensor_type.find(input_name);
+      if (it != tensor_type.end()){
+         // according to ONNX both inputs have same time
+         if (i == 0) input_type = it->second;
+         else
+            assert(it->second == input_type);
+      } else {
+         throw std::runtime_error("TMVA::SOFIE ONNX Parser Add op has input tensor" + input_name + " but its type is not yet registered");
+      }
+   }
+   std::unique_ptr<ROperator> op;
+   
+
+   float attr_alpha =1.0;
+   float attr_beta =1.0;
+   int_t attr_transA =0;
+   int_t attr_transB =0;
+
+   switch(input_type){
+   case ETensorType::FLOAT:
+      if (nodeproto1.input_size() == 2){
+         op.reset(new ROperator_Gemm<float>(attr_alpha, attr_beta, attr_transA, attr_transB, nodeproto1.input(0), nodeproto1.input(1), nodeproto2.output(0)));
+      }else{
+         op.reset(new ROperator_Gemm<float>(attr_alpha, attr_beta, attr_transA, attr_transB, nodeproto1.input(0), nodeproto1.input(1), nodeproto2.input(1), nodeproto2.output(0)));
+      }
+      break;
+   default:
+      throw std::runtime_error("TMVA::SOFIE - Unsupported - Operator for fusing MatMul and Add to Gemm does not yet support input type " + std::to_string(static_cast<int>(input_type)));
+   }
+
+   ETensorType output_type = (op->TypeInference({input_type}))[0];
+   auto it2 = tensor_type.find(nodeproto2.output(0));
+   if (it2 == tensor_type.end()){
+      tensor_type[nodeproto2.output(0)] = output_type;
+   }
+
+   return op;
+}
+
 std::unique_ptr<ROperator> make_ROperator_Gemm(const onnx::NodeProto& nodeproto, const onnx::GraphProto& /* graphproto */, std::unordered_map<std::string, ETensorType>& tensor_type){
 
    ETensorType input_type;
@@ -1017,6 +1083,8 @@ RModel RModelParser_ONNX::Parse(std::string filename){
          rmodel.AddBlasRoutines({"Copy", "Axpy"});
       } else if (op_type == "GRU") {
          rmodel.AddBlasRoutines({"Gemm", "Axpy"});
+      } else if (op_type == "Add" && graph.node(i-1).op_type() == "MatMul" ) {
+         rmodel.AddBlasRoutines({"Gemm", "Gemv"});
       }
    }