Skip to content

update block_radix_topk.cuh namespace #74232

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
merged 5 commits into from
Jul 29, 2025
Merged

update block_radix_topk.cuh namespace #74232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a694f7
fix, test=document_fix
co63oc Jul 24, 2025
b755739
update block_radix_topk.cuh namespace
co63oc Jul 25, 2025
5a224aa
fix
co63oc Jul 25, 2025
993bcd0
Merge branch 'h59' into h60
co63oc Jul 25, 2025
f02e105
Merge branch 'develop' into h60
co63oc Jul 25, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions paddle/phi/kernels/funcs/block_radix_topk.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
#include <cub/util_ptx.cuh>
#include <cub/util_type.cuh>

namespace paddle {
namespace framework {
namespace phi::funcs {

template <typename KeyT,
int BLOCK_SIZE,
Expand Down Expand Up @@ -386,6 +385,5 @@ class BlockRadixTopKRegister {
unsigned int top_k_mask_;
};

}; // namespace framework
}; // namespace paddle
} // namespace phi::funcs
#endif
4 changes: 2 additions & 2 deletions paddle/phi/kernels/gpu/weighted_sample_neighbors_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ __launch_bounds__(BLOCK_SIZE) __global__
bool topk_is_unique;

using BlockRadixSelectT =
paddle::framework::BlockRadixTopKGlobalMemory<float, BLOCK_SIZE, true>;
phi::funcs::BlockRadixTopKGlobalMemory<float, BLOCK_SIZE, true>;
__shared__ typename BlockRadixSelectT::TempStorage share_storage;

BlockRadixSelectT{share_storage}.radixTopKGetThreshold(
Expand Down Expand Up @@ -254,7 +254,7 @@ __launch_bounds__(BLOCK_SIZE) __global__
RandomNumGen rng(gidx, random_seed);
float weight_keys[ITEMS_PER_THREAD];
int neighbor_idxs[ITEMS_PER_THREAD];
using BlockRadixTopKT = paddle::framework::
using BlockRadixTopKT = phi::funcs::
BlockRadixTopKRegister<float, BLOCK_SIZE, ITEMS_PER_THREAD, true, int>;
__shared__ typename BlockRadixTopKT::TempStorage sort_tmp_storage;

Expand Down
19 changes: 0 additions & 19 deletions tools/enforce/count_enforce_by_dir.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,11 @@

# Result Example:

# paddle/fluid/operators/benchmark | 11 | 0 | 11
# paddle/fluid/operators/collective | 28 | 1 | 27
# paddle/fluid/operators/controlflow | 60 | 59 | 1
# paddle/fluid/operators/detail | 2 | 0 | 2
# paddle/fluid/operators/detection | 276 | 146 | 130
# paddle/fluid/operators/distributed/brpc | 17 | 0 | 17
# paddle/fluid/operators/distributed/grpc | 13 | 0 | 13
# paddle/fluid/operators/distributed | 63 | 10 | 53
# paddle/fluid/operators/distributed_ops | 88 | 6 | 82
# paddle/fluid/operators/elementwise/mkldnn | 5 | 5 | 0
# paddle/fluid/operators/elementwise | 29 | 20 | 9
# paddle/fluid/operators/fused | 227 | 182 | 45
# paddle/fluid/operators/jit/gen | 17 | 0 | 17
# paddle/fluid/operators/jit/more/intrinsic | 0 | 0 | 0
# paddle/fluid/operators/jit/more/mix | 1 | 0 | 1
# paddle/fluid/operators/jit/more/mkl | 9 | 0 | 9
# paddle/fluid/operators/jit/more | 0 | 0 | 0
# paddle/fluid/operators/jit/refer | 8 | 0 | 8
# paddle/fluid/operators/jit | 18 | 0 | 18
# paddle/fluid/operators/lite | 2 | 2 | 0
# paddle/fluid/operators/math/detail | 0 | 0 | 0
# paddle/fluid/operators/math | 200 | 7 | 193
# paddle/fluid/operators/metrics | 38 | 29 | 9
# paddle/fluid/operators/onednn | 107 | 14 | 93
# paddle/fluid/operators/nccl | 27 | 0 | 27
# paddle/fluid/operators/optimizers | 214 | 50 | 164
# paddle/fluid/operators/reader | 40 | 14 | 26
Expand Down
Loading