condition checking merged

theano/sandbox/cuda/basic_ops.py

@@ -34,14 +34,14 @@ _logger = logging.getLogger(_logger_name)
 
 
 def as_cuda_ndarray_variable(x):
-    if x.owner and isinstance(x.owner.op, HostFromGpu):
-        return x.owner.inputs[0]
-    if \
-            x.owner and \
-            isinstance(x.owner.op, GpuFromHost) and \
-            x.owner.inputs[0].owner and \
-            isinstance(x.owner.inputs[0].owner.op, HostFromGpu):
-        return x.owner.inputs[0].owner.inputs[0]
+    if x.owner:
+        if isinstance(x.owner.op, HostFromGpu):
+            return x.owner.inputs[0]
+        elif \
+                isinstance(x.owner.op, GpuFromHost) and \
+                x.owner.inputs[0].owner and \
+                isinstance(x.owner.inputs[0].owner.op, HostFromGpu):
+            return x.owner.inputs[0].owner.inputs[0]
     if hasattr(x, '_as_CudaNdarrayVariable'):
         return x._as_CudaNdarrayVariable()
     tensor_x = tensor.as_tensor_variable(x)