Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.github/workflows/build.yml
#	CMakeLists.txt
#	Makefile
#	ggml-metal.m
This commit is contained in:
Concedo 2024-03-15 10:37:48 +08:00
commit 93d3871056
22 changed files with 341 additions and 198 deletions

View file

@ -104,6 +104,7 @@ static std::string get_cpu_info() {
}
}
}
fclose(f);
}
#endif
// TODO: other platforms