Use getattr to allow function-only activations.

lmjohns3 · Jul 10, 2015 · 325e43a · 325e43a
1 parent 9720e63
commit 325e43a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/theanets/layers/base.py b/theanets/layers/base.py
@@ -209,7 +209,7 @@ def __init__(self, size, inputs, name=None, activation='logistic', **kwargs):
     @property
     def params(self):
         '''A list of all parameters in this layer.'''
-        return self._params + self.activate.params
+        return self._params + getattr(self.activate, 'params', [])
 
     @property
     def num_params(self):
@@ -312,7 +312,7 @@ def log(self):
                      self.name,
                      inputs,
                      self.size,
-                     self.activate.name,
+                     getattr(self.activate, 'name', self.activate),
                      self.num_params)
 
     def _fmt(self, string):

diff --git a/theanets/layers/recurrent.py b/theanets/layers/recurrent.py
@@ -672,7 +672,7 @@ def log(self):
                      inputs,
                      self.size,
                      ' '.join(str(T) for T in self.periods),
-                     self.activate.name,
+                     getattr(self.activate, 'name', self.activate),
                      self.num_params)
 
     def transform(self, inputs):