Merge branch 'master' into concedo

# Conflicts:
#	.github/workflows/build.yml
#	CMakeLists.txt
#	Makefile
#	README.md
This commit is contained in:
Concedo 2023-03-26 14:52:08 +08:00
commit 57474944d6
34 changed files with 970 additions and 1116 deletions

View file

@ -7,7 +7,7 @@
//No dynamic memory allocation! Setup structs with FIXED (known) shapes and sizes for ALL output fields
//Python will ALWAYS provide the memory, we just write to it.
#include "main.cpp"
#include "./examples/main/main.cpp"
#include "extra.h"
void print_tok_vec(std::vector<llama_token> & embd)