 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 '947538acb8617756a092042ff7e58db18dde05ec' 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 '751fcfc6c33ea5f43cadd4d976f8fb176871df5e' 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 |
|