Concedo
|
f13498df13
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .devops/tools.sh
# .devops/vulkan.Dockerfile
# .github/workflows/build.yml
# .github/workflows/docker.yml
# .github/workflows/server.yml
# Makefile
# README.md
# cmake/llama-config.cmake.in
# common/CMakeLists.txt
# examples/gbnf-validator/gbnf-validator.cpp
# examples/run/run.cpp
# examples/server/README.md
# examples/server/tests/README.md
# ggml/src/CMakeLists.txt
# ggml/src/ggml-hip/CMakeLists.txt
# scripts/sync-ggml.last
# tests/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-chat-template.cpp
# tests/test-grammar-integration.cpp
|
2025-02-01 17:14:59 +08:00 |
|
Concedo
|
bec231422a
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .github/workflows/build.yml
# CMakeLists.txt
# Makefile
# README.md
# common/CMakeLists.txt
# docs/backend/SYCL.md
# docs/build.md
# docs/docker.md
# examples/export-lora/export-lora.cpp
# examples/main/README.md
# examples/main/main.cpp
# examples/run/README.md
# examples/run/run.cpp
# examples/server/README.md
# examples/simple-chat/simple-chat.cpp
# ggml/CMakeLists.txt
# ggml/src/ggml-hip/CMakeLists.txt
# src/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-chat-template.cpp
|
2025-01-25 14:16:50 +08:00 |
|
Concedo
|
96407502cd
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# README.md
# examples/llama-bench/llama-bench.cpp
# examples/llama.android/llama/src/main/cpp/llama-android.cpp
# examples/llama.android/llama/src/main/java/android/llama/cpp/LLamaAndroid.kt
# src/llama-vocab.cpp
# tests/test-backend-ops.cpp
|
2025-01-17 23:13:50 +08:00 |
|
Concedo
|
11cd7c7bb0
|
survived the storm, again
|
2025-01-16 22:25:18 +08:00 |
|
Concedo
|
b154bd3671
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# README.md
# docs/build.md
# docs/development/HOWTO-add-model.md
# tests/test-backend-ops.cpp
# tests/test-chat-template.cpp
|
2025-01-10 17:57:38 +08:00 |
|
Concedo
|
911da8765f
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# README.md
# examples/llama.android/llama/src/main/cpp/llama-android.cpp
# examples/run/run.cpp
# examples/server/README.md
# examples/server/bench/README.md
# examples/server/tests/README.md
# ggml/src/CMakeLists.txt
# ggml/src/ggml-cpu/CMakeLists.txt
# tests/test-backend-ops.cpp
|
2025-01-03 11:56:20 +08:00 |
|
Concedo
|
7c671f289e
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .github/workflows/docker.yml
# examples/cvector-generator/mean.hpp
# examples/cvector-generator/pca.hpp
# examples/export-lora/export-lora.cpp
# examples/rpc/rpc-server.cpp
# examples/run/README.md
# examples/run/run.cpp
# examples/server/CMakeLists.txt
# examples/server/README.md
# ggml/src/CMakeLists.txt
# ggml/src/ggml-cpu/CMakeLists.txt
# ggml/src/ggml-vulkan/ggml-vulkan.cpp
# scripts/compare-llama-bench.py
# scripts/hf.sh
# tests/test-chat-template.cpp
|
2024-12-28 12:48:34 +08:00 |
|
Concedo
|
ee486bad3e
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .github/workflows/build.yml
# README.md
# examples/CMakeLists.txt
# examples/batched/batched.cpp
# examples/gritlm/gritlm.cpp
# examples/llama.android/llama/build.gradle.kts
# examples/main/README.md
# examples/retrieval/retrieval.cpp
# examples/server/CMakeLists.txt
# examples/server/README.md
# ggml/CMakeLists.txt
# ggml/src/ggml-cpu/CMakeLists.txt
# ggml/src/ggml.c
# scripts/compare-commits.sh
# scripts/sync-ggml.last
# tests/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-chat-template.cpp
# tests/test-sampling.cpp
|
2024-12-19 11:57:43 +08:00 |
|
Concedo
|
e12949346b
|
recompile new ver of vulkan shaders deterministically
|
2024-12-13 23:22:31 +08:00 |
|
Concedo
|
153da19274
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# README.md
|
2024-11-30 16:59:25 +08:00 |
|
Concedo
|
557bcaf86e
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .clang-tidy
# .github/workflows/build.yml
# Makefile
# Package.swift
# common/CMakeLists.txt
# examples/batched-bench/CMakeLists.txt
# examples/batched/CMakeLists.txt
# examples/convert-llama2c-to-ggml/CMakeLists.txt
# examples/cvector-generator/CMakeLists.txt
# examples/embedding/CMakeLists.txt
# examples/eval-callback/CMakeLists.txt
# examples/export-lora/CMakeLists.txt
# examples/gbnf-validator/CMakeLists.txt
# examples/gguf-split/CMakeLists.txt
# examples/gguf/CMakeLists.txt
# examples/gritlm/CMakeLists.txt
# examples/imatrix/CMakeLists.txt
# examples/infill/CMakeLists.txt
# examples/llama-bench/CMakeLists.txt
# examples/llava/CMakeLists.txt
# examples/lookahead/CMakeLists.txt
# examples/lookup/CMakeLists.txt
# examples/main-cmake-pkg/CMakeLists.txt
# examples/main/CMakeLists.txt
# examples/parallel/CMakeLists.txt
# examples/passkey/CMakeLists.txt
# examples/perplexity/CMakeLists.txt
# examples/quantize-stats/CMakeLists.txt
# examples/quantize/CMakeLists.txt
# examples/retrieval/CMakeLists.txt
# examples/run/CMakeLists.txt
# examples/save-load-state/CMakeLists.txt
# examples/server/CMakeLists.txt
# examples/simple-chat/CMakeLists.txt
# examples/simple/CMakeLists.txt
# examples/speculative-simple/CMakeLists.txt
# examples/speculative/CMakeLists.txt
# examples/tokenize/CMakeLists.txt
# ggml/CMakeLists.txt
# ggml/src/CMakeLists.txt
# ggml/src/ggml-backend.cpp
# ggml/src/ggml-cpu/CMakeLists.txt
# ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt
# pocs/vdot/CMakeLists.txt
# src/CMakeLists.txt
# src/unicode.cpp
# tests/test-sampling.cpp
|
2024-11-30 12:24:51 +08:00 |
|
Concedo
|
091a432cf6
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .devops/full-cuda.Dockerfile
# .devops/llama-cli-cann.Dockerfile
# .devops/llama-cli-cuda.Dockerfile
# .devops/llama-cli-intel.Dockerfile
# .devops/llama-cli-musa.Dockerfile
# .devops/llama-cli-vulkan.Dockerfile
# .devops/llama-server-cuda.Dockerfile
# .devops/llama-server-intel.Dockerfile
# .devops/llama-server-musa.Dockerfile
# .devops/llama-server-vulkan.Dockerfile
# .gitignore
# CMakeLists.txt
# Makefile
# cmake/llama-config.cmake.in
# docs/backend/SYCL.md
# docs/build.md
# examples/llama-bench/llama-bench.cpp
# flake.lock
# ggml/CMakeLists.txt
# ggml/src/CMakeLists.txt
# ggml/src/ggml-backend.cpp
# ggml/src/ggml-blas/CMakeLists.txt
# ggml/src/ggml-cpu/CMakeLists.txt
# ggml/src/ggml-cpu/ggml-cpu.c
# ggml/src/ggml-cuda/CMakeLists.txt
# ggml/src/ggml-hip/CMakeLists.txt
# ggml/src/ggml-metal/CMakeLists.txt
# ggml/src/ggml-musa/CMakeLists.txt
# ggml/src/ggml-sycl/CMakeLists.txt
# scripts/sync-ggml.last
# tests/test-backend-ops.cpp
|
2024-11-21 16:26:24 +08:00 |
|
Concedo
|
ee586b9a9d
|
fixed vulkan
|
2024-11-19 01:26:31 +08:00 |
|
Concedo
|
df080b074d
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# README.md
# examples/server/README.md
# examples/speculative/speculative.cpp
# flake.lock
# ggml/src/CMakeLists.txt
# scripts/sync-ggml.last
# tests/test-backend-ops.cpp
|
2024-11-14 21:40:52 +08:00 |
|
Concedo
|
a46f8acd03
|
note: also has support for completion tokens count
|
2024-11-01 00:44:14 +08:00 |
|
Concedo
|
ce7f9c9a2c
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .devops/full-rocm.Dockerfile
# .devops/llama-cli-rocm.Dockerfile
# .devops/llama-server-rocm.Dockerfile
# .github/workflows/build.yml
# .github/workflows/python-type-check.yml
# CMakeLists.txt
# CONTRIBUTING.md
# README.md
# ci/run.sh
# examples/embedding/embedding.cpp
# examples/server/README.md
# flake.lock
# ggml/include/ggml.h
# ggml/src/ggml.c
# requirements/requirements-convert_legacy_llama.txt
# scripts/sync-ggml.last
# src/llama-vocab.cpp
# src/llama.cpp
# tests/test-backend-ops.cpp
# tests/test-grad0.cpp
# tests/test-tokenizer-0.cpp
|
2024-10-02 01:00:57 +08:00 |
|
Concedo
|
e44ddf26ef
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .github/workflows/build.yml
# .github/workflows/server.yml
# CMakeLists.txt
# Makefile
# examples/embedding/embedding.cpp
# examples/imatrix/imatrix.cpp
# examples/llama-bench/llama-bench.cpp
# examples/llava/MobileVLM-README.md
# examples/parallel/parallel.cpp
# examples/perplexity/perplexity.cpp
# examples/quantize/CMakeLists.txt
# examples/server/README.md
# examples/speculative/speculative.cpp
# tests/test-backend-ops.cpp
|
2024-09-13 16:17:24 +08:00 |
|
Concedo
|
13394368b6
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# examples/embedding/embedding.cpp
# examples/infill/infill.cpp
# examples/perplexity/perplexity.cpp
# flake.lock
# src/llama-sampling.cpp
|
2024-09-11 20:27:53 +08:00 |
|
Concedo
|
70cdb55cc9
|
Merge commit '947538acb8' into concedo_experimental
# Conflicts:
# .github/workflows/build.yml
# .github/workflows/docker.yml
# CMakePresets.json
# examples/llama-bench/llama-bench.cpp
# ggml/CMakeLists.txt
# ggml/src/CMakeLists.txt
# tests/test-backend-ops.cpp
# tests/test-quantize-fns.cpp
|
2024-09-09 11:26:34 +08:00 |
|
Concedo
|
d220495dd4
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .devops/full-cuda.Dockerfile
# .devops/llama-cli-cuda.Dockerfile
# .devops/llama-server-cuda.Dockerfile
# .devops/llama-server-intel.Dockerfile
# .devops/llama-server-rocm.Dockerfile
# .devops/llama-server-vulkan.Dockerfile
# .devops/llama-server.Dockerfile
# .github/workflows/docker.yml
# docs/docker.md
# examples/llama-bench/llama-bench.cpp
# flake.lock
# ggml/include/ggml.h
# ggml/src/CMakeLists.txt
# scripts/sync-ggml.last
# src/llama.cpp
# tests/test-backend-ops.cpp
# tests/test-grad0.cpp
# tests/test-rope.cpp
|
2024-08-30 10:37:39 +08:00 |
|
Concedo
|
6200b6d64e
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .gitignore
# README.md
# docs/build.md
# flake.lock
# tests/test-backend-ops.cpp
# tests/test-grammar-integration.cpp
|
2024-08-21 17:17:36 +08:00 |
|
Concedo
|
1edf83761a
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .github/workflows/bench.yml.disabled
# Makefile
# README.md
# ggml/CMakeLists.txt
# ggml/src/CMakeLists.txt
# ggml/src/ggml-vulkan.cpp
|
2024-08-17 16:21:14 +08:00 |
|
Concedo
|
e1f97f7fb5
|
Merge branch 'upstream' into concedo_experimental
# Conflicts:
# .devops/llama-server.Dockerfile
# README.md
# flake.lock
# ggml/src/ggml-vulkan.cpp
# ggml/src/vulkan-shaders/concat.comp
# ggml/src/vulkan-shaders/pad.comp
# ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
# scripts/sync-ggml-am.sh
# scripts/sync-ggml.last
# src/llama.cpp
# tests/test-backend-ops.cpp
|
2024-08-06 16:33:26 +08:00 |
|
Concedo
|
3a72410804
|
Added vulkan support for SD (+1 squashed commits)
Squashed commits:
[13f42f83] Added vulkan support for SD
|
2024-08-01 17:12:33 +08:00 |
|
Concedo
|
c81d1623b4
|
Merge commit '751fcfc6c3' into concedo_experimental
# Conflicts:
# .github/workflows/build.yml
# CONTRIBUTING.md
# README.md
# flake.lock
# tests/CMakeLists.txt
# tests/test-backend-ops.cpp
|
2024-07-23 19:18:05 +08:00 |
|
Concedo
|
33a3beea32
|
vulkan incoherence from https://github.com/ggerganov/llama.cpp/issues/8092 resolved
|
2024-07-14 22:22:29 +08:00 |
|
Concedo
|
abf9531d08
|
merged but incoherent
|
2024-07-14 14:32:45 +08:00 |
|