vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build

Browse source
This commit is contained in:
ngxson 2024-08-04 20:00:09 +02:00
parent 42960ec78e
commit e7d9abf388
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/export-lora/export-lora.cpp
View file

@ -135,7 +135,7 @@ struct lora_merge_ctx {
lora_merge_ctx( lora_merge_ctx(
std::string & base_fname, std::string & base_fname,
std::vector<std::tuple<std::string, float>> & lora_files, std::vector<llama_lora_adapter_container> & lora_files,
std::string & outfile, std::string & outfile,
int n_threads) : base_model(base_fname, 0), n_threads(n_threads), fout(outfile, std::ios::binary) { int n_threads) : base_model(base_fname, 0), n_threads(n_threads), fout(outfile, std::ios::binary) {
fout.exceptions(std::ofstream::failbit); // fail fast on write errors fout.exceptions(std::ofstream::failbit); // fail fast on write errors
@ -144,9 +144,9 @@ struct lora_merge_ctx {
throw std::runtime_error("split model is not yet supported"); throw std::runtime_error("split model is not yet supported");
} }
for (auto lora_inp : lora_files) { for (auto & lora_inp : lora_files) {
auto fname = std::get<0>(lora_inp); auto fname = lora_inp.path;
auto scale = std::get<1>(lora_inp); auto scale = lora_inp.scale;
std::unique_ptr<file_input> adapter(new file_input(fname, scale)); std::unique_ptr<file_input> adapter(new file_input(fname, scale));
check_metadata_lora(adapter.get()); check_metadata_lora(adapter.get());
adapters.push_back(std::move(adapter)); adapters.push_back(std::move(adapter));
@ -407,7 +407,7 @@ int main(int argc, char ** argv) {
g_verbose = (params.verbosity == 1); g_verbose = (params.verbosity == 1);
try { try {
lora_merge_ctx ctx(params.model, params.lora_adapter, params.lora_outfile, params.n_threads); lora_merge_ctx ctx(params.model, params.lora_adapters, params.lora_outfile, params.n_threads);
ctx.run_merge(); ctx.run_merge();
} catch (const std::exception & err) { } catch (const std::exception & err) {
fprintf(stderr, "%s\n", err.what()); fprintf(stderr, "%s\n", err.what());

2
examples/server/server.cpp
View file

@ -3351,7 +3351,7 @@ int main(int argc, char ** argv) {
const auto handle_lora_adapters_apply = [&](const httplib::Request & req, httplib::Response & res) { const auto handle_lora_adapters_apply = [&](const httplib::Request & req, httplib::Response & res) {
res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin")); res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin"));
const std::vector<json> body = json::parse(req.body); const std::vector<json> body = json::parse(req.body);
int max_idx = ctx_server.params.lora_adapters.size(); int max_idx = ctx_server.params.lora_adapters.size();