• R/O
  • SSH

dialog-studio-script: Commit

Galatea Dialog Studio: script sources. Migrated from CVS repository.


Commit MetaInfo

Revisão6af4f6b0dbc6cb96d437ec6357941f5aa5ca7e21 (tree)
Hora2010-05-30 00:27:22
AutorTakuya Nishimoto <nishimotz@gmai...>
CommiterTakuya Nishimoto

Mensagem de Log

20100530-1

Mudança Sumário

Diff

diff -r e7ca8247af59 -r 6af4f6b0dbc6 app_skel/script/runner.txt
--- a/app_skel/script/runner.txt Sat May 29 17:53:54 2010 +0900
+++ b/app_skel/script/runner.txt Sun May 30 00:27:22 2010 +0900
@@ -1,8 +1,9 @@
11 #!/usr/bin/ruby -Ku
22 $runner_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
33 $skel_dir = File.expand_path(File.join(File.dirname(__FILE__), '../skel'))
4+$tmp_dir = File.expand_path(File.join(File.dirname(__FILE__), '../tmp'))
45 $generator_dir = "<%= $generator_dir %>"
5-[ $runner_dir, $generator_dir, "/usr/local/galatea-dialog/files" ].each do |d|
6+[ $runner_dir, $generator_dir ].each do |d|
67 f = File.join(d, 'lib', 'galatea_runner.rb')
78 if File.exist?(f)
89 $library_dir = File.join(d , 'lib')
diff -r e7ca8247af59 -r 6af4f6b0dbc6 lib/galatea_config_maker.rb
--- a/lib/galatea_config_maker.rb Sat May 29 17:53:54 2010 +0900
+++ b/lib/galatea_config_maker.rb Sun May 30 00:27:22 2010 +0900
@@ -1,6 +1,5 @@
11 #!/usr/bin/ruby -Ku
22 # coding: utf-8
3-# $Id: galatea_config_maker.rb,v 1.20 2009/09/10 05:21:04 nishimoto Exp $
43 # (c) Takuya NISHIMOTO
54
65 require 'fileutils'
@@ -10,6 +9,7 @@
109 attr_accessor :runner_skel_path
1110 attr_accessor :verbose
1211 attr_writer :preprocess_only
12+ attr_accessor :runner_tmp_dir
1313
1414 def initialize(file_array)
1515 super
@@ -18,6 +18,11 @@
1818 else
1919 @runner_skel_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'skel'))
2020 end
21+ if $tmp_dir
22+ @runner_tmp_dir = $tmp_dir
23+ else
24+ @runner_tmp_dir = p('dm.tmp_dir')
25+ end
2126 @errors = []
2227 end
2328
@@ -35,28 +40,27 @@
3540 end
3641
3742 def mkdir_tmppath
38- tmp = p('dm.tmp_dir')
39- unless File.exists?(tmp)
40- FileUtils.mkdir_p tmp
43+ unless File.exists?(@runner_tmp_dir)
44+ FileUtils.mkdir_p @runner_tmp_dir
4145 end
42- File.chmod 0755, tmp
46+ File.chmod 0755, @runner_tmp_dir
4347 end
4448
4549 def set_lang(lang)
4650 @srm_lang = lang
4751 @dm_language = lang
48- if lang == 'ja'
49- # @srm_binhmm = 'hmmdefs,ptm,gid.binhmm'
50- # @am_commands_ssm = "cd #{p('enginepath')}/SSM/gtalk ; ./gtalk -C #{@tmppath}/ssm.conf"
51- else # 'en'
52- # @srm_binhmm = 'hmmdefs_mix16_gid.binhmm'
53- # @am_commands_ssm = "#{p('ruby.bin')} ./SSM-espeak.rb"
54- end
52+ #if lang == 'ja'
53+ # # @srm_binhmm = 'hmmdefs,ptm,gid.binhmm'
54+ # # @am_commands_ssm = "cd #{p('enginepath')}/SSM/gtalk ; ./gtalk -C #{@tmppath}/ssm.conf"
55+ #else # 'en'
56+ # # @srm_binhmm = 'hmmdefs_mix16_gid.binhmm'
57+ # # @am_commands_ssm = "#{p('ruby.bin')} ./SSM-espeak.rb"
58+ #end
5559 end
5660
5761 def make(file)
5862 begin
59- File.open("#{p('dm.tmp_dir')}/#{file}", "w") do |outfile|
63+ File.open("#{@runner_tmp_dir}/#{file}", "w") do |outfile|
6064 str = File.open("#{runner_skel_path}/#{file}.txt", "r").read
6165 outfile.write translate(str)
6266 end
@@ -66,37 +70,35 @@
6670 end
6771 end
6872
69- def env_ok?
70- files = [
71- "#{p('srm.julius.engine_dir')}/bin/julius",
72- "#{p('ssm.gtalk.engine_dir')}/gtalk",
73- "#{p('ssm.gtalk.chasen_dir')}/bin/chasen",
74- "#{p('ssm.gtalk.chaone_dir')}/chaone",
75- "#{p('fsm.galateafsm.engine_dir')}/fsm",
76- ]
77- files.each do |f|
78- unless File.stat(f).executable?
79- @errors << "#{f} is not executable"
80- end
81- end
82- return false if @errors.size > 0
83- true
84- end
73+ #def env_ok?
74+ # files = [
75+ # "#{p('srm.julius.engine_dir')}/bin/julius",
76+ # "#{p('ssm.gtalk.engine_dir')}/gtalk",
77+ # "#{p('ssm.gtalk.chasen_dir')}/bin/chasen",
78+ # "#{p('ssm.gtalk.chaone_dir')}/chaone",
79+ # "#{p('fsm.galateafsm.engine_dir')}/fsm",
80+ # ]
81+ # files.each do |f|
82+ # unless File.stat(f).executable?
83+ # @errors << "#{f} is not executable"
84+ # end
85+ # end
86+ # return false if @errors.size > 0
87+ # true
88+ #end
8589
8690 def runner_cmd
8791 if @preprocess_only
8892 classpath = p('javascript.jar') + ":" + p('dm.jar')
89- tmp_dir = p('dm.tmp_dir')
9093 java_bin = p('java.bin')
91- c = "#{java_bin} -cp #{classpath} galatea.dialog.DialogManager -c #{tmp_dir}/gdm.conf" + " -p " + @dm_options
94+ c = "#{java_bin} -cp #{classpath} galatea.dialog.DialogManager -c #{@runner_tmp_dir}/gdm.conf" + " -p " + @dm_options
9295 puts c
9396 return c
9497 end
9598 perl_bin = p('perl.bin')
96- encoding = p('dm.encoding')
99+ # encoding = p('dm.encoding')
97100 am_perl = "./AgentManager-gdm.pl"
98- env = "export LANG=#{encoding};export LC_ALL=#{encoding};export PERL_BADLANG=0;export AUDIODEV=#{p('ssm.gtalk.audiodev')}"
99- "#{env}; cd #{p('dm.modules_dir')}; #{perl_bin} #{am_perl} -C #{p('dm.tmp_dir')}/am.conf"
101+ "#{p('runner.env')}; cd #{p('dm.modules_dir')}; #{perl_bin} #{am_perl} -C #{@runner_tmp_dir}/am.conf"
100102 end
101103
102104 end
diff -r e7ca8247af59 -r 6af4f6b0dbc6 lib/galatea_runner.rb
--- a/lib/galatea_runner.rb Sat May 29 17:53:54 2010 +0900
+++ b/lib/galatea_runner.rb Sun May 30 00:27:22 2010 +0900
@@ -1,6 +1,5 @@
11 #!/usr/bin/ruby -Ku
22 # coding: utf-8
3-# $Id: galatea_runner.rb,v 1.14 2009/09/10 05:21:04 nishimoto Exp $
43 # (c) Takuya NISHIMOTO
54
65 require 'optparse'
@@ -22,7 +21,7 @@
2221 if $generator_dir
2322 ar << File.join($generator_dir, 'runner.yml')
2423 end
25-ar << "/usr/local/galatea-dialog/files/runner.yml"
24+ar << "/usr/local/galatea-dialog/runner.yml"
2625 puts "[config candidate] " + ar.join(' ')
2726 ar.each do |f|
2827 if File.exist?(f)
@@ -65,10 +64,10 @@
6564 %w[ julius.conf gdm.conf fsm.conf ssm.conf chasenrc-euc-jp am.conf am_mcl.conf ].each do |f|
6665 m.make f
6766 end
68-unless m.env_ok?
69- puts m.errors.join("\n")
70- exit
71-end
67+#unless m.env_ok?
68+# puts m.errors.join("\n")
69+# exit
70+#end
7271 if rails_server
7372 server_cmd = "#{m.p('rails.ruby.bin')} #{rails_server}/script/server"
7473 else
diff -r e7ca8247af59 -r 6af4f6b0dbc6 runner.yml
--- a/runner.yml Sat May 29 17:53:54 2010 +0900
+++ b/runner.yml Sun May 30 00:27:22 2010 +0900
@@ -5,9 +5,11 @@
55 <% chaone_dir = '/usr/local/galatea-ja-morph/chaone' -%>
66 <% unidic_dir = '/usr/local/galatea-ja-morph/unidic' -%>
77 <% dialog_dir = $generator_dir -%>
8+runner:
9+ env: export LANG=ja_JP.UTF-8
810 dm:
911 lang: ja
10- encoding: ja_JP.eucJP
12+ #encoding: ja_JP.UTF-8
1113 jar: <%= $generator_dir %>/jar/gdm.jar
1214 default_vxml: <%= dialog_dir %>/lib/default.vxml
1315 modules_dir: <%= dialog_dir %>/Modules
@@ -16,12 +18,12 @@
1618 julius:
1719 engine_dir: <%= engine_dir %>/SRM
1820 ssm:
21+ dir: <%= engine_dir %>/SSM
1922 gtalk:
20- engine_dir: <%= engine_dir %>/SSM/gtalk
23+ engine_dir: <%= $generator_dir %>/bin
2124 chasen_dir: <%= chasen_dir %>
2225 chaone_dir: <%= chaone_dir %>
2326 unidic_dir: <%= unidic_dir %>
24- audiodev: /dev/dsp
2527 fsm:
2628 galateafsm:
2729 engine_dir: <%= engine_dir %>/FSM/bin
diff -r e7ca8247af59 -r 6af4f6b0dbc6 skel/am.conf.txt
--- a/skel/am.conf.txt Sat May 29 17:53:54 2010 +0900
+++ b/skel/am.conf.txt Sun May 30 00:27:22 2010 +0900
@@ -4,13 +4,12 @@
44 #
55 <%
66 classpath = p('javascript.jar') + ":" + p('dm.jar')
7-tmp_dir = p('dm.tmp_dir')
87 java_bin = p('java.bin')
98 ruby_bin = p('ruby.bin')
10-am_commands_dm = "#{java_bin} -cp #{classpath} galatea.dialog.DialogManager -c #{tmp_dir}/gdm.conf" + " " + @dm_options
11-am_commands_fsm = "cd #{p('fsm.galateafsm.engine_dir')}; ./fsm -C #{tmp_dir}/fsm.conf"
12-am_commands_fs_mcl = "#{java_bin} -cp #{classpath} galatea.agent.BehaviorManager -c #{tmp_dir}/gdm.conf"
13-am_commands_ssm = "cd #{p('ssm.gtalk.engine_dir')}; /usr/bin/padsp ./gtalk -C #{tmp_dir}/ssm.conf"
9+am_commands_dm = "#{java_bin} -cp #{classpath} galatea.dialog.DialogManager -c #{@runner_tmp_dir}/gdm.conf" + " " + @dm_options
10+am_commands_fsm = "cd #{p('fsm.galateafsm.engine_dir')}; ./fsm -C #{@runner_tmp_dir}/fsm.conf"
11+am_commands_fs_mcl = "#{java_bin} -cp #{classpath} galatea.agent.BehaviorManager -c #{@runner_tmp_dir}/gdm.conf"
12+am_commands_ssm = "cd #{p('ssm.gtalk.engine_dir')}; /usr/bin/padsp ./gtalk -C #{@runner_tmp_dir}/ssm.conf"
1413 %>
1514 #------------------------------------------------------------------
1615 broadcast: AM-MCL FS-MCL PAR DM
@@ -25,7 +24,7 @@
2524 module:FSM commands: <%= am_commands_fsm %>
2625 module:SSM commands: <%= am_commands_ssm %>
2726 module:FS-MCL commands: <%= am_commands_fs_mcl %>
28-module:AM-MCL commands: <%= ruby_bin %> AM-MCL.rb -C <%= tmp_dir %>/am_mcl.conf
27+module:AM-MCL commands: <%= ruby_bin %> AM-MCL.rb -C <%= @runner_tmp_dir %>/am_mcl.conf
2928 module:PAR commands: <%= ruby_bin %> PAR.rb
3029 module:DIM commands: <%= ruby_bin %> DIM.rb
3130 #----- EOF --------------------------------------------------------
diff -r e7ca8247af59 -r 6af4f6b0dbc6 skel/fsm.conf.txt
--- a/skel/fsm.conf.txt Sat May 29 17:53:54 2010 +0900
+++ b/skel/fsm.conf.txt Sun May 30 00:27:22 2010 +0900
@@ -28,7 +28,7 @@
2828 BackgroundFile bg2 <%= sample %>/BG/bg2.png
2929 BackgroundFile bg3 <%= sample %>/BG/bg3.png
3030 BackgroundFile bg4 <%= sample %>/BG/bg4.png
31-<% dir = p('fsm.tests_path') -%>
31+<% dir = p('fsm.galateafsm.tests_dir') -%>
3232 <% if File.exists?("#{dir}/castle01.bmp") -%>
3333 BackgroundFile castle01 <%= dir %>/castle01.bmp
3434 BackgroundFile castle02 <%= dir %>/castle02.bmp
diff -r e7ca8247af59 -r 6af4f6b0dbc6 skel/gdm.conf.txt
--- a/skel/gdm.conf.txt Sat May 29 17:53:54 2010 +0900
+++ b/skel/gdm.conf.txt Sun May 30 00:27:22 2010 +0900
@@ -6,9 +6,9 @@
66 srm_lang = p('dm.lang')
77 grammar_mkdfa_dir = p('srm.julius.engine_dir') + "/bin"
88 grammar_mkdfa_exe = "mkdfa.pl"
9-grammar_work_dir = p('dm.tmp_dir')
9+
1010 julius_server_runner_dir = p('srm.julius.engine_dir')
11-julius_server_runner_arg = "-C #{grammar_work_dir}/julius.conf"
11+julius_server_runner_arg = "-C #{@runner_tmp_dir}/julius.conf"
1212 julius_server_runner_exe = p('srm.julius.bin') || p('srm.julius.engine_dir') + "/bin/julius"
1313 %>
1414
@@ -32,7 +32,7 @@
3232 Grammar.Mkdfa.Dir : <%= grammar_mkdfa_dir %>
3333 Grammar.Mkdfa.Exe : <%= grammar_mkdfa_exe %>
3434 Grammar.Mkdfa.Perl : <%= p('perl.bin') %>
35-Grammar.WorkDir : <%= grammar_work_dir %>
35+Grammar.WorkDir : <%= @runner_tmp_dir %>
3636 Grammar.TemplateResourcePath : /res/grammar/grammar-<%= srm_lang %>.xml
3737 Grammar.UseMkdfaExe : 0
3838
diff -r e7ca8247af59 -r 6af4f6b0dbc6 skel/ssm.conf.txt
--- a/skel/ssm.conf.txt Sat May 29 17:53:54 2010 +0900
+++ b/skel/ssm.conf.txt Sun May 30 00:27:22 2010 +0900
@@ -1,10 +1,10 @@
11 # configuratiuon file for gtalk (GalateaTalk)
22
3-AUDIODEV: <%= p('ssm.gtalk.audiodev') %>
3+#AUDIODEV: <%= p('ssm.gtalk.audiodev') %>
44
55 CHASEN: <%= p('ssm.gtalk.chasen_dir') %>/bin/chasen
66 CHAONE: <%= p('ssm.gtalk.chaone_dir') %>/chaone -s gtalk
7-CHASEN-RC: <%= p('dm.tmp_dir') %>/chasenrc-euc-jp
7+CHASEN-RC: <%= @runner_tmp_dir %>/chasenrc-euc-jp
88
99 # default for numbers and alphabets
1010 NUMBER: DECIMAL
@@ -13,7 +13,7 @@
1313 TIME: hms
1414
1515 # dictionary
16-DICTIONARY: ./gtalk-eucjp.dic
16+DICTIONARY: <%= p('ssm.dir') %>/gtalk/gtalk-eucjp.dic
1717
1818 # automatic play of synthesized speech
1919 AUTO-PLAY: NO
@@ -22,43 +22,43 @@
2222 AUTO-PLAY-DELAY: 250
2323
2424 # file of phoneme list
25-PHONEME-LIST: mono.lst
25+PHONEME-LIST: <%= p('ssm.dir') %>/gtalk/mono.lst
2626
2727 # parameter files for each speaker
2828 SPEAKER-ID: female01
2929 GENDER: female
30-DUR-TREE-FILE: ../speakers/female01/tree-dur.inf
31-PIT-TREE-FILE: ../speakers/female01/tree-lf0.inf
32-MCEP-TREE-FILE: ../speakers/female01/tree-mcep.inf
33-DUR-MODEL-FILE: ../speakers/female01/duration.pdf
34-PIT-MODEL-FILE: ../speakers/female01/lf0.pdf
35-MCEP-MODEL-FILE: ../speakers/female01/mcep.pdf
30+DUR-TREE-FILE: <%= p('ssm.dir') %>/speakers/female01/tree-dur.inf
31+PIT-TREE-FILE: <%= p('ssm.dir') %>/speakers/female01/tree-lf0.inf
32+MCEP-TREE-FILE: <%= p('ssm.dir') %>/speakers/female01/tree-mcep.inf
33+DUR-MODEL-FILE: <%= p('ssm.dir') %>/speakers/female01/duration.pdf
34+PIT-MODEL-FILE: <%= p('ssm.dir') %>/speakers/female01/lf0.pdf
35+MCEP-MODEL-FILE: <%= p('ssm.dir') %>/speakers/female01/mcep.pdf
3636
3737 # parameter files for each speaker
3838 SPEAKER-ID: male01
3939 GENDER: male
40-DUR-TREE-FILE: ../speakers/male01/tree-dur.inf
41-PIT-TREE-FILE: ../speakers/male01/tree-lf0.inf
42-MCEP-TREE-FILE: ../speakers/male01/tree-mcep.inf
43-DUR-MODEL-FILE: ../speakers/male01/duration.pdf
44-PIT-MODEL-FILE: ../speakers/male01/lf0.pdf
45-MCEP-MODEL-FILE: ../speakers/male01/mcep.pdf
40+DUR-TREE-FILE: <%= p('ssm.dir') %>/speakers/male01/tree-dur.inf
41+PIT-TREE-FILE: <%= p('ssm.dir') %>/speakers/male01/tree-lf0.inf
42+MCEP-TREE-FILE: <%= p('ssm.dir') %>/speakers/male01/tree-mcep.inf
43+DUR-MODEL-FILE: <%= p('ssm.dir') %>/speakers/male01/duration.pdf
44+PIT-MODEL-FILE: <%= p('ssm.dir') %>/speakers/male01/lf0.pdf
45+MCEP-MODEL-FILE: <%= p('ssm.dir') %>/speakers/male01/mcep.pdf
4646
4747 # parameter files for each speaker
4848 SPEAKER-ID: male02
4949 GENDER: male
50-DUR-TREE-FILE: ../speakers/male02/tree-dur.inf
51-PIT-TREE-FILE: ../speakers/male02/tree-lf0.inf
52-MCEP-TREE-FILE: ../speakers/male02/tree-mcep.inf
53-DUR-MODEL-FILE: ../speakers/male02/duration.pdf
54-PIT-MODEL-FILE: ../speakers/male02/lf0.pdf
55-MCEP-MODEL-FILE: ../speakers/male02/mcep.pdf
50+DUR-TREE-FILE: <%= p('ssm.dir') %>/speakers/male02/tree-dur.inf
51+PIT-TREE-FILE: <%= p('ssm.dir') %>/speakers/male02/tree-lf0.inf
52+MCEP-TREE-FILE: <%= p('ssm.dir') %>/speakers/male02/tree-mcep.inf
53+DUR-MODEL-FILE: <%= p('ssm.dir') %>/speakers/male02/duration.pdf
54+PIT-MODEL-FILE: <%= p('ssm.dir') %>/speakers/male02/lf0.pdf
55+MCEP-MODEL-FILE: <%= p('ssm.dir') %>/speakers/male02/mcep.pdf
5656
5757 SPEAKER-ID: m001
5858 GENDER: male
59-DUR-TREE-FILE: ../speakers/m001/tree-dur.inf
60-PIT-TREE-FILE: ../speakers/m001/tree-lf0.inf
61-MCEP-TREE-FILE: ../speakers/m001/tree-mcep.inf
62-DUR-MODEL-FILE: ../speakers/m001/duration.pdf
63-PIT-MODEL-FILE: ../speakers/m001/lf0.pdf
64-MCEP-MODEL-FILE: ../speakers/m001/mcep.pdf
59+DUR-TREE-FILE: <%= p('ssm.dir') %>/speakers/m001/tree-dur.inf
60+PIT-TREE-FILE: <%= p('ssm.dir') %>/speakers/m001/tree-lf0.inf
61+MCEP-TREE-FILE: <%= p('ssm.dir') %>/speakers/m001/tree-mcep.inf
62+DUR-MODEL-FILE: <%= p('ssm.dir') %>/speakers/m001/duration.pdf
63+PIT-MODEL-FILE: <%= p('ssm.dir') %>/speakers/m001/lf0.pdf
64+MCEP-MODEL-FILE: <%= p('ssm.dir') %>/speakers/m001/mcep.pdf
Show on old repository browser