Skip to content

Commit 4485d06

Browse files
zhiboniuzhiboniu
committed
update
1 parent 5baa970 commit 4485d06

File tree

13 files changed

+122
-89
lines changed

13 files changed

+122
-89
lines changed

‎paddle/fluid/eager/auto_code_generator/final_state_generator/codegen_utils.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
'str[]' : 'std::vector<std::string>', 'float[]' : 'std::vector<float>', \
4949
'Place' : 'paddle::Place', 'DataLayout' : 'paddle::experimental::DataLayout', 'DataType' : 'paddle::experimental::DataType', \
5050
'int64_t[]' : 'std::vector<int64_t>', 'int[]' : 'std::vector<int>',
51-
'float[]' : 'std::vector<float>', 'double[]' : 'std::vector<double>',
5251
'Tensor' : 'Tensor',
5352
'Tensor[]' : 'std::vector<Tensor>',
5453
'Tensor[Tensor[]]' : 'std::vector<std::vector<Tensor>>',

‎paddle/fluid/operators/detection/prior_box_op.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ REGISTER_OPERATOR(
215215
paddle::framework::EmptyGradOpMaker<paddle::imperative::OpBase>,
216216
PriorBoxInferShapeFunctor);
217217

218-
REGISTER_OP_CPU_KERNEL(prior_box,
219-
ops::PriorBoxOpKernel<float, float>,
220-
ops::PriorBoxOpKernel<double, double>);
221-
222218
REGISTER_OP_KERNEL_WITH_CUSTOM_TYPE(prior_box,
223219
MKLDNN,
224220
::paddle::platform::CPUPlace,

‎paddle/fluid/operators/detection/prior_box_op.cu‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,3 @@ class PriorBoxOpCUDAKernel : public framework::OpKernel<T> {
194194

195195
} // namespace operators
196196
} // namespace paddle
197-
198-
namespace ops = paddle::operators;
199-
REGISTER_OP_CUDA_KERNEL(prior_box,
200-
ops::PriorBoxOpCUDAKernel<float>,
201-
ops::PriorBoxOpCUDAKernel<double>);

‎paddle/phi/api/yaml/generator/api_base.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ def parse_input_and_attr(self, api_name, args_config, optional_vars=[]):
141141
'DataType': 'DataType',
142142
'int64_t[]': 'const std::vector<int64_t>&',
143143
'int[]': 'const std::vector<int>&',
144-
'float[]': 'const std::vector<float>&',
145-
'double[]': 'const std::vector<double>&'
146144
}
147145
optional_types_trans = {
148146
'Tensor': 'const paddle::optional<Tensor>&',

‎paddle/phi/api/yaml/legacy_api.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@
17511751
backward : prelu_grad
17521752

17531753
- api : prior_box
1754-
args : (Tensor x, Tensor y, float[] min_sizes, float[] max_sizes, float[] aspect_ratios, float[] variances, bool flip, bool clip, float step_w, float step_h, float offset, bool min_max_aspect_ratios_order, bool use_mkldnn, bool use_quantizer, str mkldnn_data_type)
1754+
args : (Tensor input, Tensor image, float[] min_sizes, float[] aspect_ratios, float[] variances, float[] max_sizes = {}, bool flip=true, bool clip=true, float step_w=0.0, float step_h=0.0, float offset=0.5, bool min_max_aspect_ratios_order=false)
17551755
output : Tensor(out), Tensor(var)
17561756
infer_meta :
17571757
func : PriorBoxInferMeta

‎paddle/phi/infermeta/binary.cc‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,25 +1833,22 @@ inline void ExpandAspectRatios(const std::vector<float>& input_aspect_ratior,
18331833
}
18341834
}
18351835

1836-
void PriorBoxInferMeta(const MetaTensor& x,
1837-
const MetaTensor& y,
1836+
void PriorBoxInferMeta(const MetaTensor& input,
1837+
const MetaTensor& image,
18381838
const std::vector<float>& min_sizes,
1839-
const std::vector<float>& max_sizes,
18401839
const std::vector<float>& aspect_ratios,
18411840
const std::vector<float>& variances,
1841+
const std::vector<float>& max_sizes,
18421842
bool flip,
18431843
bool clip,
18441844
float step_w,
18451845
float step_h,
18461846
float offset,
18471847
bool min_max_aspect_ratios_order,
1848-
bool use_mkldnn,
1849-
bool use_quantizer,
1850-
const std::string& mkldnn_data_type,
18511848
MetaTensor* out,
18521849
MetaTensor* var) {
1853-
auto image_dims = y.dims();
1854-
auto input_dims = x.dims();
1850+
auto image_dims = image.dims();
1851+
auto input_dims = input.dims();
18551852

18561853
PADDLE_ENFORCE_EQ(
18571854
image_dims.size(),
@@ -1910,6 +1907,8 @@ void PriorBoxInferMeta(const MetaTensor& x,
19101907
dim_vec[2] = num_priors;
19111908
dim_vec[3] = 4;
19121909

1910+
out->set_dtype(input.dtype());
1911+
var->set_dtype(input.dtype());
19131912
out->set_dims(phi::make_ddim(dim_vec));
19141913
var->set_dims(phi::make_ddim(dim_vec));
19151914
}

‎paddle/phi/infermeta/binary.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,21 +256,18 @@ void PReluInferMeta(const MetaTensor& x,
256256
MetaTensor* out,
257257
MetaConfig config = MetaConfig());
258258

259-
void PriorBoxInferMeta(const MetaTensor& x,
260-
const MetaTensor& y,
259+
void PriorBoxInferMeta(const MetaTensor& input,
260+
const MetaTensor& image,
261261
const std::vector<float>& min_sizes,
262-
const std::vector<float>& max_sizes,
263262
const std::vector<float>& aspect_ratios,
264263
const std::vector<float>& variances,
264+
const std::vector<float>& max_sizes,
265265
bool flip,
266266
bool clip,
267267
float step_w,
268268
float step_h,
269269
float offset,
270270
bool min_max_aspect_ratios_order,
271-
bool use_mkldnn,
272-
bool use_quantizer,
273-
const std::string& mkldnn_data_type,
274271
MetaTensor* out,
275272
MetaTensor* var);
276273

‎paddle/phi/kernels/cpu/prior_box_kernel.cc‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,25 @@
1414

1515
#include "paddle/phi/kernels/prior_box_kernel.h"
1616

17-
#include "paddle/phi/backends/cpu/cpu_context.h"
18-
#include "paddle/phi/common/complex.h"
1917
#include "paddle/phi/core/kernel_registry.h"
2018
#include "paddle/phi/kernels/funcs/eigen/common.h"
2119

2220
namespace phi {
2321

2422
template <typename T, typename Context>
2523
void PriorBoxKernel(const Context& ctx,
26-
const DenseTensor& x,
27-
const DenseTensor& y,
24+
const DenseTensor& input,
25+
const DenseTensor& image,
2826
const std::vector<float>& min_sizes,
29-
const std::vector<float>& max_sizes,
3027
const std::vector<float>& aspect_ratios,
3128
const std::vector<float>& variances,
29+
const std::vector<float>& max_sizes,
3230
bool flip,
3331
bool clip,
3432
float step_w,
3533
float step_h,
3634
float offset,
3735
bool min_max_aspect_ratios_order,
38-
bool use_mkldnn,
39-
bool use_quantizer,
40-
const std::string& mkldnn_data_type,
4136
DenseTensor* out,
4237
DenseTensor* var) {
4338
std::vector<float> new_aspect_ratios;
@@ -47,11 +42,11 @@ void PriorBoxKernel(const Context& ctx,
4742
T new_step_h = static_cast<T>(step_h);
4843
T new_offset = static_cast<T>(offset);
4944

50-
auto img_width = y.dims()[3];
51-
auto img_height = y.dims()[2];
45+
auto img_width = image.dims()[3];
46+
auto img_height = image.dims()[2];
5247

53-
auto feature_width = x.dims()[3];
54-
auto feature_height = x.dims()[2];
48+
auto feature_width = input.dims()[3];
49+
auto feature_height = input.dims()[2];
5550

5651
T step_width, step_height;
5752
if (new_step_w == 0 || new_step_h == 0) {

‎paddle/phi/kernels/gpu/prior_box_kernel.cu‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,21 +108,18 @@ __global__ void SetVariance(T* out,
108108

109109
template <typename T, typename Context>
110110
void PriorBoxKernel(const Context& ctx,
111-
const DenseTensor& x,
112-
const DenseTensor& y,
111+
const DenseTensor& input,
112+
const DenseTensor& image,
113113
const std::vector<float>& min_sizes,
114-
const std::vector<float>& max_sizes,
115114
const std::vector<float>& aspect_ratios,
116115
const std::vector<float>& variances,
116+
const std::vector<float>& max_sizes,
117117
bool flip,
118118
bool clip,
119119
float step_w,
120120
float step_h,
121121
float offset,
122122
bool min_max_aspect_ratios_order,
123-
bool use_mkldnn,
124-
bool use_quantizer,
125-
const std::string& mkldnn_data_type,
126123
DenseTensor* out,
127124
DenseTensor* var) {
128125
std::vector<float> new_aspect_ratios;
@@ -132,11 +129,11 @@ void PriorBoxKernel(const Context& ctx,
132129
T new_step_h = static_cast<T>(step_h);
133130
T new_offset = static_cast<T>(offset);
134131

135-
auto im_width = y.dims()[3];
136-
auto im_height = y.dims()[2];
132+
auto im_width = image.dims()[3];
133+
auto im_height = image.dims()[2];
137134

138-
auto width = x.dims()[3];
139-
auto height = x.dims()[2];
135+
auto width = input.dims()[3];
136+
auto height = input.dims()[2];
140137

141138
T step_width, step_height;
142139
if (new_step_w == 0 || new_step_h == 0) {
@@ -159,8 +156,8 @@ void PriorBoxKernel(const Context& ctx,
159156

160157
auto stream = ctx.stream();
161158

162-
out->mutable_data<T>(ctx.GetPlace());
163-
var->mutable_data<T>(ctx.GetPlace());
159+
ctx.template Alloc<T>(out);
160+
ctx.template Alloc<T>(var);
164161

165162
DenseTensor r;
166163
paddle::framework::TensorFromVector(new_aspect_ratios, ctx, &r);

‎paddle/phi/kernels/prior_box_kernel.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,23 @@
1515
#pragma once
1616

1717
#include "paddle/phi/core/dense_tensor.h"
18-
#include "paddle/phi/core/device_context.h"
1918

2019
namespace phi {
2120

2221
template <typename T, typename Context>
2322
void PriorBoxKernel(const Context& ctx,
24-
const DenseTensor& x,
25-
const DenseTensor& y,
23+
const DenseTensor& input,
24+
const DenseTensor& image,
2625
const std::vector<float>& min_sizes,
27-
const std::vector<float>& max_sizes,
2826
const std::vector<float>& aspect_ratios,
2927
const std::vector<float>& variances,
28+
const std::vector<float>& max_sizes,
3029
bool flip,
3130
bool clip,
3231
float step_w,
3332
float step_h,
3433
float offset,
3534
bool min_max_aspect_ratios_order,
36-
bool use_mkldnn,
37-
bool use_quantizer,
38-
const std::string& mkldnn_data_type,
3935
DenseTensor* out,
4036
DenseTensor* var);
4137

0 commit comments

Comments
 (0)