Skip to content

[Bugfix][Hardware][AMD] Use cub_helpers.h in sampler.cu for ROCm namespace alias #31251

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

Closed
c0de128 wants to merge 1 commit into from
Closed

[Bugfix][Hardware][AMD] Use cub_helpers.h in sampler.cu for ROCm namespace alias #31251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion csrc/moe/moe_align_sum_kernels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include <torch/all.h>
#include <ATen/cuda/CUDAContext.h>
#include <c10/cuda/CUDAGuard.h>
#include <cub/cub.cuh>

#include "../cub_helpers.h"

#include <ATen/ATen.h>
#include <ATen/cuda/Atomic.cuh>
Expand Down
11 changes: 8 additions & 3 deletions csrc/moe/permute_unpermute_kernels/moe_permute_unpermute_kernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
#include <c10/core/ScalarType.h>
#include <torch/all.h>
#include "dispatch.h"
#include <cub/cub.cuh>
#include <cub/device/device_radix_sort.cuh>
#include <cub/util_type.cuh>

#include "../cub_helpers.h"
#ifndef USE_ROCM
#include <cub/device/device_radix_sort.cuh>
#include <cub/util_type.cuh>
#else
// hipcub includes these via hipcub.hpp
#endif
#include "cutlass/numeric_size.h"
#include "cutlass/array.h"

Expand Down
6 changes: 1 addition & 5 deletions csrc/sampler.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#include <torch/cuda.h>
#include <c10/cuda/CUDAGuard.h>

#ifndef USE_ROCM
#include <cub/cub.cuh>
#else
#include <hipcub/hipcub.hpp>
#endif
#include "cub_helpers.h"

namespace vllm {

Expand Down