Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix-7555

pkuyym · pkuyym · commit 2edfd764ab9c · 2018-01-22T21:29:23.000+08:00
diff --git a/python/paddle/v2/fluid/layers/math_op_patch.py b/python/paddle/v2/fluid/layers/math_op_patch.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from ..framework import Variable, unique_name
-from ..registry import OpProtoHolder
+from layer_function_generator import OpProtoHolder
 
 __all__ = ['monkey_patch_variable']
 
