From: Kenvix ⭐ <redacted>
Date: Thu, 5 Oct 2023 17:16:39 +0000 (+0800)
Subject: build : use std::make_tuple() for compatibility with older GCC versions (#3488)
X-Git-Tag: upstream/0.0.4488~3158
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=45eba9369fbcbd7f677eba9a2d3e4ffcfdc81824;p=pkg%2Fggml%2Fsources%2Fllama.cpp

build : use std::make_tuple() for compatibility with older GCC versions (#3488)
---

diff --git a/common/common.cpp b/common/common.cpp
index 269672b9..6b9b4695 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -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) {
diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 6e31e133..5f9cdecd 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -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")