Skip to content

Commit

Permalink
FLUID: move limit_by_capacity to PHI (#55948)
Browse files Browse the repository at this point in the history
  • Loading branch information
yangguohao authored Aug 3, 2023
1 parent 81ccd99 commit 230c6ce
Show file tree
Hide file tree
Showing 7 changed files with 171 additions and 130 deletions.
15 changes: 7 additions & 8 deletions paddle/fluid/operators/limit_by_capacity_op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

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

#if defined(PADDLE_WITH_GLOO)
#include "paddle/fluid/framework/fleet/gloo_wrapper.h"
#endif

namespace paddle {
namespace operators {
Expand Down Expand Up @@ -80,10 +86,3 @@ namespace plat = paddle::platform;
REGISTER_OP_WITHOUT_GRADIENT(limit_by_capacity,
ops::LimitByCapacityOp,
ops::LimitByCapacityOpMaker);

PD_REGISTER_STRUCT_KERNEL(limit_by_capacity,
CPU,
ALL_LAYOUT,
ops::LimitByCapacityOpCPUKernel,
int,
int64_t) {}
85 changes: 0 additions & 85 deletions paddle/fluid/operators/limit_by_capacity_op.cu

This file was deleted.

37 changes: 0 additions & 37 deletions paddle/fluid/operators/limit_by_capacity_op.h

This file was deleted.

41 changes: 41 additions & 0 deletions paddle/phi/kernels/cpu/limit_by_capacity_kernel.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// 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/limit_by_capacity_kernel.h"
#include "paddle/phi/core/errors.h"
#include "paddle/phi/core/kernel_registry.h"

#if defined(PADDLE_WITH_GLOO)
#include "paddle/phi/core/distributed/gloo_comm_context.h"
#endif
namespace phi {

template <typename T, typename Context>
void LimitByCapacityKernel(const Context& dev_ctx,
const DenseTensor& expert_count,
const DenseTensor& capacity,
int n_worker,
DenseTensor* Out) {
PADDLE_THROW(
phi::errors::Unimplemented("limit_by_capacity is not supported on CPU."));
}

} // namespace phi

PD_REGISTER_KERNEL(limit_by_capacity,
CPU,
ALL_LAYOUT,
phi::LimitByCapacityKernel,
int,
int64_t) {}
67 changes: 67 additions & 0 deletions paddle/phi/kernels/gpu/limit_by_capacity_kernel.cu
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// 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/limit_by_capacity_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 {

template <typename T>
__global__ void limit_by_capacity_impl(
const T* expc, T* cap, T* out, const int n_expert, const int n_worker) {
int eid, wid;
CUDA_KERNEL_LOOP(i, (n_expert * n_worker)) {
wid = i / n_expert;
eid = i % n_expert;
auto proposal = expc[wid * n_expert + eid];
auto cap_left = phi::CudaAtomicAdd(cap + eid, proposal * (-1));
if (cap_left >= proposal) {
out[wid * n_expert + eid] = proposal;
} else if (cap_left >= 0) {
out[wid * n_expert + eid] = cap_left;
} else {
out[wid * n_expert + eid] = 0;
}
}
}

template <typename T, typename Context>
void LimitByCapacityKernel(const Context& dev_ctx,
const DenseTensor& expert_count,
const DenseTensor& capacity,
int n_worker,
DenseTensor* Out) {
auto expert_count_ptr = &expert_count;
auto n_expert = expert_count_ptr->numel() / n_worker;

dim3 grid_dim(256);
dim3 block_dim(1024);
auto out_data = dev_ctx.template Alloc<T>(Out);
const T* ec_data = expert_count_ptr->data<T>();

phi::DenseTensor capacity_copy;
phi::Copy(dev_ctx, capacity, dev_ctx.GetPlace(), false, &capacity_copy);
T* cap_data = dev_ctx.template Alloc<T>(&capacity_copy);

limit_by_capacity_impl<T><<<grid_dim, block_dim, 0, dev_ctx.stream()>>>(
ec_data, cap_data, out_data, n_expert, n_worker);
}

} // namespace phi

PD_REGISTER_KERNEL(
limit_by_capacity, GPU, ALL_LAYOUT, phi::LimitByCapacityKernel, int64_t) {}
28 changes: 28 additions & 0 deletions paddle/phi/kernels/limit_by_capacity_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 LimitByCapacityKernel(const Context& dev_ctx,
const DenseTensor& expert_count,
const DenseTensor& capacity,
int n_worker,
DenseTensor* Out);

} // namespace phi
28 changes: 28 additions & 0 deletions paddle/phi/ops/compat/limit_by_capacity_sig.cc
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.

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

namespace phi {

KernelSignature LimitByCapacityOpArgumentMapping(
const ArgumentMappingContext& ctx UNUSED) {
return KernelSignature(
"limit_by_capacity", {"expert_count", "capacity"}, {"n_worker"}, {"Out"});
}

} // namespace phi

PD_REGISTER_ARG_MAPPING_FN(limit_by_capacity,
phi::LimitByCapacityOpArgumentMapping);

0 comments on commit 230c6ce

Please sign in to comment.