refactor : switch to emplace_back to avoid extra object (#5291)

MKlimenko · web-flow · commit 52bb63c7082c · 2024-02-03T13:23:37.000+02:00
diff --git a/common/common.cpp b/common/common.cpp
@@ -515,7 +515,7 @@ bool gpt_params_parse_ex(int argc, char ** argv, gpt_params & params) {
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back(std::make_tuple(argv[i], 1.0f));
+            params.lora_adapter.emplace_back(argv[i], 1.0f);
             params.use_mmap = false;
         } else if (arg == "--lora-scaled") {
             if (++i >= argc) {
@@ -527,7 +527,7 @@ bool gpt_params_parse_ex(int argc, char ** argv, gpt_params & params) {
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back(std::make_tuple(lora_adapter, std::stof(argv[i])));
+            params.lora_adapter.emplace_back(lora_adapter, std::stof(argv[i]));
             params.use_mmap = false;
         } else if (arg == "--lora-base") {
             if (++i >= argc) {
@@ -664,7 +664,7 @@ bool gpt_params_parse_ex(int argc, char ** argv, gpt_params & params) {
                 invalid_param = true;
                 break;
             }
-            params.antiprompt.push_back(argv[i]);
+            params.antiprompt.emplace_back(argv[i]);
         } else if (arg == "-ld" || arg == "--logdir") {
             if (++i >= argc) {
                 invalid_param = true;
@@ -880,7 +880,7 @@ bool gpt_params_parse_ex(int argc, char ** argv, gpt_params & params) {
     }
 
     if (!params.kv_overrides.empty()) {
-        params.kv_overrides.emplace_back(llama_model_kv_override());
+        params.kv_overrides.emplace_back();
         params.kv_overrides.back().key[0] = 0;
     }
 
diff --git a/examples/llama-bench/llama-bench.cpp b/examples/llama-bench/llama-bench.cpp
@@ -948,46 +948,46 @@ struct markdown_printer : public printer {
 
     void print_header(const cmd_params & params) override {
         // select fields to print
-        fields.push_back("model");
-        fields.push_back("size");
-        fields.push_back("params");
-        fields.push_back("backend");
+        fields.emplace_back("model");
+        fields.emplace_back("size");
+        fields.emplace_back("params");
+        fields.emplace_back("backend");
         bool is_cpu_backend = test::get_backend() == "CPU" || test::get_backend() == "BLAS";
         if (!is_cpu_backend) {
-            fields.push_back("n_gpu_layers");
+            fields.emplace_back("n_gpu_layers");
         }
         if (params.n_threads.size() > 1 || params.n_threads != cmd_params_defaults.n_threads || is_cpu_backend) {
-            fields.push_back("n_threads");
+            fields.emplace_back("n_threads");
         }
         if (params.n_batch.size() > 1 || params.n_batch != cmd_params_defaults.n_batch) {
-            fields.push_back("n_batch");
+            fields.emplace_back("n_batch");
         }
         if (params.type_k.size() > 1 || params.type_k != cmd_params_defaults.type_k) {
-            fields.push_back("type_k");
+            fields.emplace_back("type_k");
         }
         if (params.type_v.size() > 1 || params.type_v != cmd_params_defaults.type_v) {
-            fields.push_back("type_v");
+            fields.emplace_back("type_v");
         }
         if (params.main_gpu.size() > 1 || params.main_gpu != cmd_params_defaults.main_gpu) {
-            fields.push_back("main_gpu");
+            fields.emplace_back("main_gpu");
         }
         if (params.split_mode.size() > 1 || params.split_mode != cmd_params_defaults.split_mode) {
-            fields.push_back("split_mode");
+            fields.emplace_back("split_mode");
         }
         if (params.mul_mat_q.size() > 1 || params.mul_mat_q != cmd_params_defaults.mul_mat_q) {
-            fields.push_back("mul_mat_q");
+            fields.emplace_back("mul_mat_q");
         }
         if (params.no_kv_offload.size() > 1 || params.no_kv_offload != cmd_params_defaults.no_kv_offload) {
-            fields.push_back("no_kv_offload");
+            fields.emplace_back("no_kv_offload");
         }
         if (params.tensor_split.size() > 1 || params.tensor_split != cmd_params_defaults.tensor_split) {
-            fields.push_back("tensor_split");
+            fields.emplace_back("tensor_split");
         }
         if (params.use_mmap.size() > 1 || params.use_mmap != cmd_params_defaults.use_mmap) {
-            fields.push_back("use_mmap");
+            fields.emplace_back("use_mmap");
         }
-        fields.push_back("test");
-        fields.push_back("t/s");
+        fields.emplace_back("test");
+        fields.emplace_back("t/s");
 
         fprintf(fout, "|");
         for (const auto & field : fields) {
diff --git a/examples/main/main.cpp b/examples/main/main.cpp
@@ -352,12 +352,12 @@ int main(int argc, char ** argv) {
     // in instruct mode, we inject a prefix and a suffix to each input by the user
     if (params.instruct) {
         params.interactive_first = true;
-        params.antiprompt.push_back("### Instruction:\n\n");
+        params.antiprompt.emplace_back("### Instruction:\n\n");
     }
     // similar for chatml mode
     else if (params.chatml) {
         params.interactive_first = true;
-        params.antiprompt.push_back("<|im_start|>user\n");
+        params.antiprompt.emplace_back("<|im_start|>user\n");
     }
 
     // enable interactive mode if interactive start is specified
diff --git a/examples/perplexity/perplexity.cpp b/examples/perplexity/perplexity.cpp
@@ -881,7 +881,7 @@ static void hellaswag_score(llama_context * ctx, const gpt_params & params) {
             size_t li = hs_cur.common_prefix;
             for (int s = 0; s < 4; ++s) {
                 for (size_t j = hs_cur.common_prefix; j < hs_cur.seq_tokens[s].size() - 1; j++) {
-                    eval_pairs.push_back(std::make_pair(hs_cur.i_batch + li++, hs_cur.seq_tokens[s][j + 1]));
+                    eval_pairs.emplace_back(hs_cur.i_batch + li++, hs_cur.seq_tokens[s][j + 1]);
                 }
                 ++li;
             }
@@ -1159,13 +1159,13 @@ static void winogrande_score(llama_context * ctx, const gpt_params & params) {
             const int last_1st = task.seq_tokens[0].size() - n_base1 > 1 ? 1 : 0;
             size_t li = n_base1 - 1;
             for (size_t j = n_base1-1; j < task.seq_tokens[0].size()-1-last_1st; ++j) {
-                eval_pairs.push_back(std::make_pair(task.i_batch + li++, task.seq_tokens[0][j+1]));
+                eval_pairs.emplace_back(task.i_batch + li++, task.seq_tokens[0][j+1]);
             }
             const auto& n_base2 = skip_choice ? task.n_base2 : task.common_prefix;
             const int last_2nd = task.seq_tokens[1].size() - n_base2 > 1 ? 1 : 0;
             li = task.seq_tokens[0].size() - task.common_prefix + n_base2 - 1;
             for (size_t j = n_base2-1; j < task.seq_tokens[1].size()-1-last_2nd; ++j) {
-                eval_pairs.push_back(std::make_pair(task.i_batch + li++, task.seq_tokens[1][j+1]));
+                eval_pairs.emplace_back(task.i_batch + li++, task.seq_tokens[1][j+1]);
             }
         }
         compute_logprobs(batch_logits.data(), n_vocab, workers, eval_pairs, eval_results);
@@ -1524,7 +1524,7 @@ static void multiple_choice_score(llama_context * ctx, const gpt_params & params
             size_t li = cur_task.common_prefix;
             for (int s = 0; s < int(cur_task.seq_tokens.size()); ++s) {
                 for (size_t j = cur_task.common_prefix; j < cur_task.seq_tokens[s].size() - 1; j++) {
-                    eval_pairs.push_back(std::make_pair(cur_task.i_batch + li++, cur_task.seq_tokens[s][j + 1]));
+                    eval_pairs.emplace_back(cur_task.i_batch + li++, cur_task.seq_tokens[s][j + 1]);
                 }
                 ++li;
             }
diff --git a/examples/quantize-stats/quantize-stats.cpp b/examples/quantize-stats/quantize-stats.cpp
@@ -257,13 +257,13 @@ int main(int argc, char ** argv) {
                 invalid_param = true;
                 break;
             }
-            params.include_layers.push_back(argv[i]);
+            params.include_layers.emplace_back(argv[i]);
         } else if (arg == "-L" || arg == "--exclude-layer") {
             if (++i >= argc) {
                 invalid_param = true;
                 break;
             }
-            params.exclude_layers.push_back(argv[i]);
+            params.exclude_layers.emplace_back(argv[i]);
         } else if (arg == "-t" || arg == "--type") {
             if (++i >= argc) {
                 invalid_param = true;
diff --git a/examples/quantize/quantize.cpp b/examples/quantize/quantize.cpp
@@ -208,13 +208,13 @@ int main(int argc, char ** argv) {
             }
         } else if (strcmp(argv[arg_idx], "--include-weights") == 0) {
             if (arg_idx < argc-1) {
-                included_weights.push_back(argv[++arg_idx]);
+                included_weights.emplace_back(argv[++arg_idx]);
             } else {
                 usage(argv[0]);
             }
         } else if (strcmp(argv[arg_idx], "--exclude-weights") == 0) {
             if (arg_idx < argc-1) {
-                excluded_weights.push_back(argv[++arg_idx]);
+                excluded_weights.emplace_back(argv[++arg_idx]);
             } else {
                 usage(argv[0]);
             }
diff --git a/examples/server/server.cpp b/examples/server/server.cpp
@@ -1884,7 +1884,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,
                 invalid_param = true;
                 break;
             }
-            sparams.api_keys.push_back(argv[i]);
+            sparams.api_keys.emplace_back(argv[i]);
         }
         else if (arg == "--api-key-file")
         {
@@ -2160,7 +2160,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back(std::make_tuple(argv[i], 1.0f));
+            params.lora_adapter.emplace_back(argv[i], 1.0f);
             params.use_mmap = false;
         }
         else if (arg == "--lora-scaled")
@@ -2176,7 +2176,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,
                 invalid_param = true;
                 break;
             }
-            params.lora_adapter.push_back(std::make_tuple(lora_adapter, std::stof(argv[i])));
+            params.lora_adapter.emplace_back(lora_adapter, std::stof(argv[i]));
             params.use_mmap = false;
         }
         else if (arg == "--lora-base")
@@ -2318,7 +2318,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,
         }
     }
     if (!params.kv_overrides.empty()) {
-        params.kv_overrides.emplace_back(llama_model_kv_override());
+        params.kv_overrides.emplace_back();
         params.kv_overrides.back().key[0] = 0;
     }
 
diff --git a/tests/test-llama-grammar.cpp b/tests/test-llama-grammar.cpp
@@ -105,7 +105,7 @@ int main()
 
     for (auto rule : expected_rules)
     {
-        parsed_grammar.rules.push_back({});
+        parsed_grammar.rules.emplace_back();
         for (auto element : rule)
         {
             parsed_grammar.rules.back().push_back(element);

Original file line number	Diff line number	Diff line change
`@@ -352,12 +352,12 @@ int main(int argc, char ** argv) {`
`352`	`352`	`// in instruct mode, we inject a prefix and a suffix to each input by the user`
`353`	`353`	`if (params.instruct) {`
`354`	`354`	`params.interactive_first = true;`
`355`		`- params.antiprompt.push_back("### Instruction:\n\n");`
	`355`	`+ params.antiprompt.emplace_back("### Instruction:\n\n");`
`356`	`356`	`}`
`357`	`357`	`// similar for chatml mode`
`358`	`358`	`else if (params.chatml) {`
`359`	`359`	`params.interactive_first = true;`
`360`		`- params.antiprompt.push_back("<\|im_start\|>user\n");`
	`360`	`+ params.antiprompt.emplace_back("<\|im_start\|>user\n");`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`// enable interactive mode if interactive start is specified`
Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ static void hellaswag_score(llama_context * ctx, const gpt_params & params) {`
`881`	`881`	`size_t li = hs_cur.common_prefix;`
`882`	`882`	`for (int s = 0; s < 4; ++s) {`
`883`	`883`	`for (size_t j = hs_cur.common_prefix; j < hs_cur.seq_tokens[s].size() - 1; j++) {`
`884`		`- eval_pairs.push_back(std::make_pair(hs_cur.i_batch + li++, hs_cur.seq_tokens[s][j + 1]));`
	`884`	`+ eval_pairs.emplace_back(hs_cur.i_batch + li++, hs_cur.seq_tokens[s][j + 1]);`
`885`	`885`	`}`
`886`	`886`	`++li;`
`887`	`887`	`}`
`@@ -1159,13 +1159,13 @@ static void winogrande_score(llama_context * ctx, const gpt_params & params) {`
`1159`	`1159`	`const int last_1st = task.seq_tokens[0].size() - n_base1 > 1 ? 1 : 0;`
`1160`	`1160`	`size_t li = n_base1 - 1;`
`1161`	`1161`	`for (size_t j = n_base1-1; j < task.seq_tokens[0].size()-1-last_1st; ++j) {`
`1162`		`- eval_pairs.push_back(std::make_pair(task.i_batch + li++, task.seq_tokens[0][j+1]));`
	`1162`	`+ eval_pairs.emplace_back(task.i_batch + li++, task.seq_tokens[0][j+1]);`
`1163`	`1163`	`}`
`1164`	`1164`	`const auto& n_base2 = skip_choice ? task.n_base2 : task.common_prefix;`
`1165`	`1165`	`const int last_2nd = task.seq_tokens[1].size() - n_base2 > 1 ? 1 : 0;`
`1166`	`1166`	`li = task.seq_tokens[0].size() - task.common_prefix + n_base2 - 1;`
`1167`	`1167`	`for (size_t j = n_base2-1; j < task.seq_tokens[1].size()-1-last_2nd; ++j) {`
`1168`		`- eval_pairs.push_back(std::make_pair(task.i_batch + li++, task.seq_tokens[1][j+1]));`
	`1168`	`+ eval_pairs.emplace_back(task.i_batch + li++, task.seq_tokens[1][j+1]);`
`1169`	`1169`	`}`
`1170`	`1170`	`}`
`1171`	`1171`	`compute_logprobs(batch_logits.data(), n_vocab, workers, eval_pairs, eval_results);`
`@@ -1524,7 +1524,7 @@ static void multiple_choice_score(llama_context * ctx, const gpt_params & params`
`1524`	`1524`	`size_t li = cur_task.common_prefix;`
`1525`	`1525`	`for (int s = 0; s < int(cur_task.seq_tokens.size()); ++s) {`
`1526`	`1526`	`for (size_t j = cur_task.common_prefix; j < cur_task.seq_tokens[s].size() - 1; j++) {`
`1527`		`- eval_pairs.push_back(std::make_pair(cur_task.i_batch + li++, cur_task.seq_tokens[s][j + 1]));`
	`1527`	`+ eval_pairs.emplace_back(cur_task.i_batch + li++, cur_task.seq_tokens[s][j + 1]);`
`1528`	`1528`	`}`
`1529`	`1529`	`++li;`
`1530`	`1530`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,13 +208,13 @@ int main(int argc, char ** argv) {`
`208`	`208`	`}`
`209`	`209`	`} else if (strcmp(argv[arg_idx], "--include-weights") == 0) {`
`210`	`210`	`if (arg_idx < argc-1) {`
`211`		`- included_weights.push_back(argv[++arg_idx]);`
	`211`	`+ included_weights.emplace_back(argv[++arg_idx]);`
`212`	`212`	`} else {`
`213`	`213`	`usage(argv[0]);`
`214`	`214`	`}`
`215`	`215`	`} else if (strcmp(argv[arg_idx], "--exclude-weights") == 0) {`
`216`	`216`	`if (arg_idx < argc-1) {`
`217`		`- excluded_weights.push_back(argv[++arg_idx]);`
	`217`	`+ excluded_weights.emplace_back(argv[++arg_idx]);`
`218`	`218`	`} else {`
`219`	`219`	`usage(argv[0]);`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1884,7 +1884,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,`
`1884`	`1884`	`invalid_param = true;`
`1885`	`1885`	`break;`
`1886`	`1886`	`}`
`1887`		`- sparams.api_keys.push_back(argv[i]);`
	`1887`	`+ sparams.api_keys.emplace_back(argv[i]);`
`1888`	`1888`	`}`
`1889`	`1889`	`else if (arg == "--api-key-file")`
`1890`	`1890`	`{`
`@@ -2160,7 +2160,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,`
`2160`	`2160`	`invalid_param = true;`
`2161`	`2161`	`break;`
`2162`	`2162`	`}`
`2163`		`- params.lora_adapter.push_back(std::make_tuple(argv[i], 1.0f));`
	`2163`	`+ params.lora_adapter.emplace_back(argv[i], 1.0f);`
`2164`	`2164`	`params.use_mmap = false;`
`2165`	`2165`	`}`
`2166`	`2166`	`else if (arg == "--lora-scaled")`
`@@ -2176,7 +2176,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,`
`2176`	`2176`	`invalid_param = true;`
`2177`	`2177`	`break;`
`2178`	`2178`	`}`
`2179`		`- params.lora_adapter.push_back(std::make_tuple(lora_adapter, std::stof(argv[i])));`
	`2179`	`+ params.lora_adapter.emplace_back(lora_adapter, std::stof(argv[i]));`
`2180`	`2180`	`params.use_mmap = false;`
`2181`	`2181`	`}`
`2182`	`2182`	`else if (arg == "--lora-base")`
`@@ -2318,7 +2318,7 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,`
`2318`	`2318`	`}`
`2319`	`2319`	`}`
`2320`	`2320`	`if (!params.kv_overrides.empty()) {`
`2321`		`- params.kv_overrides.emplace_back(llama_model_kv_override());`
	`2321`	`+ params.kv_overrides.emplace_back();`
`2322`	`2322`	`params.kv_overrides.back().key[0] = 0;`
`2323`	`2323`	`}`
`2324`	`2324`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ int main()`
`105`	`105`
`106`	`106`	`for (auto rule : expected_rules)`
`107`	`107`	`{`
`108`		`- parsed_grammar.rules.push_back({});`
	`108`	`+ parsed_grammar.rules.emplace_back();`
`109`	`109`	`for (auto element : rule)`
`110`	`110`	`{`
`111`	`111`	`parsed_grammar.rules.back().push_back(element);`