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

main : don't print special tokens with --grammar #6923

Merged
merged 15 commits into from
May 25, 2024
Merged

main : don't print special tokens with --grammar #6923

merged 15 commits into from
May 25, 2024

Commits on Apr 26, 2024

  1. main : don't print special tokens with --grammar 

    The CLI interface was recently changed to print special control tokens
like the </s> stop message one. This token shouldn't be printed if the
grammar flag was passed, unless the grammar specifies it, because that
breaks shell-scriptability.
    @jart
    jart committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    08c5e35 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2024

  1. Merge branch 'master' into grammar-token

    @mofosyne
    mofosyne authored May 18, 2024
    Configuration menu
    Copy the full SHA
    ea70e28 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. main: use seperate stream for control characters

    @mofosyne
    mofosyne committed May 19, 2024
    Configuration menu
    Copy the full SHA
    bcd24f8 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. main: use dprintf and add --ctrl-token-no-out and --ctrl-token-fd-out

    @mofosyne
    mofosyne committed May 20, 2024
    Configuration menu
    Copy the full SHA
    9f445a7 View commit details
    Browse the repository at this point in the history

  2. main: dprintf isn't part of the IEEE POSIX standard. Just use write().

    @mofosyne
    mofosyne committed May 20, 2024
    Configuration menu
    Copy the full SHA
    ad4b609 View commit details
    Browse the repository at this point in the history

  3. main: remove --ctrl-token-fd-out in favor for fcntl() based detection

    @mofosyne
    mofosyne committed May 20, 2024
    Configuration menu
    Copy the full SHA
    c9ea9df View commit details
    Browse the repository at this point in the history

  4. common.cpp: accidentally removed --interactive-first

    @mofosyne
    mofosyne committed May 20, 2024
    Configuration menu
    Copy the full SHA
    5032f18 View commit details
    Browse the repository at this point in the history

  5. main: only merge stdout and control token if not in conversation or g… 

    …rammar mode
    @mofosyne
    mofosyne committed May 20, 2024
    Configuration menu
    Copy the full SHA
    90456a5 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. main: rejig control token descriptor handling

    @mofosyne
    mofosyne committed May 21, 2024
    Configuration menu
    Copy the full SHA
    50048f5 View commit details
    Browse the repository at this point in the history

  2. main: must check pipe status on very top of program

    @mofosyne
    mofosyne committed May 21, 2024
    Configuration menu
    Copy the full SHA
    c1e8a6d View commit details
    Browse the repository at this point in the history

  3. main: renamed --no-special from --ctrl-token-no-out and other refacto… 

    …ring
    @mofosyne
    mofosyne committed May 21, 2024
    Configuration menu
    Copy the full SHA
    7d52482 View commit details
    Browse the repository at this point in the history

  4. main: refactor ctrl_token_no_out --> no_special

    @mofosyne
    mofosyne committed May 21, 2024
    Configuration menu
    Copy the full SHA
    8f76ba5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into grammar-token

    @jart
    jart committed May 21, 2024
    Configuration menu
    Copy the full SHA
    d8b373c View commit details
    Browse the repository at this point in the history

  6. llama: rename llama_token_is_control_token() to llama_token_is_control()

    @mofosyne
    mofosyne committed May 21, 2024
    Configuration menu
    Copy the full SHA
    12fcea5 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. main: remove special token file descriptor feature (#5)

    @mofosyne
    mofosyne authored May 25, 2024
    Configuration menu
    Copy the full SHA
    e75c5ca View commit details
    Browse the repository at this point in the history