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.

Sign up for GitHub

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

Jump to bottom

sampling : add XTC sampler #9742

Merged
merged 49 commits into from
Oct 15, 2024
Merged

sampling : add XTC sampler #9742

merged 49 commits into from
Oct 15, 2024
+195 −10

Commits on Oct 4, 2024

  1. Initial XTC commit 

    Adds XTC sampler, not activated by default, but recommended settings by default.
    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    89640b0 View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    9455194 View commit details
    Browse the repository at this point in the history

  3. Simplified chances calculation 

    To be more inline with the original implementation, chance is calculated once at the beginning.
    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    db54ac5 View commit details
    Browse the repository at this point in the history

  4. First fixes by comments 

    Still need to look into sorting
    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    41e1665 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d9c9203 View commit details
    Browse the repository at this point in the history

  6. Fixed trailing backspaces

    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    f2a2a61 View commit details
    Browse the repository at this point in the history

  7. Fixed RNG to be reproduceable 

    Thanks to @slaren for directions
    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4f8e55b View commit details
    Browse the repository at this point in the history

  8. Fixed forgotten header

    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    6d94ba2 View commit details
    Browse the repository at this point in the history

  9. Moved min_keep 

    Moved from conditions to a simple check at the end.
    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    49cd211 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    899e073 View commit details
    Browse the repository at this point in the history

  11. Fixed broken randomization 

    Thanks to @slaren for explanation
    @MaggotHATE
    MaggotHATE authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    74f657c View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    59e8e63 View commit details
    Browse the repository at this point in the history

  2. Swapped sorting for a custom algorithm 

    Shifts tokens to remove the penalized ones, then puts the penalized at the back. Should make `min_keep` still viable.
    @MaggotHATE
    MaggotHATE authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    63e60de View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    094caea View commit details
    Browse the repository at this point in the history

  2. Algorithm rework 

    1. Scan token from top till the first non-penalizable
2. Remove the last captured token (the least probable above threshold)
3. Shift all tokens to override the remaining penalizable
4. Penalize and put them at the the bottom.
    @MaggotHATE
    MaggotHATE authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    39940e5 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    4c44e3d View commit details
    Browse the repository at this point in the history

  2. Added XTC to test-sampling

    @MaggotHATE
    MaggotHATE authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    dbe9ef7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    98b204c View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    8110f78 View commit details
    Browse the repository at this point in the history

  2. Simplified algorithm and more tests

    @MaggotHATE
    MaggotHATE authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    81a0c26 View commit details
    Browse the repository at this point in the history

  3. Updated info in common and args

    @MaggotHATE
    MaggotHATE authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    09bc6d5 View commit details
    Browse the repository at this point in the history

  4. Merged back lost commits in common and arg

    @MaggotHATE
    MaggotHATE authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    c19fb26 View commit details
    Browse the repository at this point in the history

  5. Update dump info in common

    @MaggotHATE
    MaggotHATE authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    6feb6b3 View commit details
    Browse the repository at this point in the history

  6. Fixed incorrect min_keep check

    @MaggotHATE
    MaggotHATE authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    d0b1053 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    ed535bb View commit details
    Browse the repository at this point in the history

  2. Added XTC to README

    @MaggotHATE
    MaggotHATE authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    37e02e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ba29d31 View commit details
    Browse the repository at this point in the history

  2. Renamed parameters, fixed info and defaults 

    * probability is at 0 by default, but XTC is included in sampling queue
* threshold higher than 0.5 switches XTC off
    @MaggotHATE
    MaggotHATE committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2107882 View commit details
    Browse the repository at this point in the history

  3. Initial server support

    @MaggotHATE
    MaggotHATE committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    f7a383f View commit details
    Browse the repository at this point in the history

  4. Added XTC to server UIs

    @MaggotHATE
    MaggotHATE committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    72db625 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Merge branch 'master' into master

    @MaggotHATE
    MaggotHATE authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    882a603 View commit details
    Browse the repository at this point in the history

  2. Fixed labels in old server UI

    @MaggotHATE
    MaggotHATE committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    3968369 View commit details
    Browse the repository at this point in the history

  3. Made algorithm safer and more readable

    @MaggotHATE
    MaggotHATE committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    acada1a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    dfe587a View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Removed xtc_threshold_max

    @MaggotHATE
    MaggotHATE committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    9c43a01 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/MaggotHATE/llama.cpp-xtc

    @MaggotHATE
    MaggotHATE committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    68557eb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ea85a51 View commit details
    Browse the repository at this point in the history

  4. Fixed arg after update

    @MaggotHATE
    MaggotHATE committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    cca842f View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    ea62e65 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Quick fixes by comments

    @MaggotHATE
    MaggotHATE committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    44bbd63 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/MaggotHATE/llama.cpp-xtc

    @MaggotHATE
    MaggotHATE committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    a3e6522 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    dfef2c4 View commit details
    Browse the repository at this point in the history

  4. Simplified algorithm since threshold_max is removed

    @MaggotHATE
    MaggotHATE committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    436a991 View commit details
    Browse the repository at this point in the history

  5. Renamed random distribution

    @MaggotHATE
    MaggotHATE committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    3613a6d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    17ad143 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Fixed tests and outdated README

    @MaggotHATE
    MaggotHATE committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2be814a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/MaggotHATE/llama.cpp-xtc

    @MaggotHATE
    MaggotHATE committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    28d2cff View commit details
    Browse the repository at this point in the history

  3. Small fixes

    @MaggotHATE
    MaggotHATE committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    3496f58 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ggerganov:master' into master

    @MaggotHATE
    MaggotHATE authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    050eb7a View commit details
    Browse the repository at this point in the history