Changeset 2136
- Timestamp:
- 04/30/07 14:51:53 (2 years ago)
- Files:
-
- Trunk/Scripts/Audio_scripts/Repository.pm (modified) (1 diff)
- Trunk/Scripts/Mirroring_scripts/RunDaily.pl (modified) (1 diff)
- Trunk/Scripts/Mirroring_scripts/VoxForge_config.pm (modified) (1 diff)
- Trunk/Scripts/Testing_scripts/NightlyTest (moved) (moved from Trunk/Scripts/Testing_scripts/Nightly_test)
- Trunk/Scripts/Testing_scripts/NightlyTest.pm (moved) (moved from Trunk/Scripts/Testing_scripts/Nightly_test.pm) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Trunk/Scripts/Audio_scripts/Repository.pm
r1553 r2136 40 40 #################################################################### 41 41 sub Main { 42 my ($parameters ) = @_; 43 my %parms = %$parameters; 44 my $debug = $parms{"debug"}; 45 my $QuarantineDir = $parms{"QuarantineDir"}; 46 my $ToBeProcessedDir = $parms{"ToBeProcessedDir"}; 47 my $ScriptsDirectory = $parms{"ScriptsDirectory"}; 48 my $AudioDirectory = $parms{"AudioDirectory"}; 42 my ($parms ) = @_; 43 my $debug = $$parms{"debug"}; 44 my $QuarantineDir = $$parms{"QuarantineDir"}; 45 my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"}; 46 my $ScriptsDirectory = $$parms{"ScriptsDirectory"}; 47 my $AudioDirectory = $$parms{"AudioDirectory"}; 49 48 my($dirlist) = ReadDir($ToBeProcessedDir); # $dirlist is a pointer to array created in ReadDir 50 49 foreach my $AudioDirName (@$dirlist) { 51 $ parms{"AudioSubdirectory"} = "wav";50 $$parms{"AudioSubdirectory"} = "wav"; 52 51 my %AudioDirParms; 53 52 $AudioDirParms {"audio_dir_name"} = $AudioDirName; 54 ($AudioDirParms{"samplingrate"}, $AudioDirParms{"samplingrateformat"}, $AudioDirParms{"filetype"}, $AudioDirParms{"dialect"}) = UserSubmission::README::Process( \%parms, \%AudioDirParms, "etc"); # can't put "|| die "UserSubmission error: $?"" because changes this to scalar context, and only last item in list is transferred!53 ($AudioDirParms{"samplingrate"}, $AudioDirParms{"samplingrateformat"}, $AudioDirParms{"filetype"}, $AudioDirParms{"dialect"}) = UserSubmission::README::Process($parms, \%AudioDirParms, "etc"); # can't put "|| die "UserSubmission error: $?"" because changes this to scalar context, and only last item in list is transferred! 55 54 56 55 my $OriginalAudioRateDir = $AudioDirParms{"samplingrate"} . "_" . $AudioDirParms{"samplingrateformat"}; 57 $ parms{"path_original"} = "$AudioDirectory/Original/$OriginalAudioRateDir";58 Repository::Original::Process( \%parms, \%AudioDirParms) || die "Repository error: $?";56 $$parms{"path_original"} = "$AudioDirectory/Original/$OriginalAudioRateDir"; 57 Repository::Original::Process($parms, \%AudioDirParms) || die "Repository error: $?"; 59 58 60 $ parms{"HTK_ParameterKind"} = "MFCC_0_D"; # not used for HTK MFCC creation!59 $$parms{"HTK_ParameterKind"} = "MFCC_0_D"; # not used for HTK MFCC creation! 61 60 62 61 # target 8kHz:16bit, MFCC_0_D 63 ($ parms{"TargetAudioRateDir"}, $parms{"DownsampleRate"},$parms{"DownsampleBitsPerSample"}) = ("8kHz_16bit", 8000, 16);64 $ parms{"path_main"} = "$AudioDirectory/Main/" .$parms{"TargetAudioRateDir"};65 $ parms{"path_mfcc"} = "$AudioDirectory/MFCC/" . $parms{"TargetAudioRateDir"} . "/" .$parms{"HTK_ParameterKind"};66 Repository::Main::Process( \%parms, \%AudioDirParms) || die "Repository error: $?";67 Repository::MFCC::Create( \%parms, \%AudioDirParms) || die "Repository error: $?";62 ($$parms{"TargetAudioRateDir"}, $$parms{"DownsampleRate"}, $$parms{"DownsampleBitsPerSample"}) = ("8kHz_16bit", 8000, 16); 63 $$parms{"path_main"} = "$AudioDirectory/Main/" . $$parms{"TargetAudioRateDir"}; 64 $$parms{"path_mfcc"} = "$AudioDirectory/MFCC/" . $$parms{"TargetAudioRateDir"} . "/" . $$parms{"HTK_ParameterKind"}; 65 Repository::Main::Process($parms, \%AudioDirParms) || die "Repository error: $?"; 66 Repository::MFCC::Create($parms, \%AudioDirParms) || die "Repository error: $?"; 68 67 # target 16kHz:16bit, MFCC_0_D 69 ($ parms{"TargetAudioRateDir"}, $parms{"DownsampleRate"},$parms{"DownsampleBitsPerSample"}) = ("16kHz_16bit", 16000, 16);70 $ parms{"path_main"} = "$AudioDirectory/Main/" .$parms{"TargetAudioRateDir"};71 $ parms{"path_mfcc"} = "$AudioDirectory/MFCC/" . $parms{"TargetAudioRateDir"} . "/" .$parms{"HTK_ParameterKind"};72 Repository::Main::Process( \%parms, \%AudioDirParms) || die "Repository error: $?";73 Repository::MFCC::Create( \%parms, \%AudioDirParms) || die "Repository error: $?";74 UserSubmission::PROMPTS::UpdateMasterPrompts( \%parms, \%AudioDirParms) || die "Repository error: $?";75 UserSubmission::Cleanup( \%parms, \%AudioDirParms) || die "Repository error: $?";68 ($$parms{"TargetAudioRateDir"}, $$parms{"DownsampleRate"}, $$parms{"DownsampleBitsPerSample"}) = ("16kHz_16bit", 16000, 16); 69 $$parms{"path_main"} = "$AudioDirectory/Main/" . $$parms{"TargetAudioRateDir"}; 70 $$parms{"path_mfcc"} = "$AudioDirectory/MFCC/" . $$parms{"TargetAudioRateDir"} . "/" . $$parms{"HTK_ParameterKind"}; 71 Repository::Main::Process($parms, \%AudioDirParms) || die "Repository error: $?"; 72 Repository::MFCC::Create($parms, \%AudioDirParms) || die "Repository error: $?"; 73 UserSubmission::PROMPTS::UpdateMasterPrompts($parms, \%AudioDirParms) || die "Repository error: $?"; 74 UserSubmission::Cleanup($parms, \%AudioDirParms) || die "Repository error: $?"; 76 75 } 77 76 print "\nRepository.pl completed!****************************************************\n\n"; Trunk/Scripts/Mirroring_scripts/RunDaily.pl
r2129 r2136 71 71 AcousticModel::Create(\%parms) || die "UserSubmissions error: $?"; 72 72 73 Nightly _test::Process(\%parms) || die "UserSubmissions error: $?";73 NightlyTest::Process(\%parms) || die "UserSubmissions error: $?"; 74 74 #TarFiles::Create($parms); 75 75 #Rsync(); Trunk/Scripts/Mirroring_scripts/VoxForge_config.pm
r2132 r2136 73 73 $parms{"TarFiles_dir"} = $parms{"MirroringScripts_dir"}."/TarFiles"; 74 74 $parms{"Testing_scripts_dir"} = $parms{"ScriptsDirectory"}."/Testing_scripts"; 75 $parms{"Nightly_test_dir"} = $parms{"Testing_scripts_dir"}."/Nightly _test";75 $parms{"Nightly_test_dir"} = $parms{"Testing_scripts_dir"}."/NightlyTest"; 76 76 $parms{"Metrics_scripts_dir"} = $parms{"ScriptsDirectory"}."/Metrics_scripts"; 77 77 $parms{"directories2mirror"} = "TarFiles/Audio/directories2mirror"; Trunk/Scripts/Testing_scripts/NightlyTest.pm
r2133 r2136 2 2 #################################################################### 3 3 ### 4 ### script name: Nightly _Test.pm4 ### script name: NightlyTest.pm 5 5 ### modified by: Ken MacLean 6 6 ### email: contact@voxforge.org 7 7 ### Date: 2007.01.24 8 ### Command: ./Nightly_Test.pm9 8 ### Version: 0.1 10 9 ### … … 22 21 ### 23 22 #################################################################### 24 package Nightly _test;23 package NightlyTest; 25 24 use strict; 26 25 use File::Spec; … … 47 46 \n"; 48 47 49 process16kHz_16bit($parms, $disclaimer) || die "Nightly _test error: $?";50 process8kHz_16bit($parms, $disclaimer)|| die "Nightly _test error: $?";48 process16kHz_16bit($parms, $disclaimer) || die "NightlyTest error: $?"; 49 process8kHz_16bit($parms, $disclaimer)|| die "NightlyTest error: $?"; 51 50 return 1; 52 51 } … … 65 64 print OUTPUT "$disclaimer\n"; 66 65 print OUTPUT "Testing Acoustic Models created in: $Nightly_dirname\n\n"; 67 HTK_16kHz_16bit($parms, $NightlyAM_16kHz_16bit) || die "Nightly _test error: $?";68 Julian_16kHz_16bit($parms, $NightlyAM_16kHz_16bit) || die "Nightly _test error: $?";66 HTK_16kHz_16bit($parms, $NightlyAM_16kHz_16bit) || die "NightlyTest error: $?"; 67 Julian_16kHz_16bit($parms, $NightlyAM_16kHz_16bit) || die "NightlyTest error: $?"; 69 68 PrintNotes(); 70 69 # !!!!!! … … 73 72 #($CurrentBuild_dir)\n"; 74 73 # print OUTPUT "================================================================================================================\n"; 75 # HTK_16kHz_16bit(\%parms, $CurrentAM_16kHz_16bit) || die "Nightly _test error: $?";76 # Julian_16kHz_16bit(\%parms, $CurrentAM_16kHz_16bit) || die "Nightly _test error: $?";74 # HTK_16kHz_16bit(\%parms, $CurrentAM_16kHz_16bit) || die "NightlyTest error: $?"; 75 # Julian_16kHz_16bit(\%parms, $CurrentAM_16kHz_16bit) || die "NightlyTest error: $?"; 77 76 # PrintNotes(); 78 77 # !!!!!! … … 90 89 open(OUTPUT, ">$NightlyAM_8kHz_16bit/TestResults") or die ("cannot write to TestResults file"); # open for output 91 90 print OUTPUT "$disclaimer\n"; 92 HTK_8kHz_16bit($parms, $NightlyAM_8kHz_16bit) || die "Nightly _test error: $?";93 Julian_8kHz_16bit($parms, $NightlyAM_8kHz_16bit) || die "Nightly _test error: $?";91 HTK_8kHz_16bit($parms, $NightlyAM_8kHz_16bit) || die "NightlyTest error: $?"; 92 Julian_8kHz_16bit($parms, $NightlyAM_8kHz_16bit) || die "NightlyTest error: $?"; 94 93 PrintNotes(); 95 94 # !!!!!! … … 99 98 # print OUTPUT "================================================================================================================\n"; 100 99 # print OUTPUT "$disclaimer\n"; 101 # HTK_8kHz_16bit(\%parms, $CurrentAM_8kHz_16bit) || die "Nightly _test error: $?";102 # Julian_8kHz_16bit(\%parms, $CurrentAM_8kHz_16bit) || die "Nightly _test error: $?";100 # HTK_8kHz_16bit(\%parms, $CurrentAM_8kHz_16bit) || die "NightlyTest error: $?"; 101 # Julian_8kHz_16bit(\%parms, $CurrentAM_8kHz_16bit) || die "NightlyTest error: $?"; 103 102 # PrintNotes(); 104 103 # !!!!!!