8000 update references to moved examples · ggml-org/llama.cpp@589dc05 · GitHub
[go: up one dir, main page]
Skip to content

Commit 589dc05

Browse files
slarenslaren
committed
update references to moved examples
1 parent 9cc2db8 commit 589dc05

File tree

34 files changed

+157
-157
lines changed
  • llava.md
  • minicpmo2.6.md
  • minicpmv2.5.md
  • minicpmv2.6.md
  • examples
  • grammars
  • pyrightconfig.json
  • scripts
  • tests
  • tools

    • 34 files changed

    +157
    -157
    lines changed

    ‎.editorconfig

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -21,23 +21,23 @@ indent_style = tab
    2121
    [prompts/*.txt]
    2222
    insert_final_newline = unset
    2323

    24-
    [examples/server/public/*]
    24+
    [tools/server/public/*]
    2525
    indent_size = 2
    2626

    27-
    [examples/server/public/deps_*]
    27+
    [tools/server/public/deps_*]
    2828
    trim_trailing_whitespace = unset
    2929
    indent_style = unset
    3030
    indent_size = unset
    3131

    32-
    [examples/server/deps_*]
    32+
    [tools/server/deps_*]
    3333
    trim_trailing_whitespace = unset
    3434
    indent_style = unset
    3535
    indent_size = unset
    3636

    3737
    [examples/llama.swiftui/llama.swiftui.xcodeproj/*]
    3838
    indent_style = tab
    3939

    40-
    [examples/cvector-generator/*.txt]
    40+
    [tools/cvector-generator/*.txt]
    4141
    trim_trailing_whitespace = unset
    4242
    insert_final_newline = unset
    4343

    ‎.github/labeler.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -70,7 +70,7 @@ android:
    7070
    server:
    7171
    - changed-files:
    7272
    - any-glob-to-any-file:
    73-
    - examples/server/**
    73+
    - tools/server/**
    7474
    ggml:
    7575
    - changed-files:
    7676
    - any-glob-to-any-file:

    ‎.github/workflows/bench.yml.disabled

    Lines changed: 15 additions & 15 deletions
    Original file line numberDiff line numberDiff line change
    @@ -27,10 +27,10 @@ on:
    2727
    push:
    2828
    branches:
    2929
    - master
    30-
    paths: ['llama.cpp', 'ggml.c', 'ggml-backend.cpp', 'ggml-quants.c', '**/*.cu', 'examples/server/*.h*', 'examples/server/*.cpp']
    30+
    paths: ['llama.cpp', 'ggml.c', 'ggml-backend.cpp', 'ggml-quants.c', '**/*.cu', 'tools/server/*.h*', 'tools/server/*.cpp']
    3131
    pull_request_target:
    3232
    types: [opened, synchronize, reopened]
    33-
    paths: ['llama.cpp', 'ggml.c', 'ggml-backend.cpp', 'ggml-quants.c', '**/*.cu', 'examples/server/*.h*', 'examples/server/*.cpp']
    33+
    paths: ['llama.cpp', 'ggml.c', 'ggml-backend.cpp', 'ggml-quants.c', '**/*.cu', 'tools/server/*.h*', 'tools/server/*.cpp']
    3434
    schedule:
    3535
    - cron: '04 2 * * *'
    3636

    @@ -69,7 +69,7 @@ jobs:
    6969
    - name: Install python env
    7070
    id: pipenv
    7171
    run: |
    72-
    cd examples/server/bench
    72+
    cd tools/server/bench
    7373
    python3 -m venv venv
    7474
    source venv/bin/activate
    7575
    pip install -r requirements.txt
    @@ -79,7 +79,7 @@ jobs:
    7979
    run: |
    8080
    wget --quiet https://github.com/prometheus/prometheus/releases/download/v2.51.0/prometheus-2.51.0.linux-amd64.tar.gz
    8181
    tar xzf prometheus*.tar.gz --strip-components=1
    82-
    ./prometheus --config.file=examples/server/bench/prometheus.yml &
    82+
    ./prometheus --config.file=tools/server/bench/prometheus.yml &
    8383
    while ! nc -z localhost 9090; do
    8484
    sleep 0.1
    8585
    done
    @@ -92,7 +92,7 @@ jobs:
    9292
    - name: Install k6 and xk6-sse
    9393
    id: k6_installation
    9494
    run: |
    95-
    cd examples/server/bench
    95+
    cd tools/server/bench
    9696
    go install go.k6.io/xk6/cmd/xk6@latest
    9797
    xk6 build master \
    9898
    --with github.com/phymbert/xk6-sse
    @@ -116,7 +116,7 @@ jobs:
    116116
    - name: Download the dataset
    117117
    id: download_dataset
    118118
    run: |
    119-
    cd examples/server/bench
    119+
    cd tools/server/bench
    120120
    wget --quiet https://huggingface.co/datasets/anon8231489123/ShareGPT_Vicuna_unfiltered/resolve/main/ShareGPT_V3_unfiltered_cleaned_split.json
    121121

    122122
    - name: Server bench
    @@ -126,7 +126,7 @@ jobs:
    126126
    run: |
    127127
    set -eux
    128128

    129-
    cd examples/server/bench
    129+
    cd tools/server/bench
    130130
    source venv/bin/activate
    131131
    python bench.py \
    132132
    --runner-label ${{ env.RUNNER_LABEL }} \
    @@ -157,9 +157,9 @@ jobs:
    157157
    name: bench-server-${{ github.job }}-${{ env.RUNNER_LABEL }}-${{ matrix.model }}-${{ matrix.ftype }}
    158158
    compression-level: 9
    159159
    path: |
    160-
    examples/server/bench/*.jpg
    161-
    examples/server/bench/*.json
    162-
    examples/server/bench/*.log
    160+
    tools/server/bench/*.jpg
    161+
    tools/server/bench/*.json
    162+
    tools/server/bench/*.log
    163163

    164164
    - name: Commit status
    165165
    uses: Sibz/github-status-action@v1
    @@ -178,17 +178,17 @@ jobs:
    178178
    with:
    179179
    client_id: ${{secrets.IMGUR_CLIENT_ID}}
    180180
    path: |
    181-
    examples/server/bench/prompt_tokens_seconds.jpg
    182-
    examples/server/bench/predicted_tokens_seconds.jpg
    183-
    examples/server/bench/kv_cache_usage_ratio.jpg
    184-
    examples/server/bench/requests_processing.jpg
    181+
    tools/server/bench/prompt_tokens_seconds.jpg
    182+
    tools/server/bench/predicted_tokens_seconds.jpg
    183+
    tools/server/bench/kv_cache_usage_ratio.jpg
    184+
    tools/server/bench/requests_processing.jpg
    185185

    186186
    - name: Extract mermaid
    187187
    id: set_mermaid
    188188
    run: |
    189189
    set -eux
    190190

    191-
    cd examples/server/bench
    191+
    cd tools/server/bench
    192192
    PROMPT_TOKENS_SECONDS=$(cat prompt_tokens_seconds.mermaid)
    193193
    echo "PROMPT_TOKENS_SECONDS<<EOF" >> $GITHUB_ENV
    194194
    echo "$PROMPT_TOKENS_SECONDS" >> $GITHUB_ENV

    ‎.github/workflows/server.yml

    Lines changed: 12 additions & 12 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,10 +15,10 @@ on:
    1515
    push:
    1616
    branches:
    1717
    - master
    18-
    paths: ['.github/workflows/server.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m', 'examples/server/**.*']
    18+
    paths: ['.github/workflows/server.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m', 'tools/server/**.*']
    1919
    pull_request:
    2020
    types: [opened, synchronize, reopened]
    21-
    paths: ['.github/workflows/server.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m', 'examples/server/**.*']
    21+
    paths: ['.github/workflows/server.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m', 'tools/server/**.*']
    2222

    2323
    env:
    2424
    LLAMA_LOG_COLORS: 1
    @@ -74,7 +74,7 @@ jobs:
    7474
    - name: Tests dependencies
    7575
    id: test_dependencies
    7676
    run: |
    77-
    pip install -r examples/server/tests/requirements.txt
    77+
    pip install -r tools/server/tests/requirements.txt
    7878
    7979
    # Setup nodejs (to be used for verifying bundled index.html)
    8080
    - uses: actions/setup-node@v4
    @@ -84,14 +84,14 @@ jobs:
    8484
    - name: WebUI - Install dependencies
    8585
    id: webui_lint
    8686
    run: |
    87-
    cd examples/server/webui
    87+
    cd tools/server/webui
    8888
    npm ci
    8989
    9090
    - name: WebUI - Check code format
    9191
    id: webui_format
    9292
    run: |
    9393
    git config --global --add safe.directory $(realpath .)
    94-
    cd examples/server/webui
    94+
    cd tools/server/webui
    9595
    git status
    9696
    9797
    npm run format
    @@ -108,7 +108,7 @@ jobs:
    108108
    id: verify_server_index_html
    109109
    run: |
    110110
    git config --global --add safe.directory $(realpath .)
    111-
    cd examples/server/webui
    111+
    cd tools/server/webui
    112112
    git status
    113113
    114114
    npm run build
    @@ -161,21 +161,21 @@ jobs:
    161161
    env:
    162162
    GITHUB_ACTIONS: "true"
    163163
    run: |
    164-
    cd examples/server/tests
    164+
    cd tools/server/tests
    165165
    ./tests.sh
    166166
    167167
    - name: Tests (sanitizers)
    168168
    id: server_integration_tests_sanitizers
    169169
    if: ${{ matrix.sanitizer != '' }}
    170170
    run: |
    171-
    cd examples/server/tests
    171+
    cd tools/server/tests
    172172
    LLAMA_SANITIZE=1 ./tests.sh
    173173
    174174
    - name: Slow tests
    175175
    id: server_integration_tests_slow
    176176
    if: ${{ (github.event.schedule || github.event.inputs.slow_tests == 'true') && matrix.build_type == 'Release' }}
    177177
    run: |
    178-
    cd examples/server/tests
    178+
    cd tools/server/tests
    179179
    SLOW_TESTS=1 ./tests.sh
    180180
    181181
    @@ -211,7 +211,7 @@ jobs:
    211211
    - name: Tests dependencies
    212212
    id: test_dependencies
    213213
    run: |
    214-
    pip install -r examples/server/tests/requirements.txt
    214+
    pip install -r tools/server/tests/requirements.txt
    215215
    216216
    - name: Copy Libcurl
    217217
    id: prepare_libcurl
    @@ -224,14 +224,14 @@ jobs:
    224224
    id: server_integration_tests
    225225
    if: ${{ !matrix.disabled_on_pr || !github.event.pull_request }}
    226226
    run: |
    227-
    cd examples/server/tests
    227+
    cd tools/server/tests
    228228
    $env:PYTHONIOENCODING = ":replace"
    229229
    pytest -v -x -m "not slow"
    230230
    231231
    - name: Slow tests
    232232
    id: server_integration_tests_slow
    233233
    if: ${{ (github.event.schedule || github.event.inputs.slow_tests == 'true') && matrix.build_type == 'Release' }}
    234234
    run: |
    235-
    cd examples/server/tests
    235+
    cd tools/server/tests
    236236
    $env:SLOW_TESTS = "1"
    237237
    pytest -v -x

    ‎.gitignore

    Lines changed: 6 additions & 6 deletions
    Original file line numberDiff line numberDiff line change
    @@ -96,11 +96,11 @@ perf-*.txt
    9696
    # Examples
    9797

    9898
    examples/jeopardy/results.txt
    99-
    examples/server/*.css.hpp
    100-
    examples/server/*.html.hpp
    101-
    examples/server/*.js.hpp
    102-
    examples/server/*.mjs.hpp
    103-
    examples/server/*.gz.hpp
    99+
    tools/server/*.css.hpp
    100+
    tools/server/*.html.hpp
    101+
    tools/server/*.js.hpp
    102+
    tools/server/*.mjs.hpp
    103+
    tools/server/*.gz.hpp
    104104
    !build_64.sh
    105105
    !examples/*.bat
    106106
    !examples/*/*.kts
    @@ -110,7 +110,7 @@ examples/server/*.gz.hpp
    110110

    111111
    # Server Web UI temporary files
    112112
    node_modules
    113-
    examples/server/webui/dist
    113+
    tools/server/webui/dist
    114114

    115115
    # Python
    116116

    ‎CODEOWNERS

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -2,7 +2,7 @@
    22

    33
    /ci/ @ggerganov
    44
    /.devops/*.Dockerfile @ngxson
    5-
    /examples/server/ @ngxson
    5+
    /tools/server/ @ngxson
    66
    /ggml/src/ggml-cuda/fattn* @JohannesGaessler
    77
    /ggml/src/ggml-cuda/mmq.* @JohannesGaessler
    88
    /ggml/src/ggml-cuda/mmv.* @JohannesGaessler

    0 commit comments

    Comments
     (0)
    0