Skip to content
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.

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

[Fluid] move assign_pos to phi #55794

Merged
merged 6 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions paddle/fluid/operators/assign_pos_op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */

#include "paddle/fluid/operators/assign_pos_op.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/op_registry.h"

namespace paddle {
namespace operators {
Expand Down Expand Up @@ -78,6 +80,3 @@ namespace plat = paddle::platform;
REGISTER_OP_WITHOUT_GRADIENT(assign_pos,
ops::AssignPosOp,
ops::AssignPosOpMaker);

PD_REGISTER_STRUCT_KERNEL(
assign_pos, CPU, ALL_LAYOUT, ops::AssignPosOpCPUKernel, int, int64_t) {}
107 changes: 0 additions & 107 deletions paddle/fluid/operators/assign_pos_op.cu

This file was deleted.

33 changes: 0 additions & 33 deletions paddle/fluid/operators/assign_pos_op.h

This file was deleted.

28 changes: 28 additions & 0 deletions paddle/phi/kernels/assign_pos_kernel.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#pragma once

#include "paddle/phi/core/dense_tensor.h"

namespace phi {

template <typename T, typename Context>
void AssignPosKernel(const Context& dev_ctx,
const DenseTensor& x,
const DenseTensor& cum_count,
const DenseTensor& eff_num_len,
DenseTensor* out);

} // namespace phi
34 changes: 34 additions & 0 deletions paddle/phi/kernels/cpu/assign_pos_kernel.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/phi/kernels/assign_pos_kernel.h"
#include "paddle/phi/core/errors.h"
#include "paddle/phi/core/kernel_registry.h"

namespace phi {

template <typename T, typename Context>
void AssignPosKernel(const Context& dev_ctx,
const DenseTensor& x,
const DenseTensor& cum_count,
const DenseTensor& eff_num_len,
DenseTensor* out) {
PADDLE_THROW(phi::errors::Unavailable(
"Do not support assign pos op for cpu kernel now."));
}

} // namespace phi

PD_REGISTER_KERNEL(
assign_pos, CPU, ALL_LAYOUT, phi::AssignPosKernel, int, int64_t) {}
89 changes: 89 additions & 0 deletions paddle/phi/kernels/gpu/assign_pos_kernel.cu
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/phi/kernels/assign_pos_kernel.h"
#include "paddle/phi/backends/gpu/gpu_primitives.h"
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/tensor_utils.h"

namespace phi {

static constexpr int kNumCUDAThreads = 512;
static constexpr int kNumMaxinumNumBlocks = 4096;

static inline int NumBlocks(const int N) {
return std::min((N + kNumCUDAThreads - 1) / kNumCUDAThreads,
kNumMaxinumNumBlocks);
}

template <typename T>
__global__ void AssignPos(T* cum_count,
const T* numbers,
T* out,
int64_t limit) {
CUDA_KERNEL_LOOP(i, limit) {
int number_idx = numbers[i];
if (number_idx > -1) {
int p = phi::CudaAtomicAdd(cum_count + number_idx, -1);
out[p - 1] = i;
}
}
}

template <typename T, typename Context>
void AssignPosKernel(const Context& dev_ctx,
const DenseTensor& x,
const DenseTensor& cum_count,
const DenseTensor& eff_num_len,
DenseTensor* out) {
// assign pos decides which tokens should be fetched belong to specially
// counter orderingly.
auto cum_count_ptr = &cum_count; // (counter number) int32 | int64
auto numbers = &x; // (batch_size * seq_len, topk) int32
auto eff_num_len_ptr = &eff_num_len; // (sum(cum_count))
auto out_ptr = &out; // (cum_count) value ranges
// from 0 to batch_size *
// seq_len * topk
auto numel = numbers->numel();
T* cum_data = const_cast<T*>(cum_count_ptr->data<T>());
auto cum_size = cum_count_ptr->numel();

phi::DenseTensor cpu_eff_num_len;
int64_t cpu_eff_num_len_data = 0;
bool is_cpu_place = eff_num_len_ptr->place() == phi::CPUPlace();
if (is_cpu_place) {
cpu_eff_num_len_data = eff_num_len_ptr->data<T>()[0];
} else {
phi::Copy(dev_ctx, eff_num_len, phi::CPUPlace(), false, &cpu_eff_num_len);
cpu_eff_num_len_data = cpu_eff_num_len.data<T>()[0];
}

phi::DDim out_dims = phi::make_ddim({cpu_eff_num_len_data});
out->Resize(out_dims);
auto out_data = dev_ctx.template Alloc<T>(out);

const T* num_data = numbers->data<T>();

int blocks = NumBlocks(numel);
int threads = kNumCUDAThreads;

AssignPos<T><<<blocks, threads, 0, dev_ctx.stream()>>>(
cum_data, num_data, out_data, numel);
}

} // namespace phi

PD_REGISTER_KERNEL(assign_pos, GPU, ALL_LAYOUT, phi::AssignPosKernel, int64_t) {
}
27 changes: 27 additions & 0 deletions paddle/phi/ops/compat/assign_pos_sig.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/* Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */

#include "paddle/phi/core/compat/op_utils.h"

namespace phi {

KernelSignature AssignPosOpArgumentMapping(
const ArgumentMappingContext& ctx UNUSED) {
return KernelSignature(
"assign_pos", {"X", "cum_count", "eff_num_len"}, {}, {"Out"});
}

} // namespace phi

PD_REGISTER_ARG_MAPPING_FN(assign_pos, phi::AssignPosOpArgumentMapping);
3 changes: 2 additions & 1 deletion test/legacy_test/test_assign_pos_op.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ def setUp(self):
self.cum_count = cum_count

def test_forward(self):
paddle.enable_static()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥改成测静态图?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review意见一直在pending,忘记点submit了...抱歉

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个算子没有对应的python API,迁移之后会报类似下面的这个错误,所以这里就改成只测试静态图的了:

image

np.testing.assert_allclose = get_redefined_allclose(self.cum_count)
self.check_output_with_place(paddle.CUDAPlace(0))
self.check_output_with_place(paddle.CUDAPlace(0), check_dygraph=False)


@unittest.skipIf(
Expand Down