change harvest_frq to not multithread by default

it's just safer to run it without threading!
also fixed a print issue cuz i forgor to add an f before the string

Author: UtaUtaUtau

README.md

@@ -120,7 +120,7 @@ This script requires numpy, soundfile, and pyworld to be installed in your Pytho
 This script generates `.frq` files using the Harvest F0 estimation algorithm from WORLD. It uses Python's multiprocessing module to speed up the process of generating `.frq` files. This script is definitely not restricted to usage for NNSVS only, as you can use it to make `.frq` files for your UTAU voicebanks as well. You may also drag and drop the folder over the script file to run it, or use the terminal to run it.
 
 ```
-usage: harvest_frq.exe [-h] [--single-thread] [--num-threads NUM_THREADS] path
+usage: harvest_frq.exe [-h] [--num-threads NUM_THREADS] path
 
 Generate .frq files using WORLD's Harvest F0 estimation algorithm.
 
@@ -129,17 +129,21 @@ positional arguments:
 
 optional arguments:
   -h, --help            show this help message and exit
-  --single-thread, -s   Run single threaded
   --num-threads NUM_THREADS, -n NUM_THREADS
-                        How many threads to use. Default is a third of your thread count.
+                        How many threads to use. Default is running single threaded. Input zero to use all available
+                        threads.
 ```
 
 This script also requires numpy, pyworld and soundfile.
 
+**WARNING:** It seems to be generally safer to run `harvest_frq` without threading, as Harvest itself is quite CPU-intensive. If you think you can run it with multiple threads you may do it, but remember that ***you are willingly putting your computer at risk by doing so.***
+
 **UPDATE 12/13/2022:** Made this script support making a `.frq` file for a single `.wav` file through the same drag and drop behavior.
 
 **UPDATE 06/14/2023:** Added an optional argument to limit the number of threads used and switched to `soundfile` for reading `.wav` files.
 
+**UPDATE 06/21/2023:** Default to running without threading. Read warning as to why.
+
 ### threaded_noise_remove.py
 
 This script uses the Log-MMSE algorithm to denoise all `.wav` files in a folder, including its subfolders. It assumes that the first 120ms of each sample is noise. Performance is also dependent on the noise type as this is still an algorithmic noise remover.
@@ -162,6 +166,8 @@ optional arguments:
 
 This script requires numpy, scipy and soundfile. The Log-MMSE implementation is a direct translation of [this MATLAB code](https://raw.githubusercontent.com/braindead/Noise-reduction/master/logmmse.m) into Python.
 
+**Slight WARNING:** `threaded_noise_remove` seems to be quite safe even with threading, but please do check if your CPU can handle it.
+
 **UPDATE 12/13/2022:** Made this script support denoising a single `.wav` file through the same drag and drop behavior.
 
 **UPDATE 06/14/2023:** Added an optional argument to limit the number of threads used and switched to `soundfile` for dealing with `.wav` files.

harvest_frq.py

@@ -82,17 +82,19 @@ def process_directory(args):
                 fname, _ = os.path.splitext(file)
                 samples.append(os.path.join(root, file))
     logging.info(f'Listed {len(samples)} file{"s" if len(samples) != 1 else ""}')
-                
-    if args.single_thread or args.num_threads == 1:
+
+    num_threads = max(0, args.num_threads)
+    if num_threads == 1:
         logging.info('Running single threaded')
         t0 = time.perf_counter()
         for sample in samples:
             frq_gen(sample)
         t = time.perf_counter()
     else:
-        logging.info('Starting process pool with {args.num_threads} threads.')
+        workers = os.cpu_count if num_threads == 0 else num_threads
+        logging.info(f'Starting process pool with {workers} threads.')
         t0 = time.perf_counter()
-        with concurrent.futures.ProcessPoolExecutor(max_workers=args.num_threads) as executor:
+        with concurrent.futures.ProcessPoolExecutor(max_workers=workers) as executor:
             executor.map(frq_gen, samples)
         t = time.perf_counter()
     logging.info(f'Whole operation took {t - t0:.3f} seconds.')
@@ -102,8 +104,7 @@ def process_directory(args):
     try:
         parser = ArgumentParser(description="Generate .frq files using WORLD's Harvest F0 estimation algorithm.")
         parser.add_argument('path', help='The path to a .wav file or a directory with .wav files.')
-        parser.add_argument('--single-thread', '-s', action='store_true', help='Run single threaded')
-        parser.add_argument('--num-threads', '-n', type=int, default=os.cpu_count() // 3, help='How many threads to use. Default is a third of your thread count.')
+        parser.add_argument('--num-threads', '-n', type=int, default=1, help='How many threads to use. Default is running single threaded. Input zero to use all available threads.')
 
         args, _ = parser.parse_known_args()
         if os.path.isfile(args.path):

threaded_noise_remove.py

@@ -138,7 +138,7 @@ def process_directory(args):
             remove_noise(sample)
         t = time.perf_counter()
     else:
-        logging.info('Starting process pool with {args.num_threads} threads.')
+        logging.info(f'Starting process pool with {args.num_threads} threads.')
         t0 = time.perf_counter()
         with concurrent.futures.ProcessPoolExecutor(max_workers=args.num_threads) as executor:
             executor.map(remove_noise, samples)