Compile

pchavanne · Feb 27, 2017 · 91781e8 · 91781e8
1 parent 9124f52
commit 91781e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/test_activation.py b/tests/test_activation.py
@@ -43,13 +43,13 @@ def test_get_activation():
 def test_activation_to_conf():
     activation = yadll.activations.get_activation(yadll.activations.relu)
     conf = yadll.activations.activation_to_conf(activation)
-    assert conf == ('relu', {})
+    assert conf == 'relu'
     activation = yadll.activations.get_activation((yadll.activations.relu, {'alpha': 0.5}))
     conf = yadll.activations.activation_to_conf(activation)
     assert conf == ('relu', {'alpha': 0.5})
     activation = yadll.activations.get_activation('relu')
     conf = yadll.activations.activation_to_conf(activation)
-    assert conf == ('relu', {})
+    assert conf == 'relu'
     activation = yadll.activations.get_activation(('relu', {'alpha': 0.5}))
     conf = yadll.activations.activation_to_conf(activation)
     assert conf == ('relu', {'alpha': 0.5})

diff --git a/yadll/activations.py b/yadll/activations.py
@@ -43,11 +43,11 @@ def activation(x):
 
 def activation_to_conf(activation):
     func_name = activation.__closure__[0].cell_contents.__name__
-    try:
-        kwargs = activation.__closure__[1].cell_contents
-        conf = (func_name, kwargs)
-    except IndexError:
+    kwargs = activation.__closure__[1].cell_contents
+    if kwargs == {}:
         conf = func_name
+    else:
+        conf = (func_name, kwargs)
     return conf