Concedo 02f92f6ecc Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .devops/full-cuda.Dockerfile # .devops/full-rocm.Dockerfile # .devops/llama-cli-cuda.Dockerfile # .devops/llama-cli-rocm.Dockerfile # .devops/llama-cli-vulkan.Dockerfile # .devops/llama-cpp-cuda.srpm.spec # .devops/llama-server-cuda.Dockerfile # .devops/llama-server-rocm.Dockerfile # .devops/llama-server-vulkan.Dockerfile # .github/workflows/build.yml # .github/workflows/docker.yml # CMakeLists.txt # Makefile # README.md # examples/llama.android/llama/src/main/cpp/CMakeLists.txt # flake.lock # ggml/CMakeLists.txt # ggml/src/CMakeLists.txt # grammars/README.md # scripts/sync-ggml-am.sh # scripts/sync-ggml.last # tests/test-chat-template.cpp # tests/test-grammar-integration.cpp # tests/test-json-schema-to-grammar.cpp		2024-06-30 10:59:42 +08:00
..
src	Merge branch 'upstream' into concedo_experimental	2024-06-30 10:59:42 +08:00
.gitignore	android : module (#7502)	2024-05-25 11:11:33 +03:00
build.gradle.kts	android : module (#7502)	2024-05-25 11:11:33 +03:00
consumer-rules.pro	android : module (#7502)	2024-05-25 11:11:33 +03:00
proguard-rules.pro	android : module (#7502)	2024-05-25 11:11:33 +03:00