diff options
author | Michael Denkowski <mdenkows@cs.cmu.edu> | 2013-09-04 10:45:00 -0700 |
---|---|---|
committer | Michael Denkowski <mdenkows@cs.cmu.edu> | 2013-09-04 10:45:00 -0700 |
commit | 7c583986ab4774480d45ada79a812c9c8853296b (patch) | |
tree | 1c6526c7ad87c011d2cff13c2b5c1dedfcdc44ef /realtime/rt | |
parent | 93c9b10cb84118b552a82917871978df3f2af51c (diff) |
Refactoring
Diffstat (limited to 'realtime/rt')
-rw-r--r-- | realtime/rt/__init__.py | 5 | ||||
-rw-r--r-- | realtime/rt/util.py | 54 |
2 files changed, 52 insertions, 7 deletions
diff --git a/realtime/rt/__init__.py b/realtime/rt/__init__.py index d52157c1..738777f3 100644 --- a/realtime/rt/__init__.py +++ b/realtime/rt/__init__.py @@ -1,3 +1,4 @@ -from aligner import * -from decoder import * from rt import * +import aligner +import decoder +import util diff --git a/realtime/rt/util.py b/realtime/rt/util.py index 263e33fb..885298e6 100644 --- a/realtime/rt/util.py +++ b/realtime/rt/util.py @@ -1,7 +1,24 @@ +import os import subprocess import sys import threading +from cdec.configobj import ConfigObj + +SA_INI_FILES = set(( + 'f_sa_file', + 'e_file', + 'a_file', + 'lex_file', + 'precompute_file', + )) + +def consume_stream(stream): + def consume(s): + for _ in s: + pass + threading.Thread(target=consume, args=(stream,)).start() + def popen_io(cmd): p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) consume_stream(p.stderr) @@ -12,8 +29,35 @@ def popen_io_v(cmd): p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE) return p -def consume_stream(stream): - def consume(s): - for _ in s: - pass - threading.Thread(target=consume, args=(stream,)).start() +def sa_ini_addpath(config, path): + for key in config: + if key in SA_INI_FILES: + config[key] = os.path.join(path, config[key]) + +def sa_ini_basename(config): + for key in config: + if key in SA_INI_FILES: + config[key] = os.path.join('sa', os.path.basename(config[key])) + +def cdec_ini_addpath(config, path): + cdec_ini_fn(config, lambda x: os.path.join(path, x)) + +def cdec_ini_basename(config): + cdec_ini_fn(config, os.path.basename) + +def cdec_ini_fn(config, fn): + # This is a list of (k, v), not a ConfigObj or dict + for i in range(len(config)): + if config[i][0] == 'feature_function': + if config[i][1].startswith('KLanguageModel'): + f = config[i][1].split() + f[-1] = fn(f[-1]) + config[i][1] = ' '.join(f) + elif config[i][1].startswith('External'): + f = config[i][1].split() + if f[1].endswith('libcdec_ff_hpyplm.so'): + for j in range(1, len(f)): + if not f[j].startswith('-'): + f[j] = fn(f[j]) + config[i][1] = ' '.join(f) + |