nntrf 1.0.1__py3-none-any.whl → 1.0.4__py3-none-any.whl

nntrf/models/composite.py

@@ -1,6 +1,6 @@
 import torch
 
-class TwoMixedTRF(torch.nn.Module):
+class MixedTRF(torch.nn.Module):
         
     def __init__(
         self,

nntrf/models/linear.py

@@ -214,9 +214,9 @@ class CNNTRF(torch.nn.Module):
         b = b * 1/self.fs
         b = b[0]
         w = np.flip(w,axis = 1).copy()
-        w = torch.FloatTensor(w).to(device)
+        w = torch.from_numpy(w).to(device)
         w = w.permute(2,0,1)
-        b = torch.FloatTensor(b).to(device)
+        b = torch.from_numpy(b).to(device)
         with torch.no_grad():
             self.oCNN.weight = torch.nn.Parameter(w)
             self.oCNN.bias = torch.nn.Parameter(b)

nntrf/models/nonlinear.py

@@ -146,8 +146,8 @@ class LTITRFGen(torch.nn.Module):
         b = b[0]
         w = w * 1 / fs
         b = b * 1/ fs
-        w = torch.FloatTensor(w).to(device)
-        b = torch.FloatTensor(b).to(device)
+        w = torch.from_numpy(w).to(device)
+        b = torch.from_numpy(b).to(device)
         w = w.permute(2, 0, 1) #(nOutChan, nInChan, nLag)
         with torch.no_grad():
             self.weight = torch.nn.Parameter(w)
@@ -359,7 +359,8 @@ def build_gaussian_response(x, mu, sigma):
     # output: (nBatch, nBasis, outDim, inDim, nWin, nSeq)
 
     # x: (nBatch, 1, 1, 1, nWin, nSeq)
-    x = x[:, None, ...]
+    if x.ndim == 5:
+        x = x[:, None, ...]
     # mu: (nBasis, 1, 1, 1, 1)
     mu = mu[..., None, None, None, None]
     # sigma: (nBasis, outDim, inDim,  1, 1)
@@ -901,7 +902,8 @@ class FuncTRFsGen(torch.nn.Module):
         return inDim, outDim, device
 
     def fitFuncTRF(self, w):
-        w = w * 1 / self.fs
+        # do the self.fs operation here because basisTRF doesn't keep fs info
+        w = w * 1 / self.fs 
         with torch.no_grad():
             self.basisTRF.fitTRFs(w)
         return self
@@ -960,9 +962,11 @@ class FuncTRFsGen(torch.nn.Module):
             cIdx = midParamList.index('c')
             #(nBatch, 1, 1, 1, nSeq)
             cSeq = self.pickParam(paramSeqs, cIdx)
+            # print('c: ',cSeq.squeeze())
             #two reasons, cSeq must be larger than 0; 
             #if 1 is the optimum, abs will have two x for the optimum, 
             # which is not stable 
+            # cSeq = torch.tanh(cSeq) #expr
             cSeq =  1 + cSeq
             cSeq = torch.maximum(cSeq, torch.tensor(0.5))
             cSeq = torch.minimum(cSeq, torch.tensor(1.28))
@@ -1030,7 +1034,8 @@ class ASTRF(torch.nn.Module):
         fs,
         trfsGen = None,
         device = 'cpu',
-        x_is_timeseries = False
+        x_is_timeseries = False,
+        verbose = True
     ):
         '''
         inDim: int, the number of columns of input 
@@ -1060,8 +1065,9 @@ class ASTRF(torch.nn.Module):
             self.init_nonLinTRFs_bias(inDim, nWin, outDim, device)
         
         self.trfAligner = TRFAligner(device)
-        self._enableUserTRFGen = False 
+        self._enableUserTRFGen = True 
         self.device = device
+        self.verbose = verbose
 
     @property
     def inDim(self):
@@ -1126,7 +1132,8 @@ class ASTRF(torch.nn.Module):
     @if_enable_trfsGen.setter
     def if_enable_trfsGen(self,x):
         assert isinstance(x, bool)
-        print('set ifEnableNonLin',x)
+        if self.verbose:
+            print('set ifEnableNonLin',x)
         if x == True and self.trfsGen is None:
             raise ValueError('trfGen is None, cannot be enabled')
         self._enableUserTRFGen = x
@@ -1155,7 +1162,7 @@ class ASTRF(torch.nn.Module):
             if timeinfo[ix] is not None:
                 # print(timeinfo[ix].shape)
                 if not self.x_is_timeseries:
-                    assert timeinfo[ix].shape[-1] == xi.shape[-1]
+                    assert timeinfo[ix].shape[-1] == xi.shape[-1], f"{timeinfo[ix].shape[-1]} != {xi.shape[-1]}"
                 nLen = torch.ceil(
                     timeinfo[ix][0][-1] * self.fs
                 ).long() + self.nWin

{nntrf-1.0.1.dist-info → nntrf-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nntrf
-Version: 1.0.1
+Version: 1.0.4
 Home-page: https://github.com/powerfulbean/nnTRF
 Author: Jin Dou
 Author-email: jindou.bci@gmail.com
@@ -10,9 +10,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=1.20.1
-Requires-Dist: torch<2.0.0,>=1.12.1
-Requires-Dist: scikit-fda==0.7.1
+Requires-Dist: numpy
+Requires-Dist: torch
 Requires-Dist: mtrf
 Requires-Dist: scipy
 Dynamic: author
@@ -20,5 +19,6 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python

nntrf-1.0.4.dist-info/RECORD

@@ -0,0 +1,13 @@
+nntrf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nntrf/loss.py,sha256=h-ZzLoBd3S0uRENiqyfwTpb75x6Xp6WjRpNnD-_jraE,651
+nntrf/metrics.py,sha256=TUkg2yVXhNTW96uxHu4nMYKWvt7jbh_HdHVo9ii3Lpw,782
+nntrf/utils.py,sha256=h6vdrNvArn88cOhsCXz1_24a-HPiX36RfzNfq-jAdn0,224
+nntrf/models/__init__.py,sha256=9RSC1DAp-d2ZgKndAk6myWn7ogyMj5ODkLPemBrStnE,71
+nntrf/models/composite.py,sha256=qgni2yZgTUFAiGP96egSKg5m7PNCmawb6suroV7tuvo,2136
+nntrf/models/linear.py,sha256=MrsVGnIIkuOOMXcBff1GQOiX2l5isF6_8f_2XOrgTrk,8203
+nntrf/models/nonlinear.py,sha256=UM-xOgxCsgy9_oMv1Zc84Ep6C9bGnYUXELr_oY-wLZw,45853
+nntrf-1.0.4.dist-info/licenses/LICENSE,sha256=BxgW39X9rivrb3TVuhpIgjctmWn3HsvEsN4dXtTDNgU,1069
+nntrf-1.0.4.dist-info/METADATA,sha256=RUJ5wmeeYYQiOGW90CQZpXdcFEzqBhFbF8E00rpVcWw,644
+nntrf-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nntrf-1.0.4.dist-info/top_level.txt,sha256=amAdTZ4QBomZv41i3oWF5lnkU6187LpyDIqhpJSCw4g,6
+nntrf-1.0.4.dist-info/RECORD,,

{nntrf-1.0.1.dist-info → nntrf-1.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nntrf-1.0.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-nntrf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nntrf/loss.py,sha256=h-ZzLoBd3S0uRENiqyfwTpb75x6Xp6WjRpNnD-_jraE,651
-nntrf/metrics.py,sha256=TUkg2yVXhNTW96uxHu4nMYKWvt7jbh_HdHVo9ii3Lpw,782
-nntrf/utils.py,sha256=h6vdrNvArn88cOhsCXz1_24a-HPiX36RfzNfq-jAdn0,224
-nntrf/models/__init__.py,sha256=9RSC1DAp-d2ZgKndAk6myWn7ogyMj5ODkLPemBrStnE,71
-nntrf/models/composite.py,sha256=3nQIy0MZmgo9-OCj0mPD3hcUUkHG0lK1h9tyyZtIaiM,2139
-nntrf/models/linear.py,sha256=DPcQK6ol0zXaDo8p1S5zb-075fG1L0NbfwMlQzm_fyw,8205
-nntrf/models/nonlinear.py,sha256=E0bQAa78DMd8YgQ7JOSmyUbdfq_UwgXQTJ9UmzN15vg,45536
-nntrf-1.0.1.dist-info/LICENSE,sha256=BxgW39X9rivrb3TVuhpIgjctmWn3HsvEsN4dXtTDNgU,1069
-nntrf-1.0.1.dist-info/METADATA,sha256=kY-Zfhrj2GS5wElgNcX-sVw-n6v2HzZLRKo2_u1Zd8M,678
-nntrf-1.0.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nntrf-1.0.1.dist-info/top_level.txt,sha256=amAdTZ4QBomZv41i3oWF5lnkU6187LpyDIqhpJSCw4g,6
-nntrf-1.0.1.dist-info/RECORD,,