diff --git a/tmva/sofie/inc/TMVA/ROperator_Comparision.hxx b/tmva/sofie/inc/TMVA/ROperator_Comparision.hxx index de7cb5a3f4e15..6b997b4b7d4d8 100644 --- a/tmva/sofie/inc/TMVA/ROperator_Comparision.hxx +++ b/tmva/sofie/inc/TMVA/ROperator_Comparision.hxx @@ -68,12 +68,12 @@ public: fNX1(UTILITY::Clean_name(nameX1)), fNX2(UTILITY::Clean_name(nameX2)), fNY(UTILITY::Clean_name(nameY)){} // type of output given input - std::vector TypeInference(std::vector input){ + std::vector TypeInference(std::vector input) override { return input; } // shape of output tensors given input tensors - std::vector> ShapeInference(std::vector> input){ + std::vector> ShapeInference(std::vector> input) override { auto ret = input; // return vector size 1 with first input return ret; } @@ -132,7 +132,7 @@ public: model.AddIntermediateTensor(fNY, ETensorType::BOOL , fShapeY); } - std::string Generate(std::string OpName){ + std::string Generate(std::string OpName) override { OpName = "op_" + OpName; if (fShapeY.empty()) { @@ -176,4 +176,4 @@ public: }//TMVA -#endif //TMVA_SOFIE_ROperator_Comparision \ No newline at end of file +#endif //TMVA_SOFIE_ROperator_Comparision diff --git a/tmva/tmva/src/MethodDL.cxx b/tmva/tmva/src/MethodDL.cxx index 2a50e8edd8770..2d651257e408f 100644 --- a/tmva/tmva/src/MethodDL.cxx +++ b/tmva/tmva/src/MethodDL.cxx @@ -467,11 +467,11 @@ void MethodDL::ParseInputLayout() // when we will support 3D convolutions we would need to add extra 1's if (inputShape.size() == 2) { // case of dense layer where only width is specified - inputShape.insert(inputShape.begin() + 1, {1,1}); + inputShape = {inputShape[0], 1, 1, inputShape[1]}; } else if (inputShape.size() == 3) { //e.g. case of RNN T,W -> T,1,W - inputShape.insert(inputShape.begin() + 2, 1); + inputShape = {inputShape[0], inputShape[1], 1, inputShape[2]}; } this->SetInputShape(inputShape);