Skip to content

fix im2col.h [fluid_ops] #77137

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
luotao1 merged 3 commits into from
Jan 6, 2026
Merged

fix im2col.h [fluid_ops] #77137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c23d2d
fix im2col.h
co63oc Dec 29, 2025
21806f2
fix im2col.h
co63oc Dec 29, 2025
601f432
Merge branch 'develop' into n89
co63oc Jan 5, 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
40 changes: 20 additions & 20 deletions paddle/phi/kernels/funcs/im2col.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace phi::funcs {
* [input_channels, filter_height, filter_width, output_height, output_width]
*/
template <class T, typename DeviceContext>
class Im2ColFunctor<funcs::ColFormat::kCFO, DeviceContext, T> {
class Im2ColFunctor<funcs::ColFormat::CFO, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx UNUSED,
const DenseTensor& im,
Expand Down Expand Up @@ -72,7 +72,7 @@ class Im2ColFunctor<funcs::ColFormat::kCFO, DeviceContext, T> {
* [input_channels, filter_height, filter_width, output_height, output_width]
*/
template <class T, typename DeviceContext>
class Col2ImFunctor<funcs::ColFormat::kCFO, DeviceContext, T> {
class Col2ImFunctor<funcs::ColFormat::CFO, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx UNUSED,
const DenseTensor& col,
Expand Down Expand Up @@ -154,29 +154,29 @@ class Col2ImFunctor<funcs::ColFormat::kCFO, DeviceContext, T> {
};

template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::CPUContext, float>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::CPUContext, float>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::CPUContext, double>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::CPUContext, double>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::CPUContext, phi::complex64>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::CPUContext, phi::complex64>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::CPUContext, phi::complex128>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::CPUContext, phi::complex128>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::CPUContext, float>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::CPUContext, float>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::CPUContext, double>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::CPUContext, double>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::CPUContext, phi::complex64>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::CPUContext, phi::complex64>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::CPUContext, phi::complex128>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::CPUContext, phi::complex128>;

/*
* im = [input_channels, input_height, input_width]
* col =
* [output_height, output_width, input_channels, filter_height, filter_width]
*/
template <class T, typename DeviceContext>
class Im2ColFunctor<funcs::ColFormat::kOCF, DeviceContext, T> {
class Im2ColFunctor<funcs::ColFormat::OCF, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx UNUSED,
const DenseTensor& im,
Expand Down Expand Up @@ -249,7 +249,7 @@ class Im2ColFunctor<funcs::ColFormat::kOCF, DeviceContext, T> {
* [output_height, output_width, input_channels, filter_height, filter_width]
*/
template <class T, typename DeviceContext>
class Col2ImFunctor<funcs::ColFormat::kOCF, DeviceContext, T> {
class Col2ImFunctor<funcs::ColFormat::OCF, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx UNUSED,
const DenseTensor& col,
Expand Down Expand Up @@ -329,19 +329,19 @@ class Col2ImFunctor<funcs::ColFormat::kOCF, DeviceContext, T> {
};

template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::CPUContext, float>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::CPUContext, float>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::CPUContext, double>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::CPUContext, double>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::CPUContext, phi::complex64>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::CPUContext, phi::complex64>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::CPUContext, phi::complex128>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::CPUContext, phi::complex128>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::CPUContext, float>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::CPUContext, float>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::CPUContext, double>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::CPUContext, double>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::CPUContext, phi::complex64>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::CPUContext, phi::complex64>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::CPUContext, phi::complex128>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::CPUContext, phi::complex128>;
} // namespace phi::funcs
56 changes: 28 additions & 28 deletions paddle/phi/kernels/funcs/im2col.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ __global__ void im2col(const T* data_im,
* [input_channels, filter_height, filter_width, output_height, output_width]
*/
template <class DeviceContext, class T>
class Im2ColFunctor<funcs::ColFormat::kCFO, DeviceContext, T> {
class Im2ColFunctor<funcs::ColFormat::CFO, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx,
const DenseTensor& im,
Expand Down Expand Up @@ -233,7 +233,7 @@ __global__ void col2im(int64_t n,
* [input_channels, filter_height, filter_width, output_height, output_width]
*/
template <class DeviceContext, class T>
class Col2ImFunctor<funcs::ColFormat::kCFO, DeviceContext, T> {
class Col2ImFunctor<funcs::ColFormat::CFO, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx,
const DenseTensor& col,
Expand Down Expand Up @@ -324,29 +324,29 @@ class Col2ImFunctor<funcs::ColFormat::kCFO, DeviceContext, T> {
};

template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::GPUContext, float>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::GPUContext, float>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::GPUContext, double>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::GPUContext, double>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::complex64>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::complex64>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::complex128>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::complex128>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::float16>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::float16>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::bfloat16>;
Im2ColFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::bfloat16>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::GPUContext, float>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::GPUContext, float>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::GPUContext, double>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::GPUContext, double>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::complex64>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::complex64>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::complex128>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::complex128>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::float16>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::float16>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kCFO, phi::GPUContext, phi::bfloat16>;
Col2ImFunctor<funcs::ColFormat::CFO, phi::GPUContext, phi::bfloat16>;

template <class T>
__global__ void im2colOCF(const T* im_data,
Expand Down Expand Up @@ -394,7 +394,7 @@ __global__ void im2colOCF(const T* im_data,
* [output_height, output_width, input_channels, filter_height, filter_width]
*/
template <class DeviceContext, class T>
class Im2ColFunctor<funcs::ColFormat::kOCF, DeviceContext, T> {
class Im2ColFunctor<funcs::ColFormat::OCF, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx,
const DenseTensor& im,
Expand Down Expand Up @@ -506,7 +506,7 @@ __global__ void col2imOCF(const T* col_data,
* [output_height, output_width, input_channels, filter_height, filter_width]
*/
template <class DeviceContext, class T>
class Col2ImFunctor<funcs::ColFormat::kOCF, DeviceContext, T> {
class Col2ImFunctor<funcs::ColFormat::OCF, DeviceContext, T> {
public:
void operator()(const DeviceContext& dev_ctx,
const DenseTensor& col,
Expand Down Expand Up @@ -591,29 +591,29 @@ class Col2ImFunctor<funcs::ColFormat::kOCF, DeviceContext, T> {
};

template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::GPUContext, float>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::GPUContext, float>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::GPUContext, double>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::GPUContext, double>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::complex64>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::complex64>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::complex128>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::complex128>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::float16>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::float16>;
template class PADDLE_API
Im2ColFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::bfloat16>;
Im2ColFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::bfloat16>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::GPUContext, float>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::GPUContext, float>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::GPUContext, double>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::GPUContext, double>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::complex64>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::complex64>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::complex128>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::complex128>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::float16>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::float16>;
template class PADDLE_API
Col2ImFunctor<funcs::ColFormat::kOCF, phi::GPUContext, phi::bfloat16>;
Col2ImFunctor<funcs::ColFormat::OCF, phi::GPUContext, phi::bfloat16>;

} // namespace funcs
} // namespace phi
6 changes: 3 additions & 3 deletions paddle/phi/kernels/funcs/im2col.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace phi {
namespace funcs {

/* The storage format of the coldata in the Im2ColFunctor and Col2ImFunctor. */
enum class ColFormat { kCFO = 0, kOCF = 1 };
enum class ColFormat { CFO = 0, OCF = 1 };

/*
* \brief Converts the image data of three dimensions(CHW) into a colData of
Expand All @@ -47,7 +47,7 @@ enum class ColFormat { kCFO = 0, kOCF = 1 };
* \param paddings padding data.
* \param 4-dimension [up_pad, left_pad, down_pad, right_pad].
*
* If the template argument Format is kCFO, the shape of colData is:
* If the template argument Format is CFO, the shape of colData is:
* [input_channels, filter_height, filter_width, output_height, output_width]
* So, it is easy to reshape into a convolution matrix for convolution
* calculation based on matrix multiplication.
Expand All @@ -63,7 +63,7 @@ enum class ColFormat { kCFO = 0, kOCF = 1 };
* output_height,
* output_width]
*
* If the template argument Format is kOCF, the shape of colData is:
* If the template argument Format is OCF, the shape of colData is:
* [output_height, output_width, input_channels, filter_height, filter_width]
* So, it is easy to reshape into a sequence matrix for rnn calculation.
* The shape of sequence matrix is [seq_length, step_size], where the seq_length
Expand Down
4 changes: 2 additions & 2 deletions paddle/phi/kernels/funcs/math/context_project.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class ContextProjectFunctor {
DenseTensor* col) {
auto lod_level_0 = in.lod()[0];

funcs::Im2ColFunctor<funcs::ColFormat::kOCF, DeviceContext, float>
funcs::Im2ColFunctor<funcs::ColFormat::OCF, DeviceContext, float>
im2col_ocf;

std::vector<int> dilation({1, 1});
Expand Down Expand Up @@ -223,7 +223,7 @@ class ContextProjectGradFunctor {
DenseTensor* col) {
auto lod_level_0 = in.lod()[0];

funcs::Col2ImFunctor<funcs::ColFormat::kOCF, DeviceContext, float>
funcs::Col2ImFunctor<funcs::ColFormat::OCF, DeviceContext, float>
col2im_ocf;

std::vector<int> dilation({1, 1});
Expand Down
10 changes: 5 additions & 5 deletions paddle/phi/kernels/impl/conv_grad_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void ConvGradKernel(const Context& dev_ctx,
if (is_expand) {
set_zero(dev_ctx, &transformed_input_grad, static_cast<T>(0));
}
funcs::Col2ImFunctor<funcs::ColFormat::kCFO, Context, T> col2im;
funcs::Col2ImFunctor<funcs::ColFormat::CFO, Context, T> col2im;
funcs::Col2VolFunctor<Context, T> col2vol;

for (int64_t i = 0; i < batch_size; i++) {
Expand Down Expand Up @@ -214,7 +214,7 @@ void ConvGradKernel(const Context& dev_ctx,
Tensor filter_grad_ = *filter_grad;
filter_grad_.Resize(filter_matrix_shape);
set_zero(dev_ctx, filter_grad, static_cast<T>(0));
funcs::Im2ColFunctor<funcs::ColFormat::kCFO, Context, T> im2col;
funcs::Im2ColFunctor<funcs::ColFormat::CFO, Context, T> im2col;
funcs::Vol2ColFunctor<Context, T> vol2col;
for (int i = 0; i < batch_size; i++) {
DenseTensor out_grad_batch =
Expand Down Expand Up @@ -391,7 +391,7 @@ void ConvGradGradKernel(const Context& dev_ctx,
if (is_expand) {
set_zero(dev_ctx, &transformed_dX, static_cast<T>(0));
}
funcs::Col2ImFunctor<funcs::ColFormat::kCFO, Context, T> col2im;
funcs::Col2ImFunctor<funcs::ColFormat::CFO, Context, T> col2im;
funcs::Col2VolFunctor<Context, T> col2vol;

for (int64_t i = 0; i < batch_size; i++) {
Expand Down Expand Up @@ -436,7 +436,7 @@ void ConvGradGradKernel(const Context& dev_ctx,
set_zero(dev_ctx, dW, static_cast<T>(0));
DenseTensor dW_arr = *dW;
dW_arr.Resize(filter_matrix_shape);
funcs::Im2ColFunctor<funcs::ColFormat::kCFO, Context, T> im2col;
funcs::Im2ColFunctor<funcs::ColFormat::CFO, Context, T> im2col;
funcs::Vol2ColFunctor<Context, T> vol2col;
for (int i = 0; i < batch_size; ++i) {
DenseTensor dy_batch =
Expand Down Expand Up @@ -483,7 +483,7 @@ void ConvGradGradKernel(const Context& dev_ctx,
}

set_zero(dev_ctx, &transformed_ddY, static_cast<T>(0));
funcs::Im2ColFunctor<funcs::ColFormat::kCFO, Context, T> im2col;
funcs::Im2ColFunctor<funcs::ColFormat::CFO, Context, T> im2col;
funcs::Vol2ColFunctor<Context, T> vol2col;
for (int i = 0; i < batch_size; ++i) {
DenseTensor ddy_batch =
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/impl/conv_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void ConvKernelImpl(const Context& dev_ctx,
int64_t in_step = transformed_input.dims()[1] / groups;
int64_t out_step = transformed_output.dims()[1] / groups;

funcs::Im2ColFunctor<funcs::ColFormat::kCFO, Context, T> im2col;
funcs::Im2ColFunctor<funcs::ColFormat::CFO, Context, T> im2col;
funcs::Vol2ColFunctor<Context, T> vol2col;

auto blas = funcs::GetBlas<Context, T>(dev_ctx);
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/impl/conv_transpose_grad_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void ConvTransposeGradRawKernel(const Context& dev_ctx,
DenseTensor dfilter_;
funcs::SetConstant<Context, T> set_zero;

funcs::Im2ColFunctor<funcs::ColFormat::kCFO, Context, T> im2col;
funcs::Im2ColFunctor<funcs::ColFormat::CFO, Context, T> im2col;
funcs::Vol2ColFunctor<Context, T> vol2col;
funcs::ConcatFunctor<Context, T> concat_functor;

Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/impl/conv_transpose_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void ConvTransposeRawKernel(const Context& dev_ctx,
(data_layout != DataLayout::NHWC
? static_cast<int>(out_dims[1]) / groups
: static_cast<int>(out_dims[out_dims.size() - 1]) / groups);
funcs::Col2ImFunctor<funcs::ColFormat::kCFO, Context, T> col2im;
funcs::Col2ImFunctor<funcs::ColFormat::CFO, Context, T> col2im;
funcs::Col2VolFunctor<Context, T> col2vol;
funcs::ConcatFunctor<Context, T> concat_functor;

Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/impl/fold_grad_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void FoldGradKernel(const Context& dev_ctx,
DDim input_matrix_shape = common::make_ddim(
{1, kernel_sizes[0], kernel_sizes[1], output_height, output_width});

funcs::Im2ColFunctor<funcs::ColFormat::kCFO, Context, T> im2col;
funcs::Im2ColFunctor<funcs::ColFormat::CFO, Context, T> im2col;

for (int64_t i = 0; i < batch_size; i++) {
DenseTensor out_grad_batch = out_grad.Slice(i, i + 1).Resize(out_shape);
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/impl/fold_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void FoldKernel(const Context& dev_ctx,
const int64_t batch_size = x.dims()[0];
dev_ctx.template Alloc<T>(out);

funcs::Col2ImFunctor<funcs::ColFormat::kCFO, Context, T> col2im;
funcs::Col2ImFunctor<funcs::ColFormat::CFO, Context, T> col2im;
const auto& x_dims = x.dims();

int output_height = (output_sizes[0] + 2 * paddings[0] -
Expand Down
6 changes: 3 additions & 3 deletions paddle/phi/kernels/impl/im2sequence_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void Im2SequenceKernel(const Context& dev_ctx,
kernels[1]});
offset_out += output_height[i] * output_width[i];

funcs::Im2ColFunctor<funcs::ColFormat::kOCF, Context, T> f;
funcs::Im2ColFunctor<funcs::ColFormat::OCF, Context, T> f;
f(dev_ctx, src, dilations, strides, paddings, &dst);
}
phi::LegacyLoD lod(1);
Expand Down Expand Up @@ -127,7 +127,7 @@ void Im2SequenceKernel(const Context& dev_ctx,
DenseTensor dst = out->Slice(i, i + 1).Resize(
{output_height, output_width, img_channels, kernels[0], kernels[1]});

funcs::Im2ColFunctor<funcs::ColFormat::kOCF, Context, T> f;
funcs::Im2ColFunctor<funcs::ColFormat::OCF, Context, T> f;
f(dev_ctx, src, dilations, strides, paddings, &dst);
}
out->Resize(out_dims);
Expand Down Expand Up @@ -184,7 +184,7 @@ void Im2SequenceGradKernel(const Context& dev_ctx,
d_x->Slice(i, i + 1).Resize({img_channels, img_height, img_width});
const DenseTensor src = d_out->Slice(i, i + 1).Resize(
{output_height, output_width, img_channels, kernels[0], kernels[1]});
funcs::Col2ImFunctor<funcs::ColFormat::kOCF, Context, T> f;
funcs::Col2ImFunctor<funcs::ColFormat::OCF, Context, T> f;
f(dev_ctx, src, dilations, strides, paddings, &dst);
}
d_out->Resize(d_out_dims);
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/impl/unfold_grad_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void UnfoldGradKernel(const Context& dev_ctx,
DDim out_matrix_shape = common::make_ddim(
{x_dims[1], kernel_sizes[0], kernel_sizes[1], out_height, out_width});

funcs::Col2ImFunctor<funcs::ColFormat::kCFO, Context, T> col2im;
funcs::Col2ImFunctor<funcs::ColFormat::CFO, Context, T> col2im;

funcs::SetConstant<Context, T> set_zero;
set_zero(dev_ctx, x_grad, static_cast<T>(0));
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/impl/unfold_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void UnfoldKernel(const Context& dev_ctx,
return;
}

funcs::Im2ColFunctor<funcs::ColFormat::kCFO, Context, T> im2col;
funcs::Im2ColFunctor<funcs::ColFormat::CFO, Context, T> im2col;
const auto& x_dims = x.dims();

int64_t out_height = funcs::CalcOutputSize(x_dims[2],
Expand Down
Loading
Loading