]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
build : use std::make_tuple() for compatibility with older GCC versions (#3488)
authorKenvix ⭐ <redacted>
Thu, 5 Oct 2023 17:16:39 +0000 (01:16 +0800)
committerGitHub <redacted>
Thu, 5 Oct 2023 17:16:39 +0000 (20:16 +0300)
common/common.cpp
examples/server/server.cpp

index 269672b9feb74ea702e8c5953fe1903b183fb016..6b9b4695ca28882d5f5e5b955e723335b2b80e24 100644 (file)
@@ -361,7 +361,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back({argv[i], 1.0f});
+            params.lora_adapter.push_back(std::make_tuple(argv[i], 1.0f));
             params.use_mmap = false;
         } else if (arg == "--lora-scaled") {
             if (++i >= argc) {
@@ -373,7 +373,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back({lora_adapter, std::stof(argv[i])});
+            params.lora_adapter.push_back(std::make_tuple(lora_adapter, std::stof(argv[i])));
             params.use_mmap = false;
         } else if (arg == "--lora-base") {
             if (++i >= argc) {
index 6e31e1332e1925d17a5c89c3c682e8cfc5cd133a..5f9cdecd548e2f571b0e6b54690e98890f7dd240 100644 (file)
@@ -1015,7 +1015,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back({argv[i], 1.0f});
+            params.lora_adapter.push_back(std::make_tuple(argv[i], 1.0f));
             params.use_mmap = false;
         }
         else if (arg == "--lora-scaled")
@@ -1031,7 +1031,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back({lora_adapter, std::stof(argv[i])});
+            params.lora_adapter.push_back(std::make_tuple(lora_adapter, std::stof(argv[i])));
             params.use_mmap = false;
         }
         else if (arg == "--lora-base")