Skip to content

P
Paddle

BaiXuePrincess / Paddle
与 Fork 源项目一致

Fork自 PaddlePaddle / Paddle

通知 1
Star 1
Fork 0
P
Paddle
未验证 提交 88cac16b 编写于 作者: H huangjiyi 提交者： GitHub
浏览文件
操作

[PHI decoupling] move im2col from fluid to phi (#48174) 

* decouple im2col from fluid

* move im2col to phi

* fix build error

* delete redundant comment
上级 6ea8bfc6
隐藏空白更改
内联 并排
Showing with 160 addition and 230 deletion
paddle/fluid/operators/conv_op.h
浏览文件 @ 88cac16b
...@@ -22,8 +22,8 @@ limitations under the License. */ ...@@ -22,8 +22,8 @@ limitations under the License. */
#include "paddle/fluid/framework/eigen.h" #include "paddle/fluid/framework/eigen.h"
#include "paddle/fluid/framework/op_registry.h" #include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/operators/layout_utils.h" #include "paddle/fluid/operators/layout_utils.h"
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/kernels/funcs/blas/blas.h" #include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/vol2col.h" #include "paddle/phi/kernels/funcs/vol2col.h"
namespace paddle { namespace paddle {
......
paddle/fluid/operators/im2sequence_op.h
浏览文件 @ 88cac16b
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "paddle/fluid/framework/eigen.h" #include "paddle/fluid/framework/eigen.h"
#include "paddle/fluid/framework/op_registry.h" #include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/operators/eigen/eigen_function.h" #include "paddle/fluid/operators/eigen/eigen_function.h"
#include "paddle/fluid/operators/math/im2col.h" #include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/math_function.h" #include "paddle/phi/kernels/funcs/math_function.h"
namespace paddle { namespace paddle {
...@@ -101,7 +101,8 @@ class Im2SequenceKernel : public framework::OpKernel<T> { ...@@ -101,7 +101,8 @@ class Im2SequenceKernel : public framework::OpKernel<T> {
kernels[1]}); kernels[1]});
offset_out += output_height[i] * output_width[i]; offset_out += output_height[i] * output_width[i];
math::Im2ColFunctor<math::ColFormat::kOCF, DeviceContext, T> f; phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, T>
f;
auto& dev_ctx = ctx.template device_context<DeviceContext>(); auto& dev_ctx = ctx.template device_context<DeviceContext>();
f(dev_ctx, src, dilations, strides, paddings, &dst); f(dev_ctx, src, dilations, strides, paddings, &dst);
} }
...@@ -135,7 +136,8 @@ class Im2SequenceKernel : public framework::OpKernel<T> { ...@@ -135,7 +136,8 @@ class Im2SequenceKernel : public framework::OpKernel<T> {
kernels[0], kernels[0],
kernels[1]}); kernels[1]});
math::Im2ColFunctor<math::ColFormat::kOCF, DeviceContext, T> f; phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, T>
f;
auto& dev_ctx = ctx.template device_context<DeviceContext>(); auto& dev_ctx = ctx.template device_context<DeviceContext>();
f(dev_ctx, src, dilations, strides, paddings, &dst); f(dev_ctx, src, dilations, strides, paddings, &dst);
} }
...@@ -190,7 +192,8 @@ class Im2SequenceGradKernel : public framework::OpKernel<T> { ...@@ -190,7 +192,8 @@ class Im2SequenceGradKernel : public framework::OpKernel<T> {
d_x->Slice(i, i + 1).Resize({img_channels, img_height, img_width}); d_x->Slice(i, i + 1).Resize({img_channels, img_height, img_width});
const Tensor src = d_out->Slice(i, i + 1).Resize( const Tensor src = d_out->Slice(i, i + 1).Resize(
{output_height, output_width, img_channels, kernels[0], kernels[1]}); {output_height, output_width, img_channels, kernels[0], kernels[1]});
math::Col2ImFunctor<math::ColFormat::kOCF, DeviceContext, T> f; phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, T>
f;
auto& dev_ctx = ctx.template device_context<DeviceContext>(); auto& dev_ctx = ctx.template device_context<DeviceContext>();
f(dev_ctx, src, dilations, strides, paddings, &dst); f(dev_ctx, src, dilations, strides, paddings, &dst);
} }
......
paddle/fluid/operators/math/CMakeLists.txt
浏览文件 @ 88cac16b
...@@ -23,7 +23,6 @@ endif() ...@@ -23,7 +23,6 @@ endif()
math_library(context_project DEPS im2col math_function) math_library(context_project DEPS im2col math_function)
math_library(cos_sim_functor) math_library(cos_sim_functor)
math_library(depthwise_conv) math_library(depthwise_conv)
math_library(im2col)
math_library(sample_prob) math_library(sample_prob)
math_library(sampler DEPS generator) math_library(sampler DEPS generator)
......
paddle/fluid/operators/math/context_project.h
浏览文件 @ 88cac16b
...@@ -18,8 +18,8 @@ limitations under the License. */ ...@@ -18,8 +18,8 @@ limitations under the License. */
#include <vector> #include <vector>
#include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/kernels/funcs/blas/blas.h" #include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/im2col.h"
namespace paddle { namespace paddle {
namespace operators { namespace operators {
...@@ -100,7 +100,8 @@ class ContextProjectFunctor { ...@@ -100,7 +100,8 @@ class ContextProjectFunctor {
phi::DenseTensor* col) { phi::DenseTensor* col) {
auto lod_level_0 = in.lod()[0]; auto lod_level_0 = in.lod()[0];
math::Im2ColFunctor<math::ColFormat::kOCF, DeviceContext, float> im2col_ocf; phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, float>
im2col_ocf;
std::vector<int> dilation({1, 1}); std::vector<int> dilation({1, 1});
std::vector<int> padding({up_pad, 0, down_pad, 0}); std::vector<int> padding({up_pad, 0, down_pad, 0});
...@@ -230,7 +231,8 @@ class ContextProjectGradFunctor { ...@@ -230,7 +231,8 @@ class ContextProjectGradFunctor {
phi::DenseTensor* col) { phi::DenseTensor* col) {
auto lod_level_0 = in.lod()[0]; auto lod_level_0 = in.lod()[0];
math::Col2ImFunctor<math::ColFormat::kOCF, DeviceContext, float> col2im_ocf; phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, float>
col2im_ocf;
std::vector<int> dilation({1, 1}); std::vector<int> dilation({1, 1});
std::vector<int> padding({up_pad, 0, down_pad, 0}); std::vector<int> padding({up_pad, 0, down_pad, 0});
......
paddle/fluid/operators/math/im2col_test.cc
浏览文件 @ 88cac16b
...@@ -12,13 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,13 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/fluid/operators/math/im2col.h" #include "paddle/phi/kernels/funcs/im2col.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "paddle/fluid/operators/math/im2col_cfo_cpu.h" #include "paddle/fluid/framework/tensor_util.h"
#include "paddle/fluid/platform/device_context.h" #include "paddle/fluid/platform/device_context.h"
#include "paddle/fluid/platform/place.h" #include "paddle/fluid/platform/place.h"
#include "paddle/phi/kernels/funcs/im2col_cfo_cpu.h"
template <typename DeviceContext, typename Place> template <typename DeviceContext, typename Place>
void testIm2col() { void testIm2col() {
...@@ -76,15 +77,9 @@ void testIm2col() { ...@@ -76,15 +77,9 @@ void testIm2col() {
{output_height, output_width, 1, filter_size, filter_size}, *place); {output_height, output_width, 1, filter_size, filter_size}, *place);
// Im2Col // Im2Col
paddle::operators::math::Im2ColFunctor< phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, DeviceContext, float>
paddle::operators::math::ColFormat::kCFO,
DeviceContext,
float>
im2col; im2col;
paddle::operators::math::Im2ColFunctor< phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, float>
paddle::operators::math::ColFormat::kOCF,
DeviceContext,
float>
im2col_ocf; im2col_ocf;
im2col(*context, input, dilation, stride, padding, &output_cfo); im2col(*context, input, dilation, stride, padding, &output_cfo);
...@@ -119,15 +114,9 @@ void testIm2col() { ...@@ -119,15 +114,9 @@ void testIm2col() {
} }
// Col2Im: kCFO // Col2Im: kCFO
paddle::operators::math::Col2ImFunctor< phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kCFO, DeviceContext, float>
paddle::operators::math::ColFormat::kCFO,
DeviceContext,
float>
col2im; col2im;
paddle::operators::math::Col2ImFunctor< phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, float>
paddle::operators::math::ColFormat::kOCF,
DeviceContext,
float>
col2im_ocf; col2im_ocf;
float col2im_data[] = {0, 2, 2, 3, 8, 5}; float col2im_data[] = {0, 2, 2, 3, 8, 5};
...@@ -237,15 +226,9 @@ void testIm2col<phi::GPUContext, paddle::platform::CUDAPlace>() { ...@@ -237,15 +226,9 @@ void testIm2col<phi::GPUContext, paddle::platform::CUDAPlace>() {
{output_height, output_width, 1, filter_size, filter_size}, *place); {output_height, output_width, 1, filter_size, filter_size}, *place);
// Im2Col // Im2Col
paddle::operators::math::Im2ColFunctor< phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, phi::GPUContext, float>
paddle::operators::math::ColFormat::kCFO,
phi::GPUContext,
float>
im2col; im2col;
paddle::operators::math::Im2ColFunctor< phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kOCF, phi::GPUContext, float>
paddle::operators::math::ColFormat::kOCF,
phi::GPUContext,
float>
im2col_ocf; im2col_ocf;
im2col(*context, input, dilation, stride, padding, &output_cfo); im2col(*context, input, dilation, stride, padding, &output_cfo);
...@@ -280,15 +263,9 @@ void testIm2col<phi::GPUContext, paddle::platform::CUDAPlace>() { ...@@ -280,15 +263,9 @@ void testIm2col<phi::GPUContext, paddle::platform::CUDAPlace>() {
} }
// Col2Im: kCFO // Col2Im: kCFO
paddle::operators::math::Col2ImFunctor< phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kCFO, phi::GPUContext, float>
paddle::operators::math::ColFormat::kCFO,
phi::GPUContext,
float>
col2im; col2im;
paddle::operators::math::Col2ImFunctor< phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kOCF, phi::GPUContext, float>
paddle::operators::math::ColFormat::kOCF,
phi::GPUContext,
float>
col2im_ocf; col2im_ocf;
float col2im_data[] = {0, 2, 2, 3, 8, 5}; float col2im_data[] = {0, 2, 2, 3, 8, 5};
...@@ -363,18 +340,15 @@ TEST(math, im2col) { ...@@ -363,18 +340,15 @@ TEST(math, im2col) {
int output_width = (iw - fw + padding[1] * 2) / stride[1] + 1; \ int output_width = (iw - fw + padding[1] * 2) / stride[1] + 1; \
out.mutable_data<float>({ic, fh, fw, output_height, output_width}, place); \ out.mutable_data<float>({ic, fh, fw, output_height, output_width}, place); \
ref.mutable_data<float>({ic, fh, fw, output_height, output_width}, place); \ ref.mutable_data<float>({ic, fh, fw, output_height, output_width}, place); \
paddle::operators::math::Im2ColFunctor< \ phi::funcs:: \
paddle::operators::math::ColFormat::kCFO, \ Im2ColFunctor<phi::funcs::ColFormat::kCFO, phi::CPUContext, float> \
phi::CPUContext, \ im2col
float> \
im2col
void testIm2colCPU(int ic, int ih, int iw, int fh, int fw, int ph, int pw) { void testIm2colCPU(int ic, int ih, int iw, int fh, int fw, int ph, int pw) {
PREPARE_IM2COL_CPU; PREPARE_IM2COL_CPU;
im2col(context, input, dilation, stride, padding, &out); im2col(context, input, dilation, stride, padding, &out);
paddle::operators::math::im2col_common<float>( phi::funcs::im2col_common<float>(input, dilation, stride, padding, &ref);
input, dilation, stride, padding, &ref);
float* ref_data = ref.data<float>(); float* ref_data = ref.data<float>();
float* out_data = out.data<float>(); float* out_data = out.data<float>();
...@@ -398,8 +372,7 @@ void benchIm2col(int ic, int ih, int iw, int fh, int fw, int ph, int pw) { ...@@ -398,8 +372,7 @@ void benchIm2col(int ic, int ih, int iw, int fh, int fw, int ph, int pw) {
auto t2 = GetCurrentMs(); auto t2 = GetCurrentMs();
for (int i = 0; i < repeat; ++i) { for (int i = 0; i < repeat; ++i) {
paddle::operators::math::im2col_common<float>( phi::funcs::im2col_common<float>(input, dilation, stride, padding, &ref);
input, dilation, stride, padding, &ref);
} }
auto t3 = GetCurrentMs(); auto t3 = GetCurrentMs();
......
paddle/phi/kernels/funcs/CMakeLists.txt
浏览文件 @ 88cac16b
...@@ -17,6 +17,7 @@ math_library(segment_pooling) ...@@ -17,6 +17,7 @@ math_library(segment_pooling)
math_library(sequence2batch) math_library(sequence2batch)
math_library(matrix_solve DEPS dense_tensor eigen3 blas math_function) math_library(matrix_solve DEPS dense_tensor eigen3 blas math_function)
math_library(cross_entropy) math_library(cross_entropy)
math_library(im2col)
math_library(vol2col) math_library(vol2col)
cc_library( cc_library(
......
paddle/fluid/operators/math/im2col.cc → paddle/phi/kernels/funcs/im2col.cc
浏览文件 @ 88cac16b
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved. /* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
...@@ -12,17 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,17 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/fluid/operators/math/im2col.h" #include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/im2col_cfo_cpu.h"
#include "paddle/fluid/operators/math/im2col_cfo_cpu.h"
namespace phi { namespace phi {
class CPUContext; class CPUContext;
} // namespace phi } // namespace phi
namespace paddle { namespace phi {
namespace operators { namespace funcs {
namespace math {
/* /*
* im = [input_channels, input_height, input_width] * im = [input_channels, input_height, input_width]
...@@ -30,9 +28,7 @@ namespace math { ...@@ -30,9 +28,7 @@ namespace math {
* [input_channels, filter_height, filter_width, output_height, output_width] * [input_channels, filter_height, filter_width, output_height, output_width]
*/ */
template <class T, typename DeviceContext> template <class T, typename DeviceContext>
class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, class Im2ColFunctor<phi::funcs::ColFormat::kCFO, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& im, const phi::DenseTensor& im,
...@@ -43,13 +39,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -43,13 +39,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im.dims().size(), PADDLE_ENFORCE_EQ(im.dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im.dims())); im.dims()));
PADDLE_ENFORCE_EQ(col->dims().size(), PADDLE_ENFORCE_EQ(col->dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col->dims())); col->dims()));
...@@ -77,9 +73,7 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -77,9 +73,7 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO,
* [input_channels, filter_height, filter_width, output_height, output_width] * [input_channels, filter_height, filter_width, output_height, output_width]
*/ */
template <class T, typename DeviceContext> template <class T, typename DeviceContext>
class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, class Col2ImFunctor<phi::funcs::ColFormat::kCFO, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& col, const phi::DenseTensor& col,
...@@ -90,13 +84,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -90,13 +84,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im->dims().size(), PADDLE_ENFORCE_EQ(im->dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im->dims())); im->dims()));
PADDLE_ENFORCE_EQ(col.dims().size(), PADDLE_ENFORCE_EQ(col.dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col.dims())); col.dims()));
...@@ -111,22 +105,22 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -111,22 +105,22 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
int col_height = col.dims()[3]; int col_height = col.dims()[3];
int col_width = col.dims()[4]; int col_width = col.dims()[4];
PADDLE_ENFORCE_EQ((im_height + padding[0] + padding[2] - PADDLE_ENFORCE_EQ(
((dilation[0] * (filter_height - 1) + 1))) / (im_height + padding[0] + padding[2] -
stride[0] + ((dilation[0] * (filter_height - 1) + 1))) /
1, stride[0] +
col_height, 1,
platform::errors::InvalidArgument( col_height,
"Output_height and padding(padding_up, " phi::errors::InvalidArgument("Output_height and padding(padding_up, "
"padding_down) are inconsistent.")); "padding_down) are inconsistent."));
PADDLE_ENFORCE_EQ((im_width + padding[1] + padding[3] - PADDLE_ENFORCE_EQ(
((dilation[1] * (filter_width - 1) + 1))) / (im_width + padding[1] + padding[3] -
stride[1] + ((dilation[1] * (filter_width - 1) + 1))) /
1, stride[1] +
col_width, 1,
platform::errors::InvalidArgument( col_width,
"Output_height and padding(padding_up, " phi::errors::InvalidArgument("Output_height and padding(padding_up, "
"padding_down) are inconsistent.")); "padding_down) are inconsistent."));
int channels_col = im_channels * filter_height * filter_width; int channels_col = im_channels * filter_height * filter_width;
...@@ -160,16 +154,16 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -160,16 +154,16 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
} }
}; };
template class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext, phi::CPUContext,
float>; float>;
template class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext, phi::CPUContext,
double>; double>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext, phi::CPUContext,
float>; float>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext, phi::CPUContext,
double>; double>;
...@@ -179,9 +173,7 @@ template class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -179,9 +173,7 @@ template class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
* [output_height, output_width, input_channels, filter_height, filter_width] * [output_height, output_width, input_channels, filter_height, filter_width]
*/ */
template <class T, typename DeviceContext> template <class T, typename DeviceContext>
class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, class Im2ColFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& im, const phi::DenseTensor& im,
...@@ -192,13 +184,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -192,13 +184,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im.dims().size(), PADDLE_ENFORCE_EQ(im.dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im.dims())); im.dims()));
PADDLE_ENFORCE_EQ(col->dims().size(), PADDLE_ENFORCE_EQ(col->dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col->dims())); col->dims()));
...@@ -254,9 +246,7 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -254,9 +246,7 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF,
* [output_height, output_width, input_channels, filter_height, filter_width] * [output_height, output_width, input_channels, filter_height, filter_width]
*/ */
template <class T, typename DeviceContext> template <class T, typename DeviceContext>
class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, class Col2ImFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& col, const phi::DenseTensor& col,
...@@ -267,13 +257,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -267,13 +257,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im->dims().size(), PADDLE_ENFORCE_EQ(im->dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im->dims())); im->dims()));
PADDLE_ENFORCE_EQ(col.dims().size(), PADDLE_ENFORCE_EQ(col.dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col.dims())); col.dims()));
...@@ -288,14 +278,14 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -288,14 +278,14 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
(im_height + padding[0] + padding[2] - filter_height) / stride[0] + 1, (im_height + padding[0] + padding[2] - filter_height) / stride[0] + 1,
col_height, col_height,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"Output_height and padding(padding_up, padding_down) " "Output_height and padding(padding_up, padding_down) "
"are inconsistent.")); "are inconsistent."));
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
(im_width + padding[1] + padding[3] - filter_width) / stride[1] + 1, (im_width + padding[1] + padding[3] - filter_width) / stride[1] + 1,
col_width, col_width,
platform::errors::InvalidArgument("col_width and padding(padding_left, " phi::errors::InvalidArgument("col_width and padding(padding_left, "
"padding_right) are inconsistent.")); "padding_right) are inconsistent."));
T* im_data = im->data<T>(); T* im_data = im->data<T>();
const T* col_data = col.data<T>(); const T* col_data = col.data<T>();
...@@ -335,18 +325,17 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -335,18 +325,17 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
} }
}; };
template class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext, phi::CPUContext,
float>; float>;
template class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext, phi::CPUContext,
double>; double>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext, phi::CPUContext,
float>; float>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext, phi::CPUContext,
double>; double>;
} // namespace math } // namespace funcs
} // namespace operators } // namespace phi
} // namespace paddle
paddle/fluid/operators/math/im2col.cu → paddle/phi/kernels/funcs/im2col.cu
浏览文件 @ 88cac16b
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved. /* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
...@@ -15,14 +15,13 @@ limitations under the License. */ ...@@ -15,14 +15,13 @@ limitations under the License. */
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/fluid/platform/device/gpu/gpu_launch_config.h"
#include "paddle/phi/backends/gpu/gpu_context.h" #include "paddle/phi/backends/gpu/gpu_context.h"
#include "paddle/phi/backends/gpu/gpu_launch_config.h"
#include "paddle/phi/backends/gpu/gpu_primitives.h" #include "paddle/phi/backends/gpu/gpu_primitives.h"
#include "paddle/phi/kernels/funcs/im2col.h"
namespace paddle { namespace phi {
namespace operators { namespace funcs {
namespace math {
template <class T> template <class T>
__global__ void im2col(const T* data_im, __global__ void im2col(const T* data_im,
...@@ -86,9 +85,7 @@ __global__ void im2col(const T* data_im, ...@@ -86,9 +85,7 @@ __global__ void im2col(const T* data_im,
* [input_channels, filter_height, filter_width, output_height, output_width] * [input_channels, filter_height, filter_width, output_height, output_width]
*/ */
template <class DeviceContext, class T> template <class DeviceContext, class T>
class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, class Im2ColFunctor<phi::funcs::ColFormat::kCFO, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& im, const phi::DenseTensor& im,
...@@ -99,13 +96,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -99,13 +96,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im.dims().size(), PADDLE_ENFORCE_EQ(im.dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im.dims())); im.dims()));
PADDLE_ENFORCE_EQ(col->dims().size(), PADDLE_ENFORCE_EQ(col->dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col->dims())); col->dims()));
...@@ -124,7 +121,7 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -124,7 +121,7 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO,
int num_outputs = im_channels * col_height * col_width; int num_outputs = im_channels * col_height * col_width;
int num_thread = 1024; int num_thread = 1024;
#ifdef WITH_NV_JETSON #ifdef WITH_NV_JETSON
platform::ChangeThreadNum(context, &num_thread); phi::backends::gpu::ChangeThreadNum(context, &num_thread);
#endif #endif
int blocks = (num_outputs + num_thread - 1) / num_thread; int blocks = (num_outputs + num_thread - 1) / num_thread;
int block_x = 512; int block_x = 512;
...@@ -223,9 +220,7 @@ __global__ void col2im(int n, ...@@ -223,9 +220,7 @@ __global__ void col2im(int n,
* [input_channels, filter_height, filter_width, output_height, output_width] * [input_channels, filter_height, filter_width, output_height, output_width]
*/ */
template <class DeviceContext, class T> template <class DeviceContext, class T>
class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, class Col2ImFunctor<phi::funcs::ColFormat::kCFO, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& col, const phi::DenseTensor& col,
...@@ -236,13 +231,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -236,13 +231,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im->dims().size(), PADDLE_ENFORCE_EQ(im->dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im->dims())); im->dims()));
PADDLE_ENFORCE_EQ(col.dims().size(), PADDLE_ENFORCE_EQ(col.dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col.dims())); col.dims()));
...@@ -258,28 +253,28 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -258,28 +253,28 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
int col_height = col.dims()[3]; int col_height = col.dims()[3];
int col_width = col.dims()[4]; int col_width = col.dims()[4];
PADDLE_ENFORCE_EQ((im_height + padding[0] + padding[2] - PADDLE_ENFORCE_EQ(
(dilation[0] * (filter_height - 1) + 1)) / (im_height + padding[0] + padding[2] -
stride[0] + (dilation[0] * (filter_height - 1) + 1)) /
1, stride[0] +
col_height, 1,
platform::errors::InvalidArgument( col_height,
"Output_height and padding(padding_up, " phi::errors::InvalidArgument("Output_height and padding(padding_up, "
"padding_down) are inconsistent.")); "padding_down) are inconsistent."));
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
(im_width + padding[1] + padding[3] - (im_width + padding[1] + padding[3] -
(dilation[1] * (filter_width - 1) + 1)) / (dilation[1] * (filter_width - 1) + 1)) /
stride[1] + stride[1] +
1, 1,
col_width, col_width,
platform::errors::InvalidArgument("col_width and padding(padding_left, " phi::errors::InvalidArgument("col_width and padding(padding_left, "
"padding_right) are inconsistent.")); "padding_right) are inconsistent."));
size_t num_kernels = im_channels * im_height * im_width; size_t num_kernels = im_channels * im_height * im_width;
int num_thread = 1024; int num_thread = 1024;
#ifdef WITH_NV_JETSON #ifdef WITH_NV_JETSON
platform::ChangeThreadNum(context, &num_thread); phi::backends::gpu::ChangeThreadNum(context, &num_thread);
#endif #endif
size_t blocks = (num_kernels + num_thread - 1) / num_thread; size_t blocks = (num_kernels + num_thread - 1) / num_thread;
size_t block_x = 512; size_t block_x = 512;
...@@ -308,16 +303,16 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, ...@@ -308,16 +303,16 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
} }
}; };
template class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext, phi::GPUContext,
float>; float>;
template class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext, phi::GPUContext,
double>; double>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext, phi::GPUContext,
float>; float>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext, phi::GPUContext,
double>; double>;
...@@ -367,9 +362,7 @@ __global__ void im2colOCF(const T* im_data, ...@@ -367,9 +362,7 @@ __global__ void im2colOCF(const T* im_data,
* [output_height, output_width, input_channels, filter_height, filter_width] * [output_height, output_width, input_channels, filter_height, filter_width]
*/ */
template <class DeviceContext, class T> template <class DeviceContext, class T>
class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, class Im2ColFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& im, const phi::DenseTensor& im,
...@@ -380,13 +373,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -380,13 +373,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im.dims().size(), PADDLE_ENFORCE_EQ(im.dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im.dims())); im.dims()));
PADDLE_ENFORCE_EQ(col->dims().size(), PADDLE_ENFORCE_EQ(col->dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col->dims())); col->dims()));
...@@ -479,9 +472,7 @@ __global__ void col2imOCF(const T* col_data, ...@@ -479,9 +472,7 @@ __global__ void col2imOCF(const T* col_data,
* [output_height, output_width, input_channels, filter_height, filter_width] * [output_height, output_width, input_channels, filter_height, filter_width]
*/ */
template <class DeviceContext, class T> template <class DeviceContext, class T>
class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, class Col2ImFunctor<phi::funcs::ColFormat::kOCF, DeviceContext, T> {
DeviceContext,
T> {
public: public:
void operator()(const DeviceContext& context, void operator()(const DeviceContext& context,
const phi::DenseTensor& col, const phi::DenseTensor& col,
...@@ -492,13 +483,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -492,13 +483,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
const DataLayout data_layout) { const DataLayout data_layout) {
PADDLE_ENFORCE_EQ(im->dims().size(), PADDLE_ENFORCE_EQ(im->dims().size(),
3, 3,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'im' should be 3. But got " "The dimension of tensor 'im' should be 3. But got "
"the dims of tensor 'im' is [%s].", "the dims of tensor 'im' is [%s].",
im->dims())); im->dims()));
PADDLE_ENFORCE_EQ(col.dims().size(), PADDLE_ENFORCE_EQ(col.dims().size(),
5, 5,
platform::errors::InvalidArgument( phi::errors::InvalidArgument(
"The dimension of tensor 'col' should be 5. But got " "The dimension of tensor 'col' should be 5. But got "
"the dims of tensor 'col' is [%s].", "the dims of tensor 'col' is [%s].",
col.dims())); col.dims()));
...@@ -511,22 +502,22 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -511,22 +502,22 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
int col_height = col.dims()[0]; int col_height = col.dims()[0];
int col_width = col.dims()[1]; int col_width = col.dims()[1];
PADDLE_ENFORCE_EQ((im_height + padding[0] + padding[2] - PADDLE_ENFORCE_EQ(
(dilation[0] * (filter_height - 1) + 1)) / (im_height + padding[0] + padding[2] -
stride[0] + (dilation[0] * (filter_height - 1) + 1)) /
1, stride[0] +
col_height, 1,
platform::errors::InvalidArgument( col_height,
"Output_height and padding(padding_up, " phi::errors::InvalidArgument("Output_height and padding(padding_up, "
"padding_down) are inconsistent.")); "padding_down) are inconsistent."));
PADDLE_ENFORCE_EQ( PADDLE_ENFORCE_EQ(
(im_width + padding[1] + padding[3] - (im_width + padding[1] + padding[3] -
(dilation[1] * (filter_width - 1) + 1)) / (dilation[1] * (filter_width - 1) + 1)) /
stride[1] + stride[1] +
1, 1,
col_width, col_width,
platform::errors::InvalidArgument("col_width and padding(padding_left, " phi::errors::InvalidArgument("col_width and padding(padding_left, "
"padding_right) are inconsistent.")); "padding_right) are inconsistent."));
int block_dim_x = 0; int block_dim_x = 0;
int block_dim_y = 0; int block_dim_y = 0;
...@@ -563,20 +554,19 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, ...@@ -563,20 +554,19 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
} }
}; };
template class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext, phi::GPUContext,
float>; float>;
template class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF, template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext, phi::GPUContext,
double>; double>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext, phi::GPUContext,
float>; float>;
template class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext, phi::GPUContext,
double>; double>;
} // namespace math } // namespace funcs
} // namespace operators } // namespace phi
} // namespace paddle
paddle/fluid/operators/math/im2col.h → paddle/phi/kernels/funcs/im2col.h
浏览文件 @ 88cac16b
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved. /* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
...@@ -16,13 +16,13 @@ limitations under the License. */ ...@@ -16,13 +16,13 @@ limitations under the License. */
#include <vector> #include <vector>
#include "paddle/fluid/framework/tensor.h" #include "paddle/phi/common/layout.h"
#include "paddle/fluid/framework/tensor_util.h" #include "paddle/phi/core/dense_tensor.h"
#include "paddle/fluid/platform/device_context.h" #include "paddle/phi/core/enforce.h"
#include "paddle/phi/core/errors.h"
namespace paddle { namespace phi {
namespace operators { namespace funcs {
namespace math {
using DataLayout = phi::DataLayout; using DataLayout = phi::DataLayout;
...@@ -107,6 +107,5 @@ class Col2ImFunctor { ...@@ -107,6 +107,5 @@ class Col2ImFunctor {
const DataLayout data_layout = DataLayout::kNCHW); const DataLayout data_layout = DataLayout::kNCHW);
}; };
} // namespace math } // namespace funcs
} // namespace operators } // namespace phi
} // namespace paddle
paddle/fluid/operators/math/im2col_cfo_cpu.h → paddle/phi/kernels/funcs/im2col_cfo_cpu.h
浏览文件 @ 88cac16b
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved. /* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
...@@ -16,11 +16,10 @@ limitations under the License. */ ...@@ -16,11 +16,10 @@ limitations under the License. */
#include <vector> #include <vector>
#include "paddle/fluid/framework/tensor.h" #include "paddle/phi/core/dense_tensor.h"
namespace paddle { namespace phi {
namespace operators { namespace funcs {
namespace math {
/** /**
* The most common im2col algorithm. * The most common im2col algorithm.
...@@ -317,6 +316,5 @@ inline void im2col_sh1sw1dh1dw1ph1pw1(const phi::DenseTensor& im, ...@@ -317,6 +316,5 @@ inline void im2col_sh1sw1dh1dw1ph1pw1(const phi::DenseTensor& im,
} }
} }
} // namespace math } // namespace funcs
} // namespace operators } // namespace phi
} // namespace paddle
paddle/phi/kernels/impl/conv_grad_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
#pragma once #pragma once
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/kernels/cpu/conv_util.h" #include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/funcs/batch_norm_utils.h" #include "paddle/phi/kernels/funcs/batch_norm_utils.h"
#include "paddle/phi/kernels/funcs/blas/blas.h" #include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/math_function.h" #include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/funcs/vol2col.h" #include "paddle/phi/kernels/funcs/vol2col.h"
...@@ -147,10 +147,8 @@ void ConvGradKernel(const Context& dev_ctx, ...@@ -147,10 +147,8 @@ void ConvGradKernel(const Context& dev_ctx,
if (is_expand) { if (is_expand) {
set_zero(dev_ctx, &transformed_input_grad, static_cast<T>(0)); set_zero(dev_ctx, &transformed_input_grad, static_cast<T>(0));
} }
phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kCFO, Context, T> col2im;
phi::funcs::Col2VolFunctor<Context, T> col2vol; phi::funcs::Col2VolFunctor<Context, T> col2vol;
paddle::operators::math::
Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
col2im;
for (int i = 0; i < batch_size; i++) { for (int i = 0; i < batch_size; i++) {
DenseTensor out_grad_batch = DenseTensor out_grad_batch =
...@@ -203,9 +201,7 @@ void ConvGradKernel(const Context& dev_ctx, ...@@ -203,9 +201,7 @@ void ConvGradKernel(const Context& dev_ctx,
Tensor filter_grad_ = *filter_grad; Tensor filter_grad_ = *filter_grad;
filter_grad_.Resize(filter_matrix_shape); filter_grad_.Resize(filter_matrix_shape);
set_zero(dev_ctx, filter_grad, static_cast<T>(0)); set_zero(dev_ctx, filter_grad, static_cast<T>(0));
paddle::operators::math:: phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, Context, T> im2col;
Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
im2col;
phi::funcs::Vol2ColFunctor<Context, T> vol2col; phi::funcs::Vol2ColFunctor<Context, T> vol2col;
for (int i = 0; i < batch_size; i++) { for (int i = 0; i < batch_size; i++) {
DenseTensor out_grad_batch = DenseTensor out_grad_batch =
...@@ -381,10 +377,8 @@ void ConvGradGradKernel(const Context& dev_ctx, ...@@ -381,10 +377,8 @@ void ConvGradGradKernel(const Context& dev_ctx,
if (is_expand) { if (is_expand) {
set_zero(dev_ctx, &transformed_dX, static_cast<T>(0)); set_zero(dev_ctx, &transformed_dX, static_cast<T>(0));
} }
phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kCFO, Context, T> col2im;
phi::funcs::Col2VolFunctor<Context, T> col2vol; phi::funcs::Col2VolFunctor<Context, T> col2vol;
paddle::operators::math::
Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
col2im;
for (int i = 0; i < batch_size; i++) { for (int i = 0; i < batch_size; i++) {
DenseTensor dy_batch = DenseTensor dy_batch =
...@@ -428,9 +422,7 @@ void ConvGradGradKernel(const Context& dev_ctx, ...@@ -428,9 +422,7 @@ void ConvGradGradKernel(const Context& dev_ctx,
set_zero(dev_ctx, dW, static_cast<T>(0)); set_zero(dev_ctx, dW, static_cast<T>(0));
DenseTensor dW_arr = *dW; DenseTensor dW_arr = *dW;
dW_arr.Resize(filter_matrix_shape); dW_arr.Resize(filter_matrix_shape);
paddle::operators::math:: phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, Context, T> im2col;
Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
im2col;
phi::funcs::Vol2ColFunctor<Context, T> vol2col; phi::funcs::Vol2ColFunctor<Context, T> vol2col;
for (int i = 0; i < batch_size; ++i) { for (int i = 0; i < batch_size; ++i) {
DenseTensor dy_batch = DenseTensor dy_batch =
...@@ -477,9 +469,7 @@ void ConvGradGradKernel(const Context& dev_ctx, ...@@ -477,9 +469,7 @@ void ConvGradGradKernel(const Context& dev_ctx,
} }
set_zero(dev_ctx, &transformed_ddY, static_cast<T>(0)); set_zero(dev_ctx, &transformed_ddY, static_cast<T>(0));
paddle::operators::math:: phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, Context, T> im2col;
Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
im2col;
phi::funcs::Vol2ColFunctor<Context, T> vol2col; phi::funcs::Vol2ColFunctor<Context, T> vol2col;
for (int i = 0; i < batch_size; ++i) { for (int i = 0; i < batch_size; ++i) {
DenseTensor ddy_batch = DenseTensor ddy_batch =
......
paddle/phi/kernels/impl/conv_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
#pragma once #pragma once
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/kernels/conv_kernel.h" #include "paddle/phi/kernels/conv_kernel.h"
#include "paddle/phi/kernels/cpu/conv_util.h" #include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/funcs/batch_norm_utils.h" #include "paddle/phi/kernels/funcs/batch_norm_utils.h"
#include "paddle/phi/kernels/funcs/blas/blas.h" #include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/math_function.h" #include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/funcs/vol2col.h" #include "paddle/phi/kernels/funcs/vol2col.h"
...@@ -133,10 +133,8 @@ void ConvKernelImpl(const Context& dev_ctx, ...@@ -133,10 +133,8 @@ void ConvKernelImpl(const Context& dev_ctx,
int in_step = static_cast<int>(transformed_input.dims()[1]) / groups; int in_step = static_cast<int>(transformed_input.dims()[1]) / groups;
int out_step = static_cast<int>(transformed_output.dims()[1]) / groups; int out_step = static_cast<int>(transformed_output.dims()[1]) / groups;
phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, Context, T> im2col;
phi::funcs::Vol2ColFunctor<Context, T> vol2col; phi::funcs::Vol2ColFunctor<Context, T> vol2col;
paddle::operators::math::
Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
im2col;
auto blas = phi::funcs::GetBlas<Context, T>(dev_ctx); auto blas = phi::funcs::GetBlas<Context, T>(dev_ctx);
for (int i = 0; i < batch_size; i++) { for (int i = 0; i < batch_size; i++) {
......
paddle/phi/kernels/impl/conv_transpose_grad_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#pragma once #pragma once
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/common/layout.h" #include "paddle/phi/common/layout.h"
#include "paddle/phi/core/ddim.h" #include "paddle/phi/core/ddim.h"
#include "paddle/phi/kernels/conv_transpose_grad_kernel.h" #include "paddle/phi/kernels/conv_transpose_grad_kernel.h"
#include "paddle/phi/kernels/cpu/conv_util.h" #include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/funcs/blas/blas.h" #include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/concat_and_split_functor.h" #include "paddle/phi/kernels/funcs/concat_and_split_functor.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/slice.h" #include "paddle/phi/kernels/funcs/slice.h"
#include "paddle/phi/kernels/funcs/vol2col.h" #include "paddle/phi/kernels/funcs/vol2col.h"
...@@ -143,9 +143,7 @@ void ConvTransposeGradRawKernel(const Context& ctx, ...@@ -143,9 +143,7 @@ void ConvTransposeGradRawKernel(const Context& ctx,
DenseTensor dfilter_; DenseTensor dfilter_;
funcs::SetConstant<Context, T> set_zero; funcs::SetConstant<Context, T> set_zero;
paddle::operators::math:: phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, Context, T> im2col;
Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
im2col;
phi::funcs::Vol2ColFunctor<Context, T> vol2col; phi::funcs::Vol2ColFunctor<Context, T> vol2col;
funcs::ConcatFunctor<Context, T> concat_functor; funcs::ConcatFunctor<Context, T> concat_functor;
......
paddle/phi/kernels/impl/conv_transpose_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#pragma once #pragma once
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/common/layout.h" #include "paddle/phi/common/layout.h"
#include "paddle/phi/core/ddim.h" #include "paddle/phi/core/ddim.h"
#include "paddle/phi/kernels/conv_transpose_kernel.h" #include "paddle/phi/kernels/conv_transpose_kernel.h"
#include "paddle/phi/kernels/cpu/conv_util.h" #include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/funcs/blas/blas.h" #include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/concat_and_split_functor.h" #include "paddle/phi/kernels/funcs/concat_and_split_functor.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/slice.h" #include "paddle/phi/kernels/funcs/slice.h"
#include "paddle/phi/kernels/funcs/vol2col.h" #include "paddle/phi/kernels/funcs/vol2col.h"
...@@ -136,9 +136,7 @@ void ConvTransposeRawKernel(const Context& ctx, ...@@ -136,9 +136,7 @@ void ConvTransposeRawKernel(const Context& ctx,
(data_layout != DataLayout::kNHWC (data_layout != DataLayout::kNHWC
? static_cast<int>(out_dims[1]) / groups ? static_cast<int>(out_dims[1]) / groups
: static_cast<int>(out_dims[out_dims.size() - 1]) / groups); : static_cast<int>(out_dims[out_dims.size() - 1]) / groups);
paddle::operators::math:: phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kCFO, Context, T> col2im;
Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
col2im;
phi::funcs::Col2VolFunctor<Context, T> col2vol; phi::funcs::Col2VolFunctor<Context, T> col2vol;
funcs::ConcatFunctor<Context, T> concat_functor; funcs::ConcatFunctor<Context, T> concat_functor;
......
paddle/phi/kernels/impl/fold_grad_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <vector> #include <vector>
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/math_function.h" #include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/funcs/unfold_functor.h" #include "paddle/phi/kernels/funcs/unfold_functor.h"
...@@ -60,9 +60,7 @@ void FoldGradKernel(const Context& ctx, ...@@ -60,9 +60,7 @@ void FoldGradKernel(const Context& ctx,
output_height, output_height,
output_width}); output_width});
paddle::operators::math:: phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, Context, T> im2col;
Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
im2col;
for (int i = 0; i < batch_size; i++) { for (int i = 0; i < batch_size; i++) {
DenseTensor out_grad_batch = out_grad.Slice(i, i + 1).Resize(out_shape); DenseTensor out_grad_batch = out_grad.Slice(i, i + 1).Resize(out_shape);
......
paddle/phi/kernels/impl/fold_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <vector> #include <vector>
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/enforce.h" #include "paddle/phi/core/enforce.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/math_function.h" #include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/funcs/unfold_functor.h" #include "paddle/phi/kernels/funcs/unfold_functor.h"
...@@ -36,9 +36,7 @@ void FoldKernel(const Context& ctx, ...@@ -36,9 +36,7 @@ void FoldKernel(const Context& ctx,
const int batch_size = static_cast<int>(x.dims()[0]); const int batch_size = static_cast<int>(x.dims()[0]);
ctx.template Alloc<T>(out); ctx.template Alloc<T>(out);
paddle::operators::math:: phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kCFO, Context, T> col2im;
Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
col2im;
const auto& x_dims = x.dims(); const auto& x_dims = x.dims();
int output_height = (output_sizes[0] + 2 * paddings[0] - int output_height = (output_sizes[0] + 2 * paddings[0] -
......
paddle/phi/kernels/impl/unfold_grad_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <vector> #include <vector>
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/math_function.h" #include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/funcs/unfold_functor.h" #include "paddle/phi/kernels/funcs/unfold_functor.h"
...@@ -56,9 +56,7 @@ void UnfoldGradKernel(const Context& ctx, ...@@ -56,9 +56,7 @@ void UnfoldGradKernel(const Context& ctx,
DDim out_matrix_shape = make_ddim( DDim out_matrix_shape = make_ddim(
{x_dims[1], kernel_sizes[0], kernel_sizes[1], out_height, out_width}); {x_dims[1], kernel_sizes[0], kernel_sizes[1], out_height, out_width});
paddle::operators::math:: phi::funcs::Col2ImFunctor<phi::funcs::ColFormat::kCFO, Context, T> col2im;
Col2ImFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
col2im;
phi::funcs::SetConstant<Context, T> set_zero; phi::funcs::SetConstant<Context, T> set_zero;
set_zero(ctx, x_grad, static_cast<T>(0)); set_zero(ctx, x_grad, static_cast<T>(0));
......
paddle/phi/kernels/impl/unfold_kernel_impl.h
浏览文件 @ 88cac16b
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <vector> #include <vector>
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/kernels/funcs/im2col.h"
#include "paddle/phi/kernels/funcs/math_function.h" #include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/funcs/unfold_functor.h" #include "paddle/phi/kernels/funcs/unfold_functor.h"
...@@ -34,9 +34,7 @@ void UnfoldKernel(const Context& ctx, ...@@ -34,9 +34,7 @@ void UnfoldKernel(const Context& ctx,
const int batch_size = static_cast<int>(x.dims()[0]); const int batch_size = static_cast<int>(x.dims()[0]);
ctx.template Alloc<T>(out); ctx.template Alloc<T>(out);
paddle::operators::math:: phi::funcs::Im2ColFunctor<phi::funcs::ColFormat::kCFO, Context, T> im2col;
Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, Context, T>
im2col;
const auto& x_dims = x.dims(); const auto& x_dims = x.dims();
int out_height = phi::funcs::CalcOutputSize(x_dims[2], int out_height = phi::funcs::CalcOutputSize(x_dims[2],
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或