Merge pull request #1014 from reyoung/feature/fix_bugs_in_math

Rename math.py to layer_math.py

python/paddle/trainer_config_helpers/__init__.py

@@ -20,6 +20,4 @@ from layers import *
 from networks import *
 from optimizers import *
 from attrs import *
-
+import layer_math
-# This will enable operator overload for LayerOutput
-import math as layer_math