2.0rc1 (#387)

MontrealCorpusTools · Jan 11, 2022 · 96b61b3 · 96b61b3
1 parent 63473f9
commit 96b61b3
Show file tree

Hide file tree

Showing 29 changed files with 817 additions and 879 deletions.
diff --git a/docs/source/changelog/changelog_2.0.rst b/docs/source/changelog/changelog_2.0.rst
@@ -10,6 +10,15 @@
 Beta releases
 =============
 
+2.0.0rc1
+--------
+
+- Getting closer to stable release!
+- Fixed some bugs in how transcription and alignment accuracy were calculated
+- Added additional information to evaluation output files
+- Added file listing average per-frame log-likelihoods by utterance for alignment
+- Fixed a bug where having "<s>" in a transcript would cause MFA to crash
+
 2.0.0b11
 --------
 

diff --git a/montreal_forced_aligner/abc.py b/montreal_forced_aligner/abc.py
@@ -16,7 +16,6 @@
     TYPE_CHECKING,
     Any,
     Dict,
-    Iterable,
     List,
     Optional,
     Set,
@@ -47,7 +46,6 @@
     "TrainerMixin",
     "DictionaryEntryType",
     "ReversedMappingType",
-    "Labels",
     "WordsType",
     "OneToOneMappingType",
     "OneToManyMappingType",
@@ -58,7 +56,6 @@
 
 # Configuration types
 MetaDict = Dict[str, Any]
-Labels: Iterable[Any]
 CtmErrorDict: Dict[Tuple[str, int], str]
 
 # Dictionary types
@@ -426,7 +423,9 @@ def parse_args(cls, args: Optional[Namespace], unknown_args: Optional[List[str]]
                     val = unknown_args[i + 1]
                 unknown_dict[name] = val
         for name, param_type in param_types.items():
-            if name.endswith("_directory") or name.endswith("_path"):
+            if (name.endswith("_directory") and name != "audio_directory") or name.endswith(
+                "_path"
+            ):
                 continue
             if args is not None and hasattr(args, name):
                 params[name] = param_type(getattr(args, name))

diff --git a/montreal_forced_aligner/acoustic_modeling/base.py b/montreal_forced_aligner/acoustic_modeling/base.py
@@ -887,7 +887,7 @@ def meta(self) -> MetaDict:
             "architecture": self.architecture,
             "train_date": str(datetime.now()),
             "features": self.feature_options,
-            "phone_set_type": str(self.phone_set_type),
+            "phone_set_type": str(self.worker.phone_set_type),
         }
         return data
 

diff --git a/montreal_forced_aligner/acoustic_modeling/sat.py b/montreal_forced_aligner/acoustic_modeling/sat.py
@@ -214,7 +214,7 @@ def _trainer_initialization(self) -> None:
         os.rename(self.model_path, self.next_model_path)
 
         self.iteration = 1
-        print(os.path.exists(os.path.join(self.previous_aligner.working_directory, "trans.0.ark")))
+
         if os.path.exists(os.path.join(self.previous_aligner.working_directory, "trans.0.ark")):
             for j in self.jobs:
                 for path in j.construct_path_dictionary(

diff --git a/montreal_forced_aligner/acoustic_modeling/trainer.py b/montreal_forced_aligner/acoustic_modeling/trainer.py
@@ -346,6 +346,7 @@ def align(self) -> None:
                     f"Analyzing alignment diagnostics for {self.current_aligner.identifier} on the full corpus"
                 )
             self.compile_information()
+            self.collect_alignments()
             with open(done_path, "w"):
                 pass
         except Exception as e: