[tmva][sofie] ROperator_Comparision on-the-fly broadcasting #19739
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,7 +77,7 @@ public: | |
| ROperator_Comparision(const std::string & nameX1, const std::string & nameX2, const std::string & nameY): | ||
| fNX1(UTILITY::Clean_name(nameX1)), fNX2(UTILITY::Clean_name(nameX2)), fNY(UTILITY::Clean_name(nameY)){ | ||
| fInputTensorNames = { fNX1, fNX2 }; | ||
| // output will be a boolean vector so should not be considered for memory optimized pool | ||
| fOutputTensorNames = { fNY }; | ||
| } | ||
|
|
@@ -113,6 +113,8 @@ public: | |
| fShapeX2 = model.GetTensorShape(fNX2); | ||
| fDimShapeX2 = ConvertShapeToDim(fShapeX2); | ||
| } | ||
| fShapeX1 = model.GetTensorShape(fNX1); | ||
| fShapeX2 = model.GetTensorShape(fNX2); | ||
|
There was a problem hiding this comment. This is a duplication of the 107 and 113 lines above |
||
| fTensorType1 = model.GetTensorType(fNX1); | ||
| fTensorType2 = model.GetTensorType(fNX2); | ||
| bool broadcast = !UTILITY::AreSameShape(fShapeX1, fShapeX2); | ||
|
|
@@ -131,10 +133,6 @@ public: | |
| // Update the data and the shape of A | ||
| model.UpdateInitializedTensor(fNX1, model.GetTensorType(fNX1), fShapeY, broadcastedData); | ||
| fShapeX1 = fShapeY; | ||
| } | ||
| } | ||
| // Broadcast B to Y | ||
|
|
@@ -147,105 +145,28 @@ public: | |
| // Update the data and the shape of B | ||
| model.UpdateInitializedTensor(fNX2, model.GetTensorType(fNX2), fShapeY, broadcastedData); | ||
| fShapeX2 = fShapeY; | ||
| } | ||
| } | ||
| } else { | ||
| fShapeY = fShapeX1; | ||
| } | ||
| // case of constant tensors | ||
|
|
||
| if (model.IsInitializedTensor(fNX1) && model.IsInitializedTensor(fNX2) ) { | ||
| fIsOutputConstant = true; | ||
| auto data1 = static_cast<T *>(model.GetInitializedTensorData(fNX1).get()); | ||
| auto data2 = static_cast<T *>(model.GetInitializedTensorData(fNX2).get()); | ||
| size_t length = ConvertShapeToLength(fShapeY); | ||
| bool * outData = new bool[length]; | ||
| for (size_t i = 0; i < length; i++) | ||
| outData[i] = ComparisionTrait<T,Op>::Result(data1[i], data2[i]); | ||
| model.AddConstantTensor(fNY, fShapeY, outData); | ||
| if (model.Verbose()) | ||
| std::cout << ComparisionTrait<T,Op>::Name() << " op ---> " << fNY << " " << ConvertShapeToString(fShapeY) << " : " | ||
| << ConvertValuesToString(length,outData) << std::endl; | ||
|
There was a problem hiding this comment. Also this code should be kept and not deleted! |
||
| delete [] outData; | ||
| } else { | ||
| model.AddIntermediateTensor(fNY, ETensorType::BOOL , fShapeY); | ||
| } | ||
|
|
||
| // check if this is not output operators to add a specific line for definining the tensor_xxx variable | ||
| const auto & outputTensorNames = model.GetOutputTensorNames(); | ||
| fIsModelOutput = false; | ||
|
|
@@ -257,39 +178,51 @@ public: | |
| if (fIsOutputConstant) return ""; | ||
| opName = "op_" + opName; | ||
|
|
||
| if (fShapeY.empty()) { | ||
| throw std::runtime_error("TMVA SOFIE Comparision Op called to Generate without being initialized first"); | ||
| } | ||
| std::stringstream out; | ||
| out << SP << "\n//------ " << ComparisionTrait<T,Op>::Name() << " " << opName | ||
| << " --> " << ConvertShapeToString(fShapeY) << "\n"; | ||
|
|
||
| auto stridesX1 = UTILITY::ComputeStrideFromShape(fShapeX1); | ||
|
There was a problem hiding this comment. Here we should use fDimShapeX1 and fDimShapeX2 instead of fShapeX1 and fShapeX2 |
||
| auto stridesX2 = UTILITY::ComputeStrideFromShape(fShapeX2); | ||
| auto stridesY = UTILITY::ComputeStrideFromShape(fShapeY); | ||
|
|
||
| std::string compute_idx_X1, compute_idx_X2, compute_idx_Y; | ||
| if (std::all_of(fShapeX1.begin(), fShapeX1.end(), [](size_t x) { return x == 1; })){ | ||
|
There was a problem hiding this comment. This needs to be changed for the case of fDimShapeX1, see |
||
| compute_idx_X1 = "0"; | ||
| } else { | ||
| for(size_t i = 0; i<fShapeX1.size(); ++i){ | ||
| if(fShapeX1[i]==1) continue; | ||
| compute_idx_X1 += " idx_"+fNY+std::to_string(i+(fShapeY.size()-fShapeX1.size()))+" * "+std::to_string(stridesX1[i])+" +"; | ||
|
There was a problem hiding this comment. No need to add "fNY" to the definition of the index variables. It will pollute the name, better to keep it simple There was a problem hiding this comment. Also it would be nice to distinguish the case when the strides are equal to 1. In this case it is not needed to add a multiplication with 1 : " * 1". See examples at line 332 in https://github.com/root-project/root/pull/19742/files |
||
| } | ||
| compute_idx_X1.pop_back(); | ||
| } | ||
| if (std::all_of(fShapeX2.begin(), fShapeX2.end(), [](size_t x) { return x == 1; })){ | ||
| compute_idx_X2 = "0"; | ||
| } else { | ||
| for(size_t i = 0; i<fShapeX2.size(); ++i){ | ||
| if(fShapeX2[i]==1) continue; | ||
| compute_idx_X2 += " idx_"+fNY+std::to_string(i+(fShapeY.size()-fShapeX2.size()))+" * "+std::to_string(stridesX2[i])+" +"; | ||
| } | ||
| compute_idx_X2.pop_back(); | ||
| } | ||
|
|
||
| for(size_t i=0; i<fShapeY.size(); ++i){ | ||
| if(fShapeY[i]!=1){ | ||
| out<<std::string(i + 1, ' ')<<"for(size_t idx_"<<fNY<<i<<"=0; idx_"<<fNY<<i<<"<"<<fShapeY[i]<<"; ++idx_"<<fNY<<i<<"){\n"; | ||
|
There was a problem hiding this comment. For fixing the indentention space of the generated code see again: |
||
| compute_idx_Y += "idx_"+fNY+std::to_string(i)+"*"+std::to_string(stridesY[i])+"+"; | ||
| } | ||
| } | ||
| compute_idx_Y.pop_back(); | ||
| out << SP << SP << "tensor_" << fNY <<"["<<compute_idx_Y<<"] = "<<ComparisionTrait<T,Op>::Op("tensor_"+ fNX1 + "["+compute_idx_X1+"]", "tensor_"+ fNX2 + "["+compute_idx_X2+"]")<<" ;\n"; | ||
| for(size_t i=0; i<fShapeY.size(); ++i){ | ||
| if(fShapeY[i]!=1){ | ||
| out<<std::string(fShapeY.size()-i+1, ' ')<<"}\n"; | ||
| } | ||
| } | ||
|
|
||
| // since output is a boolean need to add the tensor_xxx variable since it is not defined as a pointer to a boolean std::vector | ||
| if (!fIsModelOutput) | ||
| out << SP << "const std::vector<std::uint8_t> & tensor_" << fNY << " = fTensor_" << fNY << ";\n"; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| comparison_broadcast_demo:ä | ||
| A | ||
| B | ||
| OutGreater"Greater | ||
| A | ||
| BOutEqual"Equal | ||
| A | ||
| BOutLess"LessComparisonOpsWithBroadcastZ | ||
| A | ||
| Z | ||
| B | ||
|
|
||
| b | ||
|
|
||
| OutGreater | ||
| b | ||
| OutEqual | ||
| b | ||
| OutLess | ||
| B |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| comparison_broadcast_demo:ô | ||
| A | ||
| B | ||
| OutGreater"Greater | ||
| A | ||
| BOutEqual"Equal | ||
| A | ||
| BOutLess"LessComparisonOpsBroadcastZ | ||
| A | ||
| Z | ||
| B | ||
| b | ||
|
|
||
| OutGreater | ||
| b | ||
| OutEqual | ||
| b | ||
| OutLess | ||
| B |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lmoneta do we need the
std::vector<Dim> fDimShapeX1; std::vector<Dim> fDimShapeX2;here? They seem to be only used in twoifcases