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

remove C++20 style

Browse source
This commit is contained in:
Zack Zhiyuan Li 2024-11-04 22:50:33 +00:00
parent 1419681089
commit d42e0371f8
2 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

21
examples/nexa-omni-audio/omni.cpp
View file

@ -565,17 +565,16 @@ bool omni_params_parse(int argc, char **argv, omni_params &params)
static omni_params get_omni_params_from_context_params(omni_context_params &params) static omni_params get_omni_params_from_context_params(omni_context_params &params)
{ {
omni_params all_params = { omni_params all_params;
.gpt = {
.n_gpu_layers = params.n_gpu_layers, // Initialize gpt params
.model = params.model, all_params.gpt.n_gpu_layers = params.n_gpu_layers;
.prompt = params.prompt, all_params.gpt.model = params.model;
}, all_params.gpt.prompt = params.prompt;
.whisper = {
.model = params.mmproj, // Initialize whisper params
.fname_inp = {params.file}, all_params.whisper.model = params.mmproj;
}, all_params.whisper.fname_inp = {params.file};
};
if (all_params.gpt.n_threads <= 0) if (all_params.gpt.n_threads <= 0)
{ {

23
examples/qwen2-audio/qwen2.cpp
View file

@ -565,18 +565,17 @@ bool omni_params_parse(int argc, char **argv, omni_params &params)
static omni_params get_omni_params_from_context_params(omni_context_params &params) static omni_params get_omni_params_from_context_params(omni_context_params &params)
{ {
omni_params all_params = { omni_params all_params;
.gpt = {
.n_gpu_layers = params.n_gpu_layers, // Initialize gpt params
.model = params.model, all_params.gpt.n_gpu_layers = params.n_gpu_layers;
.prompt = params.prompt, all_params.gpt.model = params.model;
}, all_params.gpt.prompt = params.prompt;
.whisper = {
.model = params.mmproj, // Initialize whisper params
.fname_inp = {params.file}, all_params.whisper.model = params.mmproj;
}, all_params.whisper.fname_inp = {params.file};
};
if (all_params.gpt.n_threads <= 0) if (all_params.gpt.n_threads <= 0)
{ {
all_params.gpt.n_threads = std::thread::hardware_concurrency(); all_params.gpt.n_threads = std::thread::hardware_concurrency();