Skip to content

[6.40] [tmva][sofie] fix double-counted dilation in Conv im2col and adding regression test #22482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpiparo merged 1 commit into from
Jun 10, 2026
Merged

[6.40] [tmva][sofie] fix double-counted dilation in Conv im2col and adding regression test #22482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tmva/sofie/inc/TMVA/ROperator_Conv.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,10 @@ public:
out << SP << SP << "}\n";
out << SP << "}\n";

// Dilation is already folded into the expanded kernel shape and the dilated tensor_<X>_f
// layout above, so the dense im2col below must use dilation 1 to avoid double-counting it.
fAttrDilations = std::vector<size_t>(3, 1);

//out << SP << "char " << OpName << "_transA = 'T';\n";
out << SP << "char " << OpName << "_transA = 'N';\n";
out << SP << "char " << OpName << "_transB = 'N';\n";
Expand Down
22 changes: 22 additions & 0 deletions tmva/sofie/test/TestCustomModelsFromONNX.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ constexpr auto modelDataSuffix = "_FromONNX.dat";
#include "input_models/references/Erf.ref.hxx"
#include "input_models/references/LinearWithSigmoid.ref.hxx"
#include "input_models/references/ConvWithPadding.ref.hxx"
#include "input_models/references/ConvWithDilation.ref.hxx"
#include "input_models/references/ConvWithoutPadding.ref.hxx"
#include "input_models/references/ConvWithAutopadSameLower.ref.hxx"
#include "input_models/references/ConvWithAutopadSameUpper.ref.hxx"
Expand Down Expand Up @@ -726,6 +727,27 @@ TEST(ONNX, ConvWithStridesPadding)
}


TEST(ONNX, ConvWithDilation)
{
constexpr float TOLERANCE = DEFAULT_TOLERANCE;

// Preparing the standard all-ones input
std::vector<float> input(49);
std::iota(input.begin(), input.end(), 0.0f);
ASSERT_INCLUDE_AND_RUN(std::vector<float>, "ConvWithDilation", input);

// Checking output size
EXPECT_EQ(output.size(), std::size(ConvWithDilation_ExpectedOutput::all_ones));

float *correct = ConvWithDilation_ExpectedOutput::all_ones;

// Checking every output value, one by one
for (size_t i = 0; i < output.size(); ++i) {
EXPECT_LE(std::abs(output[i] - correct[i]), TOLERANCE);
}
}


TEST(ONNX, ConvWithStridesNoPadding)
{
constexpr float TOLERANCE = DEFAULT_TOLERANCE;
Expand Down
Binary file added tmva/sofie/test/input_models/ConvWithDilation.onnx
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions tmva/sofie/test/input_models/references/ConvWithDilation.ref.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
namespace ConvWithDilation_ExpectedOutput {
float all_ones[] = {98.400002f, 102.900009f, 107.400002f, 129.899994f, 134.399994f, 138.899994f, 161.399994f, 165.899994f, 170.399994f};
} // namespace ConvWithDilation_ExpectedOutput
Loading