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

kenvix · yusiwen · commit 7351a76a4c1c · 2023-10-07T13:41:12.000+08:00
diff --git 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
@@ -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")

Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,`
`1015`	`1015`	`invalid_param = true;`
`1016`	`1016`	`break;`
`1017`	`1017`	`}`
`1018`		`- params.lora_adapter.push_back({argv[i], 1.0f});`
	`1018`	`+ params.lora_adapter.push_back(std::make_tuple(argv[i], 1.0f));`
`1019`	`1019`	`params.use_mmap = false;`
`1020`	`1020`	`}`
`1021`	`1021`	`else if (arg == "--lora-scaled")`
`@@ -1031,7 +1031,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,`
`1031`	`1031`	`invalid_param = true;`
`1032`	`1032`	`break;`
`1033`	`1033`	`}`
`1034`		`- params.lora_adapter.push_back({lora_adapter, std::stof(argv[i])});`
	`1034`	`+ params.lora_adapter.push_back(std::make_tuple(lora_adapter, std::stof(argv[i])));`
`1035`	`1035`	`params.use_mmap = false;`
`1036`	`1036`	`}`
`1037`	`1037`	`else if (arg == "--lora-base")`