Add 4 Binary Operators

Author: Neel-Shah-29

tmva/sofie/inc/TMVA/RModel_BasicBinaryOp.hxx

@@ -12,11 +12,6 @@ namespace Experimental{
 namespace SOFIE{
 
 enum EBasicBinaryOperator { Add, Sub, Mul, Div };
-template <typename T, EBasicBinaryOperator Op>
-struct BinaryOperatorTrait {
-    const char * Name() { return"";}
-    const char * Op() { return "";}
-};
 
 class RModel_BasicBinaryOp final : public ROperator{
 private:
@@ -25,6 +20,11 @@ private:
    std::string fNX2;
    std::string fNY;
    std::vector<size_t> fShape;
+   template <typename T, EBasicBinaryOperator Op1>
+   struct BinaryOperatorTrait {
+      const char * Name() { return "";}
+      const char * Op() { return "";}
+   };
    template <typename T>
    struct BinaryOperatorTrait<T,Add> {
       const char * Name() { return "Add";}
@@ -48,8 +48,9 @@ private:
       const char * Name() { return "Div";}
       const char * Op() { return "/";}
    };
-   template <typename T, EBasicBinaryOperator Op>
-   BinaryOperatorTrait<T,Op> *s;
+   
+   template <typename T, EBasicBinaryOperator Op1>
+   BinaryOperatorTrait<T,Op1> *s;
 
 public:
    RModel_BasicBinaryOp(){}
@@ -71,16 +72,16 @@ public:
    void Initialize(RModel& model){
       // input must be a graph input, or already initialized intermediate tensor
       if (model.CheckIfTensorAlreadyExist(fNX1) == false){
-         throw std::runtime_error(std::string("TMVA SOFIE Add Op Input Tensor ") + fNX1 + "is not found in model");
+         throw std::runtime_error(std::string("TMVA SOFIE Binary Op Input Tensor ") + fNX1 + "is not found in model");
       }
       if (model.CheckIfTensorAlreadyExist(fNX2) == false) {
-         throw std::runtime_error(std::string("TMVA SOFIE Add Op Input Tensor ") + fNX2 + "is not found in model");
+         throw std::runtime_error(std::string("TMVA SOFIE Binary Op Input Tensor ") + fNX2 + "is not found in model");
       }
       auto shapeX1 = model.GetTensorShape(fNX1);
       auto shapeX2 = model.GetTensorShape(fNX2);
       // assume same shape X1 and X2 
       if (shapeX1 != shapeX2) {
-         std::string msg = "TMVA SOFIE Add Op: Support only inputs with same shape, shape 1 is " +
+         std::string msg = "TMVA SOFIE Binary Op: Support only inputs with same shape, shape 1 is " +
                            ConvertShapeToString(shapeX1) + "shape 2 is " + ConvertShapeToString(shapeX2);
          throw std::runtime_error(msg);
       }