Merge branch 'master' into concedo_experimental

# Conflicts:
#	.devops/nix/package.nix
#	CMakeLists.txt
#	README.md
#	ggml-metal.m
#	ggml.c
This commit is contained in:
Concedo 2024-01-08 14:18:49 +08:00
commit f04b6e7287
18 changed files with 195 additions and 191 deletions

View file

@ -1 +1 @@
3fd01e00e40583ccd4b393a7c6502d6a4455a1d5
f96711108d55bdbbd277e6be07204dce6a94fb93