Skip to content

[tmva][sofie] Fix Conv/Pool padding & ceil_mode bugs, and harden the SOFIE test suite #22862

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
guitargeek merged 6 commits into from
Jul 22, 2026
Merged

[tmva][sofie] Fix Conv/Pool padding & ceil_mode bugs, and harden the SOFIE test suite #22862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
390dae4
[tmva][sofie] Fix AveragePool divisor for partial ceil_mode windows
guitargeek Jul 20, 2026
ab2b616
[tmva][sofie] Ignore ceil_mode pooling windows that start past the input
guitargeek Jul 20, 2026
1462b0b
[tmva][sofie] Fix tests with non-discriminating reference values
guitargeek Jul 20, 2026
806af48
[tmva][sofie] Use the comparison helpers instead of hand-rolled loops
guitargeek Jul 20, 2026
d748350
[tmva][sofie] Share the common code of the PyTorch model generators
guitargeek Jul 20, 2026
99a7113
[tmva][sofie] Support asymmetric padding in Im2col
guitargeek Jul 20, 2026
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
66 changes: 27 additions & 39 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 @@ -458,30 +458,14 @@ public:
// trick for speed is using caffe im2col and output a matrix which contains filtered values as rows.
// By doing this one has consecutive memory reads and writes
// Resulting matrix op_xcol is (input channels * filter_h * filter_w , output_h * output_w)
if (fDim ==1) {
if (fAttrPads[0] != fAttrPads[1] ) {
std::cout << "TMVA SOFIE Operator Conv: asymmetric padding not supported. Assume an average padding "
<< std::endl;
fAttrPads[0] = (fAttrPads[0] + fAttrPads[1]) / 2;
}
fAttrPads[1] = 0;
// fAttrPads holds the begin pads in [0, fDim) and the end pads in [fDim, 2 * fDim),
// which is the layout Im2col expects. They may differ: ONNX allows it through the
// "pads" attribute, and SAME_UPPER / SAME_LOWER produce it whenever the total
// padding along an axis is odd (an even kernel size).
if (fDim == 1) {
// the 1d case is emitted as a 2d one of height 1, for which stride_h is 1
fAttrStrides[1] = 1;
}
if (fDim == 2) {
if (fAttrPads[0] != fAttrPads[2] || fAttrPads[1] != fAttrPads[3]) {
std::cout << "TMVA SOFIE Operator Conv: asymmetric padding not supported. Assume an average padding " << std::endl;
fAttrPads[0] = (fAttrPads[0] + fAttrPads[2]) / 2;
fAttrPads[1] = (fAttrPads[1] + fAttrPads[3]) / 2;
}
}
if (fDim == 3) {
if (fAttrPads[0] != fAttrPads[3] || fAttrPads[1] != fAttrPads[4] || fAttrPads[2] != fAttrPads[5]) {
std::cout << "TMVA SOFIE Operator Conv: asymmetric padding not supported. Assume an average padding " << std::endl;
fAttrPads[0] = (fAttrPads[0] + fAttrPads[3]) / 2;
fAttrPads[1] = (fAttrPads[1] + fAttrPads[4]) / 2;
fAttrPads[2] = (fAttrPads[2] + fAttrPads[5]) / 2;
}
}
out << SP << SP << "size_t out_offset = n * " << outputBatchStride << ";\n";

if (fAttrGroup == 1) {
Expand All @@ -491,28 +475,30 @@ public:
if (fDim < 3) {
out << SP << SP << "TMVA::Experimental::SOFIE::UTILITY::Im2col<float>(tensor_" << fNX
<< " + x_offset,"
// channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h,
// dilation_w,
// channels, height, width, kernel_h, kernel_w, pad_h_begin, pad_h_end, pad_w_begin,
// pad_w_end, stride_h, stride_w, dilation_h, dilation_w,
//
<< fShapeW[1] << "," << iHeight << "," << iWidth << ",";
if (fDim == 1)
out << "1, " << fAttrKernelShape[0] << ",0," << fAttrPads[0] << ",1," << fAttrStrides[0] << ",1,"
<< fAttrDilations[0];
out << "1, " << fAttrKernelShape[0] << ",0,0," << fAttrPads[0] << "," << fAttrPads[1] << ",1,"
<< fAttrStrides[0] << ",1," << fAttrDilations[0];
else // dim ==2
out << fAttrKernelShape[0] << "," << fAttrKernelShape[1] << "," << fAttrPads[0] << "," << fAttrPads[1]
out << fAttrKernelShape[0] << "," << fAttrKernelShape[1] << "," << fAttrPads[0] << ","
<< fAttrPads[2] << "," << fAttrPads[1] << "," << fAttrPads[3]
<< "," << fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrDilations[0] << ","
<< fAttrDilations[1];
out << "," << "tensor_" <<fNX << "_xcol);\n\n ";
} else {
// 3d im2col
out << SP << SP << "TMVA::Experimental::SOFIE::UTILITY::Im2col_3d<float>(tensor_" << fNX
<< " + x_offset,"
// channels, d, h, w, k_d, k_h, k_w, pad_d, pad_h, pad_w, stride_d, stride_h, stride_w,
// dilation_d, dilation_h, dilation_w,
// channels, d, h, w, k_d, k_h, k_w, pad_d_begin, pad_d_end, pad_h_begin, pad_h_end,
// pad_w_begin, pad_w_end, stride_d, stride_h, stride_w, dilation_d, dilation_h, dilation_w,
//
<< fShapeW[1] << "," << iDepth << "," << iHeight << "," << iWidth << ","
<< fAttrKernelShape[0] << "," << fAttrKernelShape[1] << "," << fAttrKernelShape[2] << ","
<< fAttrPads[0] << "," << fAttrPads[1] << "," << fAttrPads[2] << ","
<< fAttrPads[0] << "," << fAttrPads[3] << "," << fAttrPads[1] << "," << fAttrPads[4] << ","
<< fAttrPads[2] << "," << fAttrPads[5] << ","
<< fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrStrides[2] << ","
<< fAttrDilations[0] << "," << fAttrDilations[1] << "," << fAttrDilations[2] << ","
<< "tensor_" << fNX << "_xcol);\n\n ";
Expand Down Expand Up @@ -549,28 +535,30 @@ public:
if (fDim < 3) {
out << SP << SP << "TMVA::Experimental::SOFIE::UTILITY::Im2col<float>(tensor_" << fNX
<< " + x_offset,"
// channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h,
// dilation_w,
// channels, height, width, kernel_h, kernel_w, pad_h_begin, pad_h_end, pad_w_begin,
// pad_w_end, stride_h, stride_w, dilation_h, dilation_w,
//
<< fShapeW[1] << "," << iHeight << "," << iWidth << ",";
if (fDim == 1)
out << "1, " << fAttrKernelShape[0] << ",0," << fAttrPads[0] << ",1," << fAttrStrides[0] << ",1,"
<< fAttrDilations[0];
out << "1, " << fAttrKernelShape[0] << ",0,0," << fAttrPads[0] << "," << fAttrPads[1] << ",1,"
<< fAttrStrides[0] << ",1," << fAttrDilations[0];
else // dim ==2
out << fAttrKernelShape[0] << "," << fAttrKernelShape[1] << "," << fAttrPads[0] << "," << fAttrPads[1]
out << fAttrKernelShape[0] << "," << fAttrKernelShape[1] << "," << fAttrPads[0] << ","
<< fAttrPads[2] << "," << fAttrPads[1] << "," << fAttrPads[3]
<< "," << fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrDilations[0] << ","
<< fAttrDilations[1];
out << ", tensor_" << fNX << "_xcol);\n\n ";
} else {
// 3d im2col
out << SP << SP << "TMVA::Experimental::SOFIE::UTILITY::Im2col_3d<float>(tensor_" << fNX
<< " + x_offset,"
// channels, d, h, w, k_d, k_h, k_w, pad_d, pad_h, pad_w, stride_d, stride_h, stride_w,
// dilation_d, dilation_h, dilation_w,
// channels, d, h, w, k_d, k_h, k_w, pad_d_begin, pad_d_end, pad_h_begin, pad_h_end,
// pad_w_begin, pad_w_end, stride_d, stride_h, stride_w, dilation_d, dilation_h, dilation_w,
//
<< fShapeW[1] << "," << iDepth << "," << iHeight << "," << iWidth << "," << fAttrKernelShape[0] << ","
<< fAttrKernelShape[1] << "," << fAttrKernelShape[2] << "," << fAttrPads[0] << "," << fAttrPads[1]
<< "," << fAttrPads[2] << "," << fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrStrides[2]
<< fAttrKernelShape[1] << "," << fAttrKernelShape[2] << "," << fAttrPads[0] << "," << fAttrPads[3]
<< "," << fAttrPads[1] << "," << fAttrPads[4] << "," << fAttrPads[2] << "," << fAttrPads[5]
<< "," << fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrStrides[2]
<< "," << fAttrDilations[0] << "," << fAttrDilations[1] << "," << fAttrDilations[2] << ",tensor_" << fNX
<< "_xcol);\n\n ";
}
Expand Down
18 changes: 10 additions & 8 deletions tmva/sofie/inc/TMVA/ROperator_ConvTranspose.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,12 +502,13 @@ std::string ROperator_ConvTranspose<T>::Generate(std::string OpName)
throw std::runtime_error("TMVA SOFIE 3D Conv Transpose not yet supported");
out << SP << SP << "TMVA::Experimental::SOFIE::UTILITY::Im2col_3d<float>(tensor_" << fNX
<< " + x_offset,"
// channels, d, h, w, k_d, k_h, k_w, pad_d, pad_h, pad_w, stride_d, stride_h, stride_w,
// dilation_d, dilation_h, dilation_w,
// channels, d, h, w, k_d, k_h, k_w, pad_d_begin, pad_d_end, pad_h_begin, pad_h_end,
// pad_w_begin, pad_w_end, stride_d, stride_h, stride_w, dilation_d, dilation_h, dilation_w,
//
<< fShapeX[1] << "," << oDepth << "," << oHeight << "," << oWidth << "," << fAttrKernelShape[0] << ","
<< fAttrKernelShape[1] << "," << fAttrKernelShape[2] << "," << fAttrPads[0] << "," << fAttrPads[1] << ","
<< fAttrPads[2] << "," << fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrStrides[2] << ","
<< fAttrKernelShape[1] << "," << fAttrKernelShape[2] << "," << fAttrPads[0] << "," << fAttrPads[3] << ","
<< fAttrPads[1] << "," << fAttrPads[4] << "," << fAttrPads[2] << "," << fAttrPads[5] << ","
<< fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrStrides[2] << ","
<< fAttrDilations[0] << "," << fAttrDilations[1] << "," << fAttrDilations[2] << ",tensor_" << fNX
<< "_xcol);\n\n ";
}
Expand Down Expand Up @@ -555,12 +556,13 @@ std::string ROperator_ConvTranspose<T>::Generate(std::string OpName)

out << SP << SP << "TMVA::Experimental::SOFIE::UTILITY::Im2col_3d<float>(tensor_" << fNX
<< " + x_offset,"
// channels, d, h, w, k_d, k_h, k_w, pad_d, pad_h, pad_w, stride_d, stride_h, stride_w,
// dilation_d, dilation_h, dilation_w,
// channels, d, h, w, k_d, k_h, k_w, pad_d_begin, pad_d_end, pad_h_begin, pad_h_end,
// pad_w_begin, pad_w_end, stride_d, stride_h, stride_w, dilation_d, dilation_h, dilation_w,
//
<< fShapeX[1] << "," << oDepth << "," << oHeight << "," << oWidth << "," << fAttrKernelShape[0] << ","
<< fAttrKernelShape[1] << "," << fAttrKernelShape[2] << "," << fAttrPads[0] << "," << fAttrPads[1] << ","
<< fAttrPads[2] << "," << fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrStrides[2] << ","
<< fAttrKernelShape[1] << "," << fAttrKernelShape[2] << "," << fAttrPads[0] << "," << fAttrPads[3] << ","
<< fAttrPads[1] << "," << fAttrPads[4] << "," << fAttrPads[2] << "," << fAttrPads[5] << ","
<< fAttrStrides[0] << "," << fAttrStrides[1] << "," << fAttrStrides[2] << ","
<< fAttrDilations[0] << "," << fAttrDilations[1] << "," << fAttrDilations[2] << "," << "tensor_" << fNX
<< "_xcol);\n\n ";
}
Expand Down
Loading
Loading