Merge branch 'upstream' into concedo_experimental

Browse source

# Conflicts:
#	.devops/full-cuda.Dockerfile
#	.devops/nix/devshells.nix
#	.devops/nix/nixpkgs-instances.nix
#	.devops/nix/package.nix
#	.devops/nix/scope.nix
#	README.md
#	docs/docker.md
#	examples/llama-bench/llama-bench.cpp
#	flake.lock
#	flake.nix
#	grammars/README.md
#	src/llama.cpp

...

This commit is contained in:

Concedo 2024-09-06 01:07:31 +08:00

parent d777995991 bdf314f38a

commit 73dca7e5bc

24 changed files with 2747 additions and 666 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

785

examples/server/server.cpp

View file

File diff suppressed because it is too large Load diff