Merge pull request #618 from luotao1/activation-bug

reyoung · web-flow · commit b47aff693644 · 2016-11-25T02:33:27.000-06:00
fix LogActivation is not defined
diff --git a/python/paddle/trainer_config_helpers/activations.py b/python/paddle/trainer_config_helpers/activations.py
@@ -16,7 +16,8 @@
     "TanhActivation", "SigmoidActivation", "SoftmaxActivation",
     "IdentityActivation", "LinearActivation", 'SequenceSoftmaxActivation',
     'ExpActivation', "ReluActivation", "BReluActivation", "SoftReluActivation",
-    "STanhActivation", "AbsActivation", "SquareActivation", "BaseActivation"
+    "STanhActivation", "AbsActivation", "SquareActivation", "BaseActivation",
+    "LogActivation"
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@`
`16`	`16`	`"TanhActivation", "SigmoidActivation", "SoftmaxActivation",`
`17`	`17`	`"IdentityActivation", "LinearActivation", 'SequenceSoftmaxActivation',`
`18`	`18`	`'ExpActivation', "ReluActivation", "BReluActivation", "SoftReluActivation",`
`19`		`- "STanhActivation", "AbsActivation", "SquareActivation", "BaseActivation"`
	`19`	`+ "STanhActivation", "AbsActivation", "SquareActivation", "BaseActivation",`
	`20`	`+ "LogActivation"`
`20`	`21`	`]`
`21`	`22`
`22`	`23`