llama-tts : add -o option #12042

marcoStocchi · 2025-02-23T16:27:36Z

enabled optional cmdline argument '-o' on tts to specify an output filename. It defaults to 'output.wav'.
program now returns ENOENT in case of file write failure

ngxson · 2025-02-24T10:03:04Z

common/arg.cpp

I think it's now time to convert this block into if..else

@ngxson Hi, could you pls have a look a the changes see if they are ok ? MAny thanks..

ngxson · 2025-03-07T22:01:27Z

common/common.h

Suggested change

std::string

lora_outfile = "ggml-lora-merged-f16.gguf",

ttss_outfile = "output.wav";

std::string lora_outfile = "ggml-lora-merged-f16.gguf";

std::string ttss_outfile = "output.wav";

ngxson · 2025-03-07T22:01:36Z

examples/tts/tts.cpp

Suggested change

int retval(0);

int retval = 0;

ngxson · 2025-03-07T22:01:56Z

examples/tts/tts.cpp

Suggested change

}

else {

retval=ENOENT;

} else {

retval = ENOENT;

ngxson · 2025-03-07T22:02:50Z

common/arg.cpp

Suggested change

std::string * out_file_ptr;

const char * default_out_file;

And also change the rest to match

@ngxson thank you, all changes done and committed on this PR.

ggerganov · 2025-03-08T07:39:38Z

common/arg.cpp

Suggested change

if (ex == LLAMA_EXAMPLE_EXPORT_LORA)

default_out_file = params.lora_outfile.c_str();

else if (ex == LLAMA_EXAMPLE_CVECTOR_GENERATOR)

default_out_file = params.cvector_outfile.c_str();

else if (ex == LLAMA_EXAMPLE_TTS)

default_out_file = params.ttss_outfile.c_str();

else // currently coded as "imatrix.dat", see common.h

default_out_file = params.out_file.c_str();

if (ex == LLAMA_EXAMPLE_EXPORT_LORA) {

default_out_file = params.lora_outfile.c_str();

} else if (ex == LLAMA_EXAMPLE_CVECTOR_GENERATOR) {

default_out_file = params.cvector_outfile.c_str();

} else if (ex == LLAMA_EXAMPLE_TTS) {

default_out_file = params.ttss_outfile.c_str();

} else // currently coded as "imatrix.dat", see common.h

default_out_file = params.out_file.c_str();

thank you, committed.

ggerganov · 2025-03-08T07:43:33Z

common/common.h

It might be simpler to just have a single std::string outfile; parameter that is used by all examples to output things.

yes, I see that this requires some changes also in cvector-generator and export-lora. If ok for you I refactor this, perhaps with a dedicated PR ?

ggerganov · 2025-03-08T07:43:56Z

examples/tts/tts.cpp

Suggested change

retval=ENOENT;

retval = ENOENT;

thank you, committed.

As discussed in PR 'llama-tts : add -o option' (ggml-org#12042): * common_params : 'out_file' string is the only output file name parameter left in common_params. It's intended to be used in all example programs implementing an '-o' option. * cvector-generator, export-lora, imatrix : default output filenames moved from 'common_params' to the 'main()' of each example program.

As discussed in PR 'llama-tts : add -o option' (#12042): * common_params : 'out_file' string is the only output file name parameter left in common_params. It's intended to be used in all example programs implementing an '-o' option. * cvector-generator, export-lora, imatrix : default output filenames moved from 'common_params' to the 'main()' of each example program.

marcoStocchi · 2025-03-12T16:54:59Z

@ggerganov Good morning, thank you for approving/merging the PR 'Refactoring -o option' (#12278). After the merge, many of the commits of this PR are obsolete. Is it ok for you if I open a new PR for implementing the '-o' on llama-tts?

ngxson · 2025-03-12T17:05:56Z

Yes you can either open a new PR or fix commit using git merge master locally

* added -o option to specify an output file name * llama-tts returns ENOENT in case of file write error note : PR ggml-org#12042 is closed as superseded with this one.

* added -o option to specify an output file name * llama-tts returns ENOENT in case of file write error note : PR #12042 is closed as superseded with this one.

As discussed in PR 'llama-tts : add -o option' (ggml-org#12042): * common_params : 'out_file' string is the only output file name parameter left in common_params. It's intended to be used in all example programs implementing an '-o' option. * cvector-generator, export-lora, imatrix : default output filenames moved from 'common_params' to the 'main()' of each example program.

* added -o option to specify an output file name * llama-tts returns ENOENT in case of file write error note : PR ggml-org#12042 is closed as superseded with this one.

github-actions bot added the examples label Feb 23, 2025

ngxson reviewed Feb 24, 2025

View reviewed changes

marcoStocchi force-pushed the tts-1 branch from 1ddeb6c to 706bbf0 Compare February 26, 2025 09:01

ngxson changed the title ~~llama-tts~~ llama-tts : add -o option Mar 7, 2025

ngxson requested a review from ggerganov March 7, 2025 22:00

ngxson requested changes Mar 7, 2025

View reviewed changes

marcoStocchi force-pushed the tts-1 branch from 706bbf0 to b69a721 Compare March 8, 2025 07:36

ggerganov approved these changes Mar 8, 2025

View reviewed changes

marcoStocchi mentioned this pull request Mar 9, 2025

Refactoring '-o' option #12278

Merged

marcoStocchi closed this Mar 15, 2025

marcoStocchi force-pushed the tts-1 branch from 1496d8d to 92a3913 Compare March 15, 2025 08:10

marcoStocchi mentioned this pull request Mar 15, 2025

llama-tts : add '-o' option #12398

Merged

ngxson pushed a commit that referenced this pull request Mar 15, 2025

llama-tts : add '-o' option (#12398)

f4c3dd5

* added -o option to specify an output file name * llama-tts returns ENOENT in case of file write error note : PR #12042 is closed as superseded with this one.

-    std::string
-        lora_outfile = "ggml-lora-merged-f16.gguf",
-        ttss_outfile = "output.wav";
+    std::string lora_outfile = "ggml-lora-merged-f16.gguf";
+    std::string ttss_outfile = "output.wav";

-    }
-    else {
-        retval=ENOENT;
+    } else {
+        retval = ENOENT;

-    if (ex == LLAMA_EXAMPLE_EXPORT_LORA)
-        default_out_file = params.lora_outfile.c_str();
-    else if (ex == LLAMA_EXAMPLE_CVECTOR_GENERATOR)
-        default_out_file = params.cvector_outfile.c_str();
-    else if (ex == LLAMA_EXAMPLE_TTS)
-        default_out_file = params.ttss_outfile.c_str();
-    else // currently coded as "imatrix.dat", see common.h
-        default_out_file = params.out_file.c_str();
+    if (ex == LLAMA_EXAMPLE_EXPORT_LORA) {
+        default_out_file = params.lora_outfile.c_str();
+    } else if (ex == LLAMA_EXAMPLE_CVECTOR_GENERATOR) {
+        default_out_file = params.cvector_outfile.c_str();
+    } else if (ex == LLAMA_EXAMPLE_TTS) {
+        default_out_file = params.ttss_outfile.c_str();
+    } else // currently coded as "imatrix.dat", see common.h
+        default_out_file = params.out_file.c_str();

llama-tts : add -o option #12042

llama-tts : add -o option #12042

Uh oh!

Conversation

marcoStocchi commented Feb 23, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marcoStocchi commented Mar 12, 2025

Uh oh!

ngxson commented Mar 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants