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

Merge remote-tracking branch 'upstream/master' into gpt-neox

Browse source
This commit is contained in:
Stanisław Szymczyk 2024-05-22 13:26:19 +02:00
commit d8b8ecf885
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ggml-cuda/fattn-tile-f32.cu
View file

@ -283,8 +283,7 @@ void launch_fattn_tile_f32_64_128(ggml_backend_cuda_context & ctx, ggml_tensor *
} }
void ggml_cuda_flash_attn_ext_tile_f32(ggml_backend_cuda_context & ctx, ggml_tensor * dst) { void ggml_cuda_flash_attn_ext_tile_f32(ggml_backend_cuda_context & ctx, ggml_tensor * dst) {
const ggml_tensor * KQV = dst; const ggml_tensor * Q = dst->src[0];
const ggml_tensor * Q = dst->src[0];
if (Q->ne[1] <= 16) { if (Q->ne[1] <= 16) {
constexpr int cols_per_block = 16; constexpr int cols_per_block = 16;

3
llama.cpp
View file

@ -3793,12 +3793,14 @@ static std::string llama_model_ftype_name(llama_ftype ftype) {
static const char * llama_model_type_name(e_model type) { static const char * llama_model_type_name(e_model type) {
switch (type) { switch (type) {
case MODEL_17M: return "17M";
case MODEL_22M: return "22M"; case MODEL_22M: return "22M";
case MODEL_33M: return "33M"; case MODEL_33M: return "33M";
case MODEL_70M: return "70M"; case MODEL_70M: return "70M";
case MODEL_109M: return "109M"; case MODEL_109M: return "109M";
case MODEL_137M: return "137M"; case MODEL_137M: return "137M";
case MODEL_160M: return "160M"; case MODEL_160M: return "160M";
case MODEL_335M: return "335M";
case MODEL_410M: return "410M"; case MODEL_410M: return "410M";
case MODEL_0_5B: return "0.5B"; case MODEL_0_5B: return "0.5B";
case MODEL_1B: return "1B"; case MODEL_1B: return "1B";
@ -3806,6 +3808,7 @@ static const char * llama_model_type_name(e_model type) {
case MODEL_2B: return "2B"; case MODEL_2B: return "2B";
case MODEL_2_8B: return "2.8B"; case MODEL_2_8B: return "2.8B";
case MODEL_3B: return "3B"; case MODEL_3B: return "3B";
case MODEL_4B: return "4B";
case MODEL_6_9B: return "6.9B"; case MODEL_6_9B: return "6.9B";
case MODEL_7B: return "7B"; case MODEL_7B: return "7B";
case MODEL_8B: return "8B"; case MODEL_8B: return "8B";