Introducing utils.helpers for miscellaneous helper functions

tilmankamp · tilmankamp · commit ad9f0c581bba · 2020-01-14T16:04:18.000+01:00
diff --git a/bin/benchmark_nc.py b/bin/benchmark_nc.py
@@ -9,7 +9,7 @@
 # To use util.tc
 sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0]))))
 import util.taskcluster as tcu
-from util.benchmark import keep_only_digits
+from util.helpers import keep_only_digits
 
 import paramiko
 import argparse
@@ -171,8 +171,8 @@ def nsort(a, b):
         assert len(fa) == len(fb)
         assert len(fa) == 1
 
-        fa = keep_only_digits(fa[0])
-        fb = keep_only_digits(fb[0])
+        fa = int(keep_only_digits(fa[0]))
+        fb = int(keep_only_digits(fb[0]))
 
         if fa < fb:
             return -1
diff --git a/bin/benchmark_plotter.py b/bin/benchmark_plotter.py
@@ -8,8 +8,7 @@
 
 # To use util.tc
 sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0]))))
-import util.taskcluster as tcu
-from util.benchmark import keep_only_digits
+from util.helpers import keep_only_digits
 
 import argparse
 import numpy
@@ -35,7 +34,7 @@ def reduce_filename(f):
     '''
 
     f = os.path.basename(f).split('.')
-    return keep_only_digits(f[-3])
+    return int(keep_only_digits(f[-3]))
 
 def ingest_csv(datasets=None, range=None):
     existing_files = filter(lambda x: os.path.isfile(x[1]), datasets)
diff --git a/bin/import_cv2.py b/bin/import_cv2.py
@@ -27,7 +27,7 @@
 from multiprocessing import cpu_count
 from util.downloader import SIMPLE_BAR
 from util.text import Alphabet, validate_label
-from util.feeding import secs_to_hours
+from util.helpers import secs_to_hours
 
 
 FIELDNAMES = ['wav_filename', 'wav_filesize', 'transcript']
diff --git a/bin/import_lingua_libre.py b/bin/import_lingua_libre.py
@@ -28,7 +28,7 @@
 
 from util.downloader import maybe_download
 from util.text import Alphabet, validate_label
-from util.feeding import secs_to_hours
+from util.helpers import secs_to_hours
 
 FIELDNAMES = ['wav_filename', 'wav_filesize', 'transcript']
 SAMPLE_RATE = 16000
diff --git a/bin/import_m-ailabs.py b/bin/import_m-ailabs.py
@@ -26,7 +26,7 @@
 
 from util.downloader import maybe_download
 from util.text import Alphabet, validate_label
-from util.feeding import secs_to_hours
+from util.helpers import secs_to_hours
 
 FIELDNAMES = ['wav_filename', 'wav_filesize', 'transcript']
 SAMPLE_RATE = 16000
diff --git a/bin/import_slr57.py b/bin/import_slr57.py
@@ -29,7 +29,7 @@
 
 from util.downloader import maybe_download
 from util.text import Alphabet, validate_label
-from util.feeding import secs_to_hours
+from util.helpers import secs_to_hours
 
 FIELDNAMES = ['wav_filename', 'wav_filesize', 'transcript']
 SAMPLE_RATE = 16000
diff --git a/bin/import_ts.py b/bin/import_ts.py
@@ -27,7 +27,7 @@
 
 from util.downloader import maybe_download
 from util.text import validate_label
-from util.feeding import secs_to_hours
+from util.helpers import secs_to_hours
 
 FIELDNAMES = ['wav_filename', 'wav_filesize', 'transcript']
 SAMPLE_RATE = 16000
diff --git a/stats.py b/stats.py
@@ -3,7 +3,8 @@
 import argparse
 import os
 
-from util.feeding import read_csvs, secs_to_hours
+from util.helpers import secs_to_hours
+from util.feeding import read_csvs
 
 def main():
     parser = argparse.ArgumentParser()
diff --git a/util/benchmark.py b/util/benchmark.py
diff --git a/util/helpers.py b/util/helpers.py
@@ -0,0 +1,9 @@
+
+def keep_only_digits(txt):
+    return ''.join(filter(lambda c: c.isdigit(), txt))
+
+
+def secs_to_hours(secs):
+    hours, remainder = divmod(secs, 3600)
+    minutes, seconds = divmod(remainder, 60)
+    return '%d:%02d:%02d' % (hours, minutes, seconds)
