diff options
| author | Georgi Gerganov <ggerganov@gmail.com> | 2023-09-04 22:26:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 22:26:24 +0300 |
| commit | e36ecdccc8754783f93ad3ac8a09e540101f2ca0 (patch) | |
| tree | 160ce80ac89ad8d938c5a58bcb5aae4cdb020636 /common/common.cpp | |
| parent | bd33e5ab92e7f214205792fc1cd9ca28e810f897 (diff) | |
build : on Mac OS enable Metal by default (#2901)
* build : on Mac OS enable Metal by default
* make : try to fix build on Linux
* make : move targets back to the top
* make : fix target clean
* llama : enable GPU inference by default with Metal
* llama : fix vocab_only logic when GPU is enabled
* common : better `n_gpu_layers` assignment
* readme : update Metal instructions
* make : fix merge conflict remnants
* gitignore : metal
Diffstat (limited to 'common/common.cpp')
| -rw-r--r-- | common/common.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/common.cpp b/common/common.cpp index 31382137..74e1b6fd 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -717,7 +717,9 @@ struct llama_context_params llama_context_params_from_gpt_params(const gpt_param lparams.n_ctx = params.n_ctx; lparams.n_batch = params.n_batch; - lparams.n_gpu_layers = params.n_gpu_layers; + if (params.n_gpu_layers != -1) { + lparams.n_gpu_layers = params.n_gpu_layers; + } lparams.main_gpu = params.main_gpu; lparams.tensor_split = params.tensor_split; lparams.low_vram = params.low_vram; @@ -1212,7 +1214,7 @@ void dump_non_result_info_yaml(FILE * stream, const gpt_params & params, const l fprintf(stream, "model_draft: %s # default:\n", params.model_draft.c_str()); fprintf(stream, "mtest: %s # default: false\n", params.mem_test ? "true" : "false"); fprintf(stream, "multiline_input: %s # default: false\n", params.multiline_input ? "true" : "false"); - fprintf(stream, "n_gpu_layers: %d # default: 0\n", params.n_gpu_layers); + fprintf(stream, "n_gpu_layers: %d # default: -1\n", params.n_gpu_layers); fprintf(stream, "n_predict: %d # default: -1 (unlimited)\n", params.n_predict); fprintf(stream, "n_probs: %d # only used by server binary, default: 0\n", params.n_probs); fprintf(stream, "no_mmap: %s # default: false\n", !params.use_mmap ? "true" : "false"); |