Procházet zdrojové kódy

CUDA: fix variable name conflict for Windows build (#9382)

Johannes Gäßler před 1 rokem
rodič
revize
8e6e2fbe14
1 změnil soubory, kde provedl 7 přidání a 5 odebrání
  1. 7 5
      ggml/src/ggml-cuda/sum.cu

+ 7 - 5
ggml/src/ggml-cuda/sum.cu

@@ -1,13 +1,15 @@
-#include "sumrows.cuh"
-#include "sum.cuh"
-
-#include <cstdint>
-
 #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 "sum.cuh"
+
+#include <cstdint>
+
 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)
     size_t tmp_size = 0;