Skip to content

Commit a801c43

Browse files
yzhangcsyzhangcs
committed
Rename classes
1 parent b1f33a9 commit a801c43

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

‎docs/source/structs/vi.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@ Variational Inference
44

55
.. currentmodule:: supar.structs.vi
66

7-
MFVIDependency
7+
DependencyMFVI
88
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9-
.. autoclass:: MFVIDependency
9+
.. autoclass:: DependencyMFVI
1010
:members:
1111

12-
LBPDependency
12+
DependencyLBP
1313
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14-
.. autoclass:: LBPDependency
14+
.. autoclass:: DependencyLBP
1515
:members:
1616

17-
MFVIConstituency
17+
ConstituencyMFVI
1818
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
19-
.. autoclass:: MFVIConstituency
19+
.. autoclass:: ConstituencyMFVI
2020
:members:
2121

22-
LBPConstituency
22+
ConstituencyLBP
2323
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
24-
.. autoclass:: LBPConstituency
24+
.. autoclass:: ConstituencyLBP
2525
:members:
2626

27-
MFVISemanticDependency
27+
SemanticDependencyMFVI
2828
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
29-
.. autoclass:: MFVISemanticDependency
29+
.. autoclass:: SemanticDependencyMFVI
3030
:members:
3131

32-
LBPSemanticDependency
32+
SemanticDependencyLBP
3333
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
34-
.. autoclass:: LBPSemanticDependency
34+
.. autoclass:: SemanticDependencyLBP
3535
:members:

‎supar/models/const.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import torch.nn as nn
55
from supar.models.model import Model
66
from supar.modules import MLP, Biaffine, Triaffine
7-
from supar.structs import CRFConstituency, LBPConstituency, MFVIConstituency
7+
from supar.structs import ConstituencyLBP, ConstituencyMFVI, CRFConstituency
88
from supar.utils import Config
99
from supar.utils.alg import cky
1010

@@ -357,7 +357,7 @@ def __init__(self,
357357
self.span_attn = Biaffine(n_in=n_span_mlp, bias_x=True, bias_y=False)
358358
self.pair_attn = Triaffine(n_in=n_pair_mlp, bias_x=True, bias_y=False)
359359
self.label_attn = Biaffine(n_in=n_label_mlp, n_out=n_labels, bias_x=True, bias_y=True)
360-
self.inference = (MFVIConstituency if inference == 'mfvi' else LBPConstituency)(max_iter)
360+
self.inference = (ConstituencyMFVI if inference == 'mfvi' else ConstituencyLBP)(max_iter)
361361
self.criterion = nn.CrossEntropyLoss()
362362

363363
def forward(self, words, feats):

‎supar/models/dep.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import torch.nn as nn
55
from supar.models.model import Model
66
from supar.modules import MLP, Biaffine, Triaffine
7-
from supar.structs import (CRF2oDependency, CRFDependency, MatrixTree,
8-
MFVIDependency, LBPDependency)
7+
from supar.structs import (CRF2oDependency, CRFDependency, DependencyLBP,
8+
DependencyMFVI, MatrixTree)
99
from supar.utils import Config
1010
from supar.utils.alg import eisner, eisner2o, mst
1111
from supar.utils.transform import CoNLL
@@ -746,7 +746,7 @@ def __init__(self,
746746
self.arc_attn = Biaffine(n_in=n_arc_mlp, scale=scale, bias_x=True, bias_y=False)
747747
self.sib_attn = Triaffine(n_in=n_sib_mlp, scale=scale, bias_x=True, bias_y=True)
748748
self.rel_attn = Biaffine(n_in=n_rel_mlp, n_out=n_rels, bias_x=True, bias_y=True)
749-
self.inference = (MFVIDependency if inference == 'mfvi' else LBPDependency)(max_iter)
749+
self.inference = (DependencyMFVI if inference == 'mfvi' else DependencyLBP)(max_iter)
750750
self.criterion = nn.CrossEntropyLoss()
751751

752752
def forward(self, words, feats=None):

‎supar/models/sdp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import torch.nn as nn
44
from supar.models.model import Model
55
from supar.modules import MLP, Biaffine, Triaffine
6-
from supar.structs import LBPSemanticDependency, MFVISemanticDependency
6+
from supar.structs import SemanticDependencyLBP, SemanticDependencyMFVI
77
from supar.utils import Config
88

99

@@ -372,7 +372,7 @@ def __init__(self,
372372
self.cop_attn = Triaffine(n_in=n_pair_mlp, bias_x=True, bias_y=True)
373373
self.grd_attn = Triaffine(n_in=n_pair_mlp, bias_x=True, bias_y=True)
374374
self.label_attn = Biaffine(n_in=n_label_mlp, n_out=n_labels, bias_x=True, bias_y=True)
375-
self.inference = (MFVISemanticDependency if inference == 'mfvi' else LBPSemanticDependency)(max_iter)
375+
self.inference = (SemanticDependencyMFVI if inference == 'mfvi' else SemanticDependencyLBP)(max_iter)
376376
self.criterion = nn.CrossEntropyLoss()
377377

378378
def forward(self, words, feats=None):

‎supar/structs/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from .treecrf import (CRF2oDependency, CRFConstituency, CRFDependency,
44
MatrixTree)
5-
from .vi import (LBPConstituency, LBPDependency, LBPSemanticDependency,
6-
MFVIConstituency, MFVIDependency, MFVISemanticDependency)
5+
from .vi import (ConstituencyLBP, ConstituencyMFVI, DependencyLBP,
6+
DependencyMFVI, SemanticDependencyLBP, SemanticDependencyMFVI)
77

8-
__all__ = ['CRF2oDependency', 'CRFConstituency', 'CRFDependency', 'LBPConstituency', 'LBPDependency',
9-
'LBPSemanticDependency', 'MatrixTree', 'MFVIConstituency', 'MFVIDependency', 'MFVISemanticDependency']
8+
__all__ = ['CRF2oDependency', 'CRFConstituency', 'CRFDependency', 'ConstituencyLBP', 'DependencyLBP',
9+
'SemanticDependencyLBP', 'MatrixTree', 'ConstituencyMFVI', 'DependencyMFVI', 'SemanticDependencyMFVI']

‎supar/structs/vi.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from supar.utils.common import MIN
77

88

9-
class MFVIDependency(nn.Module):
9+
class DependencyMFVI(nn.Module):
1010
r"""
1111
Mean Field Variational Inference for approximately calculating marginals
1212
of dependency trees :cite:`wang-tu-2020-second`.
@@ -75,7 +75,7 @@ def mfvi(self, s_arc, s_sib, mask):
7575
return q.permute(2, 1, 0)
7676

7777

78-
class LBPDependency(nn.Module):
78+
class DependencyLBP(nn.Module):
7979
r"""
8080
Loopy Belief Propagation for approximately calculating marginals
8181
of dependency trees :cite:`smith-eisner-2008-dependency`.
@@ -150,7 +150,7 @@ def lbp(self, s_arc, s_sib, mask):
150150
return q.permute(2, 1, 0)
151151

152152

153-
class MFVIConstituency(nn.Module):
153+
class ConstituencyMFVI(nn.Module):
154154
r"""
155155
Mean Field Variational Inference for approximately calculating marginals of constituent trees.
156156
"""
@@ -217,7 +217,7 @@ def mfvi(self, s_span, s_pair, mask):
217217
return q.permute(2, 0, 1)
218218

219219

220-
class LBPConstituency(nn.Module):
220+
class ConstituencyLBP(nn.Module):
221221
r"""
222222
Loopy Belief Propagation for approximately calculating marginals of constituent trees.
223223
"""
@@ -289,7 +289,7 @@ def lbp(self, s_span, s_pair, mask):
289289
return q.permute(3, 2, 1, 0)
290290

291291

292-
class MFVISemanticDependency(nn.Module):
292+
class SemanticDependencyMFVI(nn.Module):
293293
r"""
294294
Mean Field Variational Inference for approximately calculating marginals
295295
of semantic dependency trees :cite:`wang-etal-2019-second`.
@@ -363,7 +363,7 @@ def mfvi(self, s_edge, s_sib, s_cop, s_grd, mask):
363363
return q.permute(2, 1, 0)
364364

365365

366-
class LBPSemanticDependency(nn.Module):
366+
class SemanticDependencyLBP(nn.Module):
367367
r"""
368368
Loopy Belief Propagation for approximately calculating marginals
369369
of semantic dependency trees :cite:`wang-etal-2019-second`.

0 commit comments

Comments
 (0)