@@ -370,12 +370,6 @@ struct ggml_cuda_pool {
370
370
371
371
virtual void * alloc (size_t size, size_t * actual_size) = 0;
372
372
virtual void free (void * ptr, size_t size) = 0;
373
-
374
- ggml_cuda_pool () = default ;
375
- ggml_cuda_pool (const ggml_cuda_pool &) = delete ;
376
- ggml_cuda_pool (ggml_cuda_pool &&) = delete ;
377
- ggml_cuda_pool& operator =(const ggml_cuda_pool &) = delete ;
378
- ggml_cuda_pool& operator =(ggml_cuda_pool &&) = delete ;
379
373
};
380
374
381
375
struct ggml_cuda_pool_leg : public ggml_cuda_pool {
@@ -6969,7 +6963,7 @@ static __global__ void k_sum_rows_f32(const float * x, float * dst, const int nc
6969
6963
}
6970
6964
6971
6965
template <typename T>
6972
- static inline __device__ void swap (T & a, T & b) {
6966
+ static inline __device__ void ggml_cuda_swap (T & a, T & b) {
6973
6967
T tmp = a;
6974
6968
a = b;
6975
6969
b = tmp;
@@ -6998,11 +6992,11 @@ static __global__ void k_argsort_f32_i32(const float * x, int * dst, const int n
6998
6992
if (ixj > col) {
6999
6993
if ((col & k) == 0 ) {
7000
6994
if (order == GGML_SORT_ORDER_ASC ? x_row[dst_row[col]] > x_row[dst_row[ixj]] : x_row[dst_row[col]] < x_row[dst_row[ixj]]) {
7001
- swap (dst_row[col], dst_row[ixj]);
6995
+ ggml_cuda_swap (dst_row[col], dst_row[ixj]);
7002
6996
}
7003
6997
} else {
7004
6998
if (order == GGML_SORT_ORDER_ASC ? x_row[dst_row[col]] < x_row[dst_row[ixj]] : x_row[dst_row[col]] > x_row[dst_row[ixj]]) {
7005
- swap (dst_row[col], dst_row[ixj]);
6999
+ ggml_cuda_swap (dst_row[col], dst_row[ixj]);
7006
7000
}
7007
7001
}
7008
7002
}
0 commit comments