vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix new warnings after merge

Browse source
This commit is contained in:
Cebtenzzre 2023-09-28 16:47:41 -04:00
parent 4b90878b36
commit 39b566393f
1 changed files with 12 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

48
ggml.c
View file

@ -5228,29 +5228,17 @@ int32_t ggml_get_i32_nd(const struct ggml_tensor * tensor, int i0, int i1, int i
void * data = (char *) tensor->data + i0*tensor->nb[0] + i1*tensor->nb[1] + i2*tensor->nb[2] + i3*tensor->nb[3]; void * data = (char *) tensor->data + i0*tensor->nb[0] + i1*tensor->nb[1] + i2*tensor->nb[2] + i3*tensor->nb[3];
switch (tensor->type) { switch (tensor->type) {
case GGML_TYPE_I8: case GGML_TYPE_I8:
{ return ((int8_t *) data)[0];
return ((int8_t *) data)[0];
} break;
case GGML_TYPE_I16: case GGML_TYPE_I16:
{ return ((int16_t *) data)[0];
return ((int16_t *) data)[0];
} break;
case GGML_TYPE_I32: case GGML_TYPE_I32:
{ return ((int32_t *) data)[0];
return ((int32_t *) data)[0];
} break;
case GGML_TYPE_F16: case GGML_TYPE_F16:
{ return GGML_FP16_TO_FP32(((ggml_fp16_t *) data)[0]);
return GGML_FP16_TO_FP32(((ggml_fp16_t *) data)[0]);
} break;
case GGML_TYPE_F32: case GGML_TYPE_F32:
{ return ((float *) data)[0];
return ((float *) data)[0];
} break;
default: default:
{ GGML_ASSERT(false);
GGML_ASSERT(false);
} break;
} }
return 0.0f; return 0.0f;
@ -5371,29 +5359,17 @@ float ggml_get_f32_nd(const struct ggml_tensor * tensor, int i0, int i1, int i2,
void * data = (char *) tensor->data + i0*tensor->nb[0] + i1*tensor->nb[1] + i2*tensor->nb[2] + i3*tensor->nb[3]; void * data = (char *) tensor->data + i0*tensor->nb[0] + i1*tensor->nb[1] + i2*tensor->nb[2] + i3*tensor->nb[3];
switch (tensor->type) { switch (tensor->type) {
case GGML_TYPE_I8: case GGML_TYPE_I8:
{ return ((int8_t *) data)[0];
return ((int8_t *) data)[0];
} break;
case GGML_TYPE_I16: case GGML_TYPE_I16:
{ return ((int16_t *) data)[0];
return ((int16_t *) data)[0];
} break;
case GGML_TYPE_I32: case GGML_TYPE_I32:
{ return ((int32_t *) data)[0];
return ((int32_t *) data)[0];
} break;
case GGML_TYPE_F16: case GGML_TYPE_F16:
{ return GGML_FP16_TO_FP32(((ggml_fp16_t *) data)[0]);
return GGML_FP16_TO_FP32(((ggml_fp16_t *) data)[0]);
} break;
case GGML_TYPE_F32: case GGML_TYPE_F32:
{ return ((float *) data)[0];
return ((float *) data)[0];
} break;
default: default:
{ GGML_ASSERT(false);
GGML_ASSERT(false);
} break;
} }
return 0.0f; return 0.0f;