Port logical_ops to nn

python/paddle/fluid/layers/control_flow.py

@@ -21,7 +21,7 @@ from .. import core
 from ..framework import Program, Variable, Operator
 from ..layer_helper import LayerHelper, unique_name
 from ..initializer import force_init_on_cpu
-from .ops import logical_and, logical_not, logical_or
+from .nn import logical_and, logical_not, logical_or
 import numpy
 import warnings
 import six

python/paddle/fluid/layers/ops.py

@@ -41,10 +41,6 @@ __all__ = [
     'sigmoid_cross_entropy_with_logits',
     'clip',
     'clip_by_norm',
-    'logical_and',
-    'logical_or',
-    'logical_xor',
-    'logical_not',
     'uniform_random_batch_size_like',
     'gaussian_random',
     'sampling_id',