Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Per token attributes #7685

Merged
merged 10 commits into from
Jun 4, 2024
Merged

Conversation

jaime-m-p
Copy link
Collaborator

Token attributes may differ from model to model.
This is affecting the special token splitting.

This PR implements a general way to manage per token attributes.
For now only attributes lstrip and rstrip are implemented, neccesary for models phi-3 and jina-v2-es/de.

phi-3/tokenizer_config.json:

    "2": {
      "content": "</s>",
      "lstrip": false,
      "normalized": false,
      "rstrip": true,  <--
      "single_word": false,
      "special": false
    },

dolphin-2.8-mistral-7b-v02/tokenizer_config.json:

    "2": {
      "content": "</s>",
      "lstrip": false,
      "normalized": false,
      "rstrip": false,  <--
      "single_word": false,
      "special": true
    },

This information is currently not stored in the GGUF (WIP #7379).
I'm using harcoded attributes and tokenizer/model names until we have a better option.

@github-actions github-actions bot added testing Everything test related python python script changes labels Jun 1, 2024
@jaime-m-p jaime-m-p force-pushed the per-token-attribs branch from cc55198 to 01c9229 Compare June 1, 2024 23:47
@mofosyne mofosyne added the Review Complexity : Medium Generally require more time to grok but manageable by beginner to medium expertise level label Jun 3, 2024
llama.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Jun 3, 2024

📈 llama.cpp server for bench-server-baseline on Standard_NC4as_T4_v3 for phi-2-q4_0: 530 iterations 🚀

Expand details for performance related PR only
  • Concurrent users: 8, duration: 10m
  • HTTP request : avg=8815.15ms p(95)=21280.5ms fails=, finish reason: stop=471 truncated=59
  • Prompt processing (pp): avg=96.72tk/s p(95)=373.24tk/s
  • Token generation (tg): avg=45.88tk/s p(95)=49.54tk/s
  • ggml-org/models/phi-2/ggml-model-q4_0.gguf parallel=8 ctx-size=16384 ngl=33 batch-size=2048 ubatch-size=256 pp=1024 pp+tg=2048 branch=per-token-attribs commit=ac40ff0e5049eb7f1674e44f571a791612d3735a

prompt_tokens_seconds

More
---
config:
    xyChart:
        titleFontSize: 12
        width: 900
        height: 600
    themeVariables:
        xyChart:
            titleColor: "#000000"
---
xychart-beta
    title "llama.cpp bench-server-baseline on Standard_NC4as_T4_v3
 duration=10m 530 iterations"
    y-axis "llamacpp:prompt_tokens_seconds"
    x-axis "llamacpp:prompt_tokens_seconds" 1717429075 --> 1717429697
    line [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 577.66, 577.66, 577.66, 577.66, 577.66, 559.23, 559.23, 559.23, 559.23, 559.23, 564.02, 564.02, 564.02, 564.02, 564.02, 606.33, 606.33, 606.33, 606.33, 606.33, 668.3, 668.3, 668.3, 668.3, 668.3, 684.06, 684.06, 684.06, 684.06, 684.06, 701.5, 701.5, 701.5, 701.5, 701.5, 727.8, 727.8, 727.8, 727.8, 727.8, 728.12, 728.12, 728.12, 728.12, 728.12, 741.81, 741.81, 741.81, 741.81, 741.81, 775.06, 775.06, 775.06, 775.06, 775.06, 773.56, 773.56, 773.56, 773.56, 773.56, 770.63, 770.63, 770.63, 770.63, 770.63, 820.28, 820.28, 820.28, 820.28, 820.28, 830.79, 830.79, 830.79, 830.79, 830.79, 832.6, 832.6, 832.6, 832.6, 832.6, 835.21, 835.21, 835.21, 835.21, 835.21, 833.47, 833.47, 833.47, 833.47, 833.47, 855.03, 855.03, 855.03, 855.03, 855.03, 859.49, 859.49, 859.49, 859.49, 859.49, 858.37, 858.37, 858.37, 858.37, 858.37, 849.15, 849.15, 849.15, 849.15, 849.15, 851.74, 851.74, 851.74, 851.74, 851.74, 825.35, 825.35, 825.35, 825.35, 825.35, 826.58, 826.58, 826.58, 826.58, 826.58, 829.09, 829.09, 829.09, 829.09, 829.09, 843.37, 843.37, 843.37, 843.37, 843.37, 841.14, 841.14, 841.14, 841.14, 841.14, 839.46, 839.46, 839.46, 839.46, 839.46, 840.05, 840.05, 840.05, 840.05, 840.05, 844.95, 844.95, 844.95, 844.95, 844.95, 844.53, 844.53, 844.53, 844.53, 844.53, 842.54, 842.54, 842.54, 842.54, 842.54, 838.54, 838.54, 838.54, 838.54, 838.54, 850.95, 850.95, 850.95, 850.95, 850.95, 855.16, 855.16, 855.16, 855.16, 855.16, 840.27, 840.27, 840.27, 840.27, 840.27, 838.2, 838.2, 838.2, 838.2, 838.2, 841.51, 841.51, 841.51, 841.51, 841.51, 844.15, 844.15, 844.15, 844.15, 844.15, 844.16, 844.16, 844.16, 844.16, 844.16, 852.38, 852.38, 852.38, 852.38, 852.38, 854.07, 854.07, 854.07, 854.07, 854.07, 842.16, 842.16, 842.16, 842.16, 842.16, 841.07, 841.07, 841.07, 841.07, 841.07, 838.29, 838.29, 838.29, 838.29, 838.29, 839.92, 839.92, 839.92, 839.92, 839.92, 836.22, 836.22, 836.22, 836.22, 836.22, 832.79, 832.79, 832.79, 832.79, 832.79, 834.04, 834.04, 834.04, 834.04, 834.04, 831.66, 831.66, 831.66, 831.66, 831.66, 831.05, 831.05, 831.05, 831.05, 831.05, 832.46, 832.46, 832.46, 832.46, 832.46, 836.91, 836.91, 836.91, 836.91, 836.91, 835.9, 835.9, 835.9, 835.9, 835.9, 840.17, 840.17, 840.17, 840.17, 840.17, 841.29, 841.29, 841.29, 841.29, 841.29, 842.21, 842.21, 842.21, 842.21, 842.21, 841.57, 841.57, 841.57, 841.57, 841.57, 842.87, 842.87, 842.87, 842.87, 842.87, 842.48, 842.48]
                    
Loading
predicted_tokens_seconds
More
---
config:
    xyChart:
        titleFontSize: 12
        width: 900
        height: 600
    themeVariables:
        xyChart:
            titleColor: "#000000"
---
xychart-beta
    title "llama.cpp bench-server-baseline on Standard_NC4as_T4_v3
 duration=10m 530 iterations"
    y-axis "llamacpp:predicted_tokens_seconds"
    x-axis "llamacpp:predicted_tokens_seconds" 1717429075 --> 1717429697
    line [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 43.7, 43.7, 43.7, 43.7, 43.7, 43.79, 43.79, 43.79, 43.79, 43.79, 28.48, 28.48, 28.48, 28.48, 28.48, 30.61, 30.61, 30.61, 30.61, 30.61, 31.88, 31.88, 31.88, 31.88, 31.88, 32.98, 32.98, 32.98, 32.98, 32.98, 34.75, 34.75, 34.75, 34.75, 34.75, 35.27, 35.27, 35.27, 35.27, 35.27, 35.21, 35.21, 35.21, 35.21, 35.21, 34.9, 34.9, 34.9, 34.9, 34.9, 34.22, 34.22, 34.22, 34.22, 34.22, 34.03, 34.03, 34.03, 34.03, 34.03, 33.98, 33.98, 33.98, 33.98, 33.98, 33.3, 33.3, 33.3, 33.3, 33.3, 33.19, 33.19, 33.19, 33.19, 33.19, 31.33, 31.33, 31.33, 31.33, 31.33, 30.69, 30.69, 30.69, 30.69, 30.69, 31.05, 31.05, 31.05, 31.05, 31.05, 30.87, 30.87, 30.87, 30.87, 30.87, 30.92, 30.92, 30.92, 30.92, 30.92, 30.9, 30.9, 30.9, 30.9, 30.9, 30.92, 30.92, 30.92, 30.92, 30.92, 31.04, 31.04, 31.04, 31.04, 31.04, 31.12, 31.12, 31.12, 31.12, 31.12, 30.94, 30.94, 30.94, 30.94, 30.94, 31.22, 31.22, 31.22, 31.22, 31.22, 31.12, 31.12, 31.12, 31.12, 31.12, 31.08, 31.08, 31.08, 31.08, 31.08, 31.09, 31.09, 31.09, 31.09, 31.09, 31.24, 31.24, 31.24, 31.24, 31.24, 31.28, 31.28, 31.28, 31.28, 31.28, 31.29, 31.29, 31.29, 31.29, 31.29, 31.35, 31.35, 31.35, 31.35, 31.35, 31.44, 31.44, 31.44, 31.44, 31.44, 31.29, 31.29, 31.29, 31.29, 31.29, 31.19, 31.19, 31.19, 31.19, 31.19, 30.87, 30.87, 30.87, 30.87, 30.87, 30.99, 30.99, 30.99, 30.99, 30.99, 31.2, 31.2, 31.2, 31.2, 31.2, 31.29, 31.29, 31.29, 31.29, 31.29, 31.35, 31.35, 31.35, 31.35, 31.35, 31.39, 31.39, 31.39, 31.39, 31.39, 31.14, 31.14, 31.14, 31.14, 31.14, 31.05, 31.05, 31.05, 31.05, 31.05, 30.68, 30.68, 30.68, 30.68, 30.68, 29.35, 29.35, 29.35, 29.35, 29.35, 29.3, 29.3, 29.3, 29.3, 29.3, 29.19, 29.19, 29.19, 29.19, 29.19, 29.19, 29.19, 29.19, 29.19, 29.19, 29.26, 29.26, 29.26, 29.26, 29.26, 29.29, 29.29, 29.29, 29.29, 29.29, 29.3, 29.3, 29.3, 29.3, 29.3, 29.29, 29.29, 29.29, 29.29, 29.29, 29.23, 29.23, 29.23, 29.23, 29.23, 29.17, 29.17, 29.17, 29.17, 29.17, 29.08, 29.08, 29.08, 29.08, 29.08, 29.04, 29.04, 29.04, 29.04, 29.04, 29.01, 29.01, 29.01, 29.01, 29.01, 29.11, 29.11, 29.11, 29.11, 29.11, 29.22, 29.22, 29.22, 29.22, 29.22, 29.28, 29.28]
                    
Loading

Details

kv_cache_usage_ratio

More
---
config:
    xyChart:
        titleFontSize: 12
        width: 900
        height: 600
    themeVariables:
        xyChart:
            titleColor: "#000000"
---
xychart-beta
    title "llama.cpp bench-server-baseline on Standard_NC4as_T4_v3
 duration=10m 530 iterations"
    y-axis "llamacpp:kv_cache_usage_ratio"
    x-axis "llamacpp:kv_cache_usage_ratio" 1717429075 --> 1717429697
    line [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.11, 0.11, 0.11, 0.11, 0.11, 0.48, 0.48, 0.48, 0.48, 0.48, 0.17, 0.17, 0.17, 0.17, 0.17, 0.16, 0.16, 0.16, 0.16, 0.16, 0.2, 0.2, 0.2, 0.2, 0.2, 0.13, 0.13, 0.13, 0.13, 0.13, 0.11, 0.11, 0.11, 0.11, 0.11, 0.18, 0.18, 0.18, 0.18, 0.18, 0.18, 0.18, 0.18, 0.18, 0.18, 0.21, 0.21, 0.21, 0.21, 0.21, 0.18, 0.18, 0.18, 0.18, 0.18, 0.1, 0.1, 0.1, 0.1, 0.1, 0.32, 0.32, 0.32, 0.32, 0.32, 0.38, 0.38, 0.38, 0.38, 0.38, 0.36, 0.36, 0.36, 0.36, 0.36, 0.38, 0.38, 0.38, 0.38, 0.38, 0.17, 0.17, 0.17, 0.17, 0.17, 0.12, 0.12, 0.12, 0.12, 0.12, 0.14, 0.14, 0.14, 0.14, 0.14, 0.13, 0.13, 0.13, 0.13, 0.13, 0.22, 0.22, 0.22, 0.22, 0.22, 0.12, 0.12, 0.12, 0.12, 0.12, 0.19, 0.19, 0.19, 0.19, 0.19, 0.32, 0.32, 0.32, 0.32, 0.32, 0.1, 0.1, 0.1, 0.1, 0.1, 0.14, 0.14, 0.14, 0.14, 0.14, 0.31, 0.31, 0.31, 0.31, 0.31, 0.18, 0.18, 0.18, 0.18, 0.18, 0.13, 0.13, 0.13, 0.13, 0.13, 0.15, 0.15, 0.15, 0.15, 0.15, 0.21, 0.21, 0.21, 0.21, 0.21, 0.19, 0.19, 0.19, 0.19, 0.19, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.28, 0.28, 0.28, 0.28, 0.28, 0.19, 0.19, 0.19, 0.19, 0.19, 0.3, 0.3, 0.3, 0.3, 0.3, 0.06, 0.06, 0.06, 0.06, 0.06, 0.12, 0.12, 0.12, 0.12, 0.12, 0.18, 0.18, 0.18, 0.18, 0.18, 0.15, 0.15, 0.15, 0.15, 0.15, 0.25, 0.25, 0.25, 0.25, 0.25, 0.55, 0.55, 0.55, 0.55, 0.55, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.33, 0.33, 0.33, 0.33, 0.33, 0.19, 0.19, 0.19, 0.19, 0.19, 0.32, 0.32, 0.32, 0.32, 0.32, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.22, 0.22, 0.22, 0.22, 0.22, 0.23, 0.23, 0.23, 0.23, 0.23, 0.2, 0.2, 0.2, 0.2, 0.2, 0.28, 0.28, 0.28, 0.28, 0.28, 0.26, 0.26, 0.26, 0.26, 0.26, 0.24, 0.24, 0.24, 0.24, 0.24, 0.18, 0.18, 0.18, 0.18, 0.18, 0.16, 0.16, 0.16, 0.16, 0.16, 0.15, 0.15, 0.15, 0.15, 0.15, 0.12, 0.12, 0.12, 0.12, 0.12, 0.15, 0.15]
                    
Loading
requests_processing
More
---
config:
    xyChart:
        titleFontSize: 12
        width: 900
        height: 600
    themeVariables:
        xyChart:
            titleColor: "#000000"
---
xychart-beta
    title "llama.cpp bench-server-baseline on Standard_NC4as_T4_v3
 duration=10m 530 iterations"
    y-axis "llamacpp:requests_processing"
    x-axis "llamacpp:requests_processing" 1717429075 --> 1717429697
    line [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 8.0, 8.0, 8.0, 8.0, 8.0, 6.0, 6.0, 6.0, 6.0, 6.0, 4.0, 4.0, 4.0, 4.0, 4.0, 3.0, 3.0, 3.0, 3.0, 3.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 7.0, 7.0, 7.0, 7.0, 7.0, 7.0, 7.0, 7.0, 7.0, 7.0, 5.0, 5.0, 5.0, 5.0, 5.0, 7.0, 7.0, 7.0, 7.0, 7.0, 6.0, 6.0, 6.0, 6.0, 6.0, 7.0, 7.0, 7.0, 7.0, 7.0, 8.0, 8.0, 8.0, 8.0, 8.0, 5.0, 5.0, 5.0, 5.0, 5.0, 3.0, 3.0, 3.0, 3.0, 3.0, 4.0, 4.0, 4.0, 4.0, 4.0, 4.0, 4.0, 4.0, 4.0, 4.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 6.0, 6.0, 6.0, 6.0, 6.0, 5.0, 5.0, 5.0, 5.0, 5.0, 8.0, 8.0, 8.0, 8.0, 8.0, 3.0, 3.0, 3.0, 3.0, 3.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 7.0, 7.0, 7.0, 7.0, 7.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 4.0, 4.0, 4.0, 4.0, 4.0, 8.0, 8.0, 8.0, 8.0, 8.0, 2.0, 2.0, 2.0, 2.0, 2.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 4.0, 4.0, 4.0, 4.0, 4.0, 3.0, 3.0, 3.0, 3.0, 3.0, 4.0, 4.0, 4.0, 4.0, 4.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 5.0, 7.0, 7.0, 7.0, 7.0, 7.0, 8.0, 8.0, 8.0, 8.0, 8.0, 7.0, 7.0, 7.0, 7.0, 7.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 8.0, 2.0, 2.0, 2.0, 2.0, 2.0, 6.0, 6.0, 6.0, 6.0, 6.0, 3.0, 3.0, 3.0, 3.0, 3.0, 6.0, 6.0, 6.0, 6.0, 6.0, 3.0, 3.0, 3.0, 3.0, 3.0, 5.0, 5.0, 5.0, 5.0, 5.0, 8.0, 8.0, 8.0, 8.0, 8.0, 7.0, 7.0, 7.0, 7.0, 7.0, 6.0, 6.0, 6.0, 6.0, 6.0, 7.0, 7.0, 7.0, 7.0, 7.0, 6.0, 6.0, 6.0, 6.0, 6.0, 8.0, 8.0, 8.0, 8.0, 8.0, 1.0, 1.0, 1.0, 1.0, 1.0, 3.0, 3.0, 3.0, 3.0, 3.0, 5.0, 5.0, 5.0, 5.0, 5.0, 3.0, 3.0]
                    
Loading

@jaime-m-p jaime-m-p merged commit 3b38d48 into ggerganov:master Jun 4, 2024
67 of 70 checks passed
llama.h Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
python python script changes Review Complexity : Medium Generally require more time to grok but manageable by beginner to medium expertise level testing Everything test related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants