mirror of
https://github.com/ggerganov/llama.cpp.git
synced 2024-12-25 10:54:36 +00:00
CUDA: fix variable name conflict for Windows build (#9382)
This commit is contained in:
parent
5ed087573e
commit
8e6e2fbe14
@ -1,13 +1,15 @@
|
|||||||
|
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_USE_MUSA)
|
||||||
|
// On Windows CUB uses libraries with variables called CC_PASCAL which conflict with the define in common.cuh.
|
||||||
|
// For this reason CUB must be included BEFORE anything else.
|
||||||
|
#include <cub/cub.cuh>
|
||||||
|
using namespace cub;
|
||||||
|
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_USE_MUSA)
|
||||||
|
|
||||||
#include "sumrows.cuh"
|
#include "sumrows.cuh"
|
||||||
#include "sum.cuh"
|
#include "sum.cuh"
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_USE_MUSA)
|
|
||||||
#include <cub/cub.cuh>
|
|
||||||
using namespace cub;
|
|
||||||
#endif // !defined(GGML_USE_HIPBLAS) && !defined(GGML_USE_MUSA)
|
|
||||||
|
|
||||||
void sum_f32_cuda(ggml_cuda_pool & pool, const float * x, float * dst, const int64_t ne, cudaStream_t stream) {
|
void sum_f32_cuda(ggml_cuda_pool & pool, const float * x, float * dst, const int64_t ne, cudaStream_t stream) {
|
||||||
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_USE_MUSA)
|
#if !defined(GGML_USE_HIPBLAS) && !defined(GGML_USE_MUSA)
|
||||||
size_t tmp_size = 0;
|
size_t tmp_size = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user