Skip to content

Commit 32c8c4d

Browse files
CadlaxaCadlaxa
authored
Precompiled ARPA+ G2p and code fixes
1 parent 5a4ef92 commit 32c8c4d

23 files changed

+3235
-123
lines changed

‎ARPAsingPlusPhonemizer/ArpaPlusPhonemizer.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,19 @@
1111
<ProjectReference Include="..\OpenUtau.Plugin.Builtin\OpenUtau.Plugin.Builtin.csproj" />
1212
</ItemGroup>
1313

14+
<ItemGroup>
15+
<Compile Update="Resources.Designer.cs">
16+
<DesignTime>True</DesignTime>
17+
<AutoGen>True</AutoGen>
18+
<DependentUpon>Resources.resx</DependentUpon>
19+
</Compile>
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<EmbeddedResource Update="Resources.resx">
24+
<Generator>ResXFileCodeGenerator</Generator>
25+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
26+
</EmbeddedResource>
27+
</ItemGroup>
28+
1429
</Project>

‎ARPAsingPlusPhonemizer/ArpabetPlusG2p.cs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using Microsoft.ML.OnnxRuntime;
5+
using OpenUtau.Api;
6+
using ArpaPlusPhonemizer;
7+
8+
namespace OpenUtau.Core.G2p {
9+
public class ArpabetPlusG2p : G2pPack {
10+
private static readonly string[] graphemes = new string[] {
11+
"", "", "", "", "\'", "-", "a", "b", "c", "d", "e",
12+
"f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
13+
"q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
14+
};
15+
16+
private static readonly string[] phonemes = new string[] {
17+
"", "", "", "", "aa", "ae", "ah", "ao", "aw", "ax", "ay", "b", "ch",
18+
"d", "dh", "dr", "dx", "eh", "er", "ey", "f", "g", "hh", "ih", "iy", "jh",
19+
"k", "l", "m", "n", "ng", "ow", "oy", "p", "q", "r", "s", "sh", "t",
20+
"th", "tr", "uh", "uw", "v", "w", "y", "z", "zh",
21+
};
22+
23+
private static object lockObj = new object();
24+
private static Dictionary<string, int> graphemeIndexes;
25+
private static IG2p dict;
26+
private static InferenceSession session;
27+
private static Dictionary<string, string[]> predCache = new Dictionary<string, string[]>();
28+
29+
public ArpabetPlusG2p() {
30+
lock (lockObj) {
31+
if (graphemeIndexes == null) {
32+
graphemeIndexes = graphemes
33+
.Skip(4)
34+
.Select((g, i) => Tuple.Create(g, i))
35+
.ToDictionary(t => t.Item1, t => t.Item2 + 4);
36+
var tuple = LoadPack(
37+
ArpaPlusPhonemizer.Resources.g2p_arpabet_plus,
38+
s => s.ToLowerInvariant(),
39+
s => RemoveTailDigits(s.ToLowerInvariant()));
40+
dict = tuple.Item1;
41+
session = tuple.Item2;
42+
}
43+
}
44+
GraphemeIndexes = graphemeIndexes;
45+
Phonemes = phonemes;
46+
Dict = dict;
47+
Session = session;
48+
PredCache = predCache;
49+
}
50+
}
51+
}

‎ARPAsingPlusPhonemizer/ArpasingPlusPhonemizer.cs‎

Lines changed: 108 additions & 123 deletions
Large diffs are not rendered by default.

‎ARPAsingPlusPhonemizer/Data/Resources.Designer.cs‎

Lines changed: 93 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ARPAsingPlusPhonemizer/Data/Resources.resx‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="arpasing_template" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>arpasing.template.yaml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123+
</data>
124+
<data name="envccv_template" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>envccv.template.yaml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126+
</data>
127+
<data name="xsampa_template" type="System.Resources.ResXFileRef, System.Windows.Forms">
128+
<value>xsampa.template.yaml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129+
</data>
130+
</root>

‎ARPAsingPlusPhonemizer/Data/arpasing.template.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
%YAML 1.2
2+
---
3+
symbols:
4+
- {symbol: aa, type: vowel}
5+
- {symbol: ae, type: vowel}
6+
- {symbol: ah, type: vowel}
7+
- {symbol: ao, type: vowel}
8+
- {symbol: aw, type: vowel}
9+
- {symbol: ay, type: vowel}
10+
- {symbol: b, type: stop}
11+
- {symbol: ch, type: affricate}
12+
- {symbol: d, type: stop}
13+
- {symbol: dh, type: fricative}
14+
- {symbol: eh, type: vowel}
15+
- {symbol: er, type: vowel}
16+
- {symbol: ey, type: vowel}
17+
- {symbol: f, type: fricative}
18+
- {symbol: g, type: stop}
19+
- {symbol: hh, type: aspirate}
20+
- {symbol: ih, type: vowel}
21+
- {symbol: iy, type: vowel}
22+
- {symbol: jh, type: affricate}
23+
- {symbol: k, type: stop}
24+
- {symbol: l, type: liquid}
25+
- {symbol: m, type: nasal}
26+
- {symbol: n, type: nasal}
27+
- {symbol: ng, type: nasal}
28+
- {symbol: ow, type: vowel}
29+
- {symbol: oy, type: vowel}
30+
- {symbol: p, type: stop}
31+
- {symbol: r, type: liquid}
32+
- {symbol: s, type: fricative}
33+
- {symbol: sh, type: fricative}
34+
- {symbol: t, type: stop}
35+
- {symbol: th, type: fricative}
36+
- {symbol: uh, type: vowel}
37+
- {symbol: uw, type: vowel}
38+
- {symbol: v, type: fricative}
39+
- {symbol: w, type: semivowel}
40+
- {symbol: y, type: semivowel}
41+
- {symbol: z, type: fricative}
42+
- {symbol: zh, type: fricative}
43+
entries:
44+
- grapheme: openutau
45+
phonemes: [ow, p, eh, n, w, uw, t, ah, w, uw]

0 commit comments

Comments
 (0)