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

2edfd764 · yangyaming · 61d6db56 · b156bbc8 · 2edfd764
显示空白变更内容
内联并排

Showing with 1 addition and 1 deletion

python/paddle/v2/fluid/layers/math_op_patch.py python/paddle/v2/fluid/layers/math_op_patch.py +1 -1

未找到文件。
--- 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']