From c08eef6a36534ac5b9506f5b18af1765442d3fde Mon Sep 17 00:00:00 2001 From: Michael Denkowski Date: Tue, 3 Sep 2013 13:47:34 -0700 Subject: Refactoring. --- realtime/realtime.py | 96 ++----------------------------------------------- realtime/rt/__init__.py | 1 + realtime/rt/rt.py | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 93 deletions(-) create mode 100644 realtime/rt/rt.py diff --git a/realtime/realtime.py b/realtime/realtime.py index 1f67bed7..c3ba6f0b 100755 --- a/realtime/realtime.py +++ b/realtime/realtime.py @@ -1,103 +1,17 @@ #!/usr/bin/env python import argparse -import collections import logging -import os -import shutil import sys -import subprocess -import tempfile -import time -import cdec.configobj -import cdec.sa - -from rt import ForceAligner -from rt import MIRADecoder - -class RealtimeDecoder: - - def __init__(self, configdir, tmpdir='/tmp', cache_size=5): - - # Temporary work dir - self.tmp = tempfile.mkdtemp(dir=tmpdir) - logging.info('Using temp dir {}'.format(self.tmp)) - - # Word aligner - fwd_params = os.path.join(configdir, 'a.fwd_params') - fwd_err = os.path.join(configdir, 'a.fwd_err') - rev_params = os.path.join(configdir, 'a.rev_params') - rev_err = os.path.join(configdir, 'a.rev_err') - self.aligner = ForceAligner(fwd_params, fwd_err, rev_params, rev_err) - - # Grammar extractor - sa_config = os.path.join(configdir, 'sa.ini') - self.extractor = cdec.sa.GrammarExtractor(sa_config, online=True) - self.grammar_files = collections.deque() - self.grammar_dict = {} - self.cache_size = cache_size - - # Decoder - decoder_config = os.path.join(configdir, 'cdec.ini') - decoder_weights = os.path.join(configdir, 'weights.final') - self.decoder = MIRADecoder(decoder_config, decoder_weights) - - def close(self): - logging.info('Closing processes') - self.aligner.close() - self.decoder.close() - logging.info('Deleting {}'.format(self.tmp)) - shutil.rmtree(self.tmp) - - def grammar(self, sentence): - grammar_file = self.grammar_dict.get(sentence, None) - # Cache hit - if grammar_file: - logging.info('Grammar cache hit') - return grammar_file - # Extract and cache - grammar_file = tempfile.mkstemp(dir=self.tmp)[1] - with open(grammar_file, 'w') as output: - for rule in self.extractor.grammar(sentence): - output.write(str(rule) + '\n') - if len(self.grammar_files) == self.cache_size: - rm_sent = self.grammar_files.popleft() - # If not already removed by learn method - if rm_sent in self.grammar_dict: - rm_grammar = self.grammar_dict.pop(rm_sent) - os.remove(rm_grammar) - self.grammar_files.append(sentence) - self.grammar_dict[sentence] = grammar_file - return grammar_file - - def decode(self, sentence): - grammar_file = self.grammar(sentence) - start_time = time.time() - hyp = self.decoder.decode(sentence, grammar_file) - stop_time = time.time() - logging.info('Translation time: {} seconds'.format(stop_time - start_time)) - return hyp - - def learn(self, source, target): - # MIRA update before adding data to grammar extractor - grammar_file = self.grammar(source) - mira_log = self.decoder.update(source, grammar_file, target) - logging.info('MIRA: {}'.format(mira_log)) - # Add aligned sentence pair to grammar extractor - alignment = self.aligner.align(source, target) - logging.info('Adding instance: {} ||| {} ||| {}'.format(source, target, alignment)) - self.extractor.add_instance(source, target, alignment) - # Clear (old) cached grammar - rm_grammar = self.grammar_dict.pop(source) - os.remove(rm_grammar) - # TODO: Add to LM by writing to fifo +import rt def main(): parser = argparse.ArgumentParser(description='Real-time adaptive translation with cdec.') parser.add_argument('-c', '--config', required=True, help='Config directory (see README.md)') parser.add_argument('-T', '--temp', help='Temp directory (default /tmp)', default='/tmp') + parser.add_argument('-a', '--cache', help='Grammar cache size (default 5)', default='5') parser.add_argument('-v', '--verbose', help='Info to stderr', action='store_true') args = parser.parse_args() @@ -107,7 +21,7 @@ def main(): if args.verbose: logging.basicConfig(level=logging.INFO) - rtd = RealtimeDecoder(args.config) + rtd = rt.RealtimeDecoder(args.config, tmpdir=args.temp, cache_size=int(args.cache)) try: while True: @@ -129,9 +43,5 @@ def main(): # Cleanup rtd.close() - -def mkconfig(): - pass - if __name__ == '__main__': main() diff --git a/realtime/rt/__init__.py b/realtime/rt/__init__.py index 7a1aeda7..d52157c1 100644 --- a/realtime/rt/__init__.py +++ b/realtime/rt/__init__.py @@ -1,2 +1,3 @@ from aligner import * from decoder import * +from rt import * diff --git a/realtime/rt/rt.py b/realtime/rt/rt.py new file mode 100644 index 00000000..fc6e3929 --- /dev/null +++ b/realtime/rt/rt.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python + +import argparse +import collections +import logging +import os +import shutil +import sys +import subprocess +import tempfile +import time + +import cdec.configobj +import cdec.sa + +import aligner +import decoder + +class RealtimeDecoder: + + def __init__(self, configdir, tmpdir='/tmp', cache_size=5): + + # Temporary work dir + self.tmp = tempfile.mkdtemp(dir=tmpdir, prefix='realtime.') + logging.info('Using temp dir {}'.format(self.tmp)) + + # Word aligner + fwd_params = os.path.join(configdir, 'a.fwd_params') + fwd_err = os.path.join(configdir, 'a.fwd_err') + rev_params = os.path.join(configdir, 'a.rev_params') + rev_err = os.path.join(configdir, 'a.rev_err') + self.aligner = aligner.ForceAligner(fwd_params, fwd_err, rev_params, rev_err) + + # Grammar extractor + sa_config = os.path.join(configdir, 'sa.ini') + self.extractor = cdec.sa.GrammarExtractor(sa_config, online=True) + self.grammar_files = collections.deque() + self.grammar_dict = {} + self.cache_size = cache_size + + # Decoder + decoder_config = os.path.join(configdir, 'cdec.ini') + decoder_weights = os.path.join(configdir, 'weights.final') + self.decoder = decoder.MIRADecoder(decoder_config, decoder_weights) + + def close(self): + logging.info('Closing processes') + self.aligner.close() + self.decoder.close() + logging.info('Deleting {}'.format(self.tmp)) + shutil.rmtree(self.tmp) + + def grammar(self, sentence): + grammar_file = self.grammar_dict.get(sentence, None) + # Cache hit + if grammar_file: + logging.info('Grammar cache hit') + return grammar_file + # Extract and cache + grammar_file = tempfile.mkstemp(dir=self.tmp, prefix='grammar.')[1] + with open(grammar_file, 'w') as output: + for rule in self.extractor.grammar(sentence): + output.write(str(rule) + '\n') + if len(self.grammar_files) == self.cache_size: + rm_sent = self.grammar_files.popleft() + # If not already removed by learn method + if rm_sent in self.grammar_dict: + rm_grammar = self.grammar_dict.pop(rm_sent) + os.remove(rm_grammar) + self.grammar_files.append(sentence) + self.grammar_dict[sentence] = grammar_file + return grammar_file + + def decode(self, sentence): + grammar_file = self.grammar(sentence) + start_time = time.time() + hyp = self.decoder.decode(sentence, grammar_file) + stop_time = time.time() + logging.info('Translation time: {} seconds'.format(stop_time - start_time)) + return hyp + + def learn(self, source, target): + # MIRA update before adding data to grammar extractor + grammar_file = self.grammar(source) + mira_log = self.decoder.update(source, grammar_file, target) + logging.info('MIRA: {}'.format(mira_log)) + # Add aligned sentence pair to grammar extractor + alignment = self.aligner.align(source, target) + logging.info('Adding instance: {} ||| {} ||| {}'.format(source, target, alignment)) + self.extractor.add_instance(source, target, alignment) + # Clear (old) cached grammar + rm_grammar = self.grammar_dict.pop(source) + os.remove(rm_grammar) + # TODO: Add to LM by writing to fifo -- cgit v1.2.3