seq_len and other fixes

This commit is contained in:
wassname
2022-11-23 12:02:22 +08:00
parent fc1a605b01
commit cb27d2ded3
10 changed files with 488 additions and 374 deletions
+6 -6
View File
@@ -12,16 +12,16 @@ from torch import Tensor
from models.modules.feature_transforms import GaussianFourierFeatureTransform
from tsai.models.InceptionTimePlus import InceptionTimePlus
from .causalinception import CausalInceptionTimePlus, CausalConv1d
from .causalinception import CausalInceptionTimePlus, CausalConv1d, Conv
def custom_head(head_nf, c_out, seq_len):
return nn.Sequential(
CausalConv1d(head_nf, c_out, 1, bias=False)
# CausalConv1d(head_nf, c_out, 1, bias=False, norm="Spectral")
Conv(head_nf, c_out, 1, bias=False, norm="Spectral"),
)
class INRPlus2(nn.Module):
def __init__(self, in_feats: int, layers: int, layer_size: int, n_fourier_feats: int, scales: float,
def __init__(self, in_feats: int, out_feats:int ,layers: int, layer_size: int, n_fourier_feats: int, scales: float,
dropout: Optional[float] = 0.5, bn=False, *args, **kwargs):
super().__init__()
self.n_fourier_feats = n_fourier_feats
@@ -31,8 +31,8 @@ class INRPlus2(nn.Module):
in_size = in_feats if n_fourier_feats == 0 \
else n_fourier_feats+in_feats
self.layers = CausalInceptionTimePlus(
in_size, layer_size, seq_len=None, nf=layer_size, depth=layers,
flatten=False, concat_pool=False, fc_dropout=dropout, conv_dropout=0.05, bn=bn, y_range=None, custom_head=custom_head, ks=[139, 19, 3], dilation=2, *args, **kwargs
in_size, out_feats, seq_len=None, nf=layer_size, depth=layers,
flatten=False, concat_pool=False, fc_dropout=dropout, conv_dropout=dropout/4, bn=bn, y_range=None, custom_head=custom_head, ks=[139, 19, 3], dilation=2, *args, **kwargs
)
# layers = [INRPlusLayer(in_size, layer_size, dropout=dropout)] + \
# [INRPlusLayer(layer_size, layer_size, dropout=dropout) for _ in range(layers - 1)]