vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-16 20:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup indentation, fixing cublas build

Browse source
This commit is contained in:
Concedo 2023-06-08 22:40:53 +08:00
parent a979e71ddc
commit a6a0fa338a
9 changed files with 933 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

20
otherarch/ggml_v2.c
View file

@ -140,7 +140,7 @@ inline static void* ggml_v2_aligned_malloc(size_t size) {
#elif defined(GGML_USE_OPENBLAS)
#include <cblas.h>
#elif defined(GGML_USE_CUBLAS)
#include "ggml-cuda.h"
#include "ggml_v2-cuda.h"
#endif
#if defined(GGML_USE_CLBLAST)
#include "ggml_v2-opencl.h"
@ -3895,7 +3895,7 @@ struct ggml_v2_context * ggml_v2_init(struct ggml_v2_init_params params) {
}
#if defined(GGML_USE_CUBLAS)
ggml_init_cublas();
ggml_v2_init_cublas();
#elif defined(GGML_USE_CLBLAST)
if(quants_unshuffled)
{
@ -9449,9 +9449,9 @@ static void ggml_v2_compute_forward_mul_mat_f32(
// compute by src0 rows
#if defined(GGML_USE_CUBLAS)
if (ggml_cuda_can_mul_mat(src0, src1, dst)) {
if (ggml_v2_cuda_can_mul_mat(src0, src1, dst)) {
if (params->ith == 0 && params->type == GGML_V2_TASK_COMPUTE) {
ggml_cuda_mul_mat(src0, src1, dst, params->wdata, params->wsize);
ggml_v2_cuda_mul_mat(src0, src1, dst, params->wdata, params->wsize);
}
return;
}
@ -9643,9 +9643,9 @@ static void ggml_v2_compute_forward_mul_mat_f16_f32(
// compute by src0 rows
#if defined(GGML_USE_CUBLAS)
if (ggml_cuda_can_mul_mat(src0, src1, dst)) {
if (ggml_v2_cuda_can_mul_mat(src0, src1, dst)) {
if (params->ith == 0 && params->type == GGML_V2_TASK_COMPUTE) {
ggml_cuda_mul_mat(src0, src1, dst, params->wdata, params->wsize);
ggml_v2_cuda_mul_mat(src0, src1, dst, params->wdata, params->wsize);
}
return;
}
@ -9882,9 +9882,9 @@ static void ggml_v2_compute_forward_mul_mat_q_f32(
// compute by src0 rows
#if defined(GGML_USE_CUBLAS)
if (ggml_cuda_can_mul_mat(src0, src1, dst)) {
if (ggml_v2_cuda_can_mul_mat(src0, src1, dst)) {
if (params->ith == 0 && params->type == GGML_V2_TASK_COMPUTE) {
ggml_cuda_mul_mat(src0, src1, dst, params->wdata, params->wsize);
ggml_v2_cuda_mul_mat(src0, src1, dst, params->wdata, params->wsize);
}
return;
}
@ -14062,10 +14062,10 @@ void ggml_v2_graph_compute(struct ggml_v2_context * ctx, struct ggml_v2_cgraph *
size_t cur = 0;
#if defined(GGML_USE_CUBLAS)
if (ggml_cuda_can_mul_mat(node->src0, node->src1, node)) {
if (ggml_v2_cuda_can_mul_mat(node->src0, node->src1, node)) {
node->n_tasks = 1; // TODO: this actually is doing nothing
// the threads are still spinning
cur = ggml_cuda_mul_mat_get_wsize(node->src0, node->src1, node);
cur = ggml_v2_cuda_mul_mat_get_wsize(node->src0, node->src1, node);
}
else
#elif defined(GGML_USE_CLBLAST)