提交 466d8929 authored 作者: Zhouhan LIN's avatar Zhouhan LIN

solve circular import

上级 1b84c8e5
...@@ -6,7 +6,9 @@ from theano import Op ...@@ -6,7 +6,9 @@ from theano import Op
import theano.tensor as T import theano.tensor as T
from theano.gradient import DisconnectedType from theano.gradient import DisconnectedType
from theano.gpuarray import (basic_ops, GpuArrayType) from .basic_ops import (gpu_contiguous, as_gpuarray_variable,
infer_context_name)
from .type import GpuArrayType
import theano.tensor.fft import theano.tensor.fft
from .opt import register_opt, op_lifter, register_opt2 from .opt import register_opt, op_lifter, register_opt2
...@@ -58,9 +60,8 @@ class CuRFFTOp(Op): ...@@ -58,9 +60,8 @@ class CuRFFTOp(Op):
if not pycuda_available: if not pycuda_available:
raise RuntimeError("pycuda is needed for CuFFTOp") raise RuntimeError("pycuda is needed for CuFFTOp")
inp = basic_ops.gpu_contiguous( inp = gpu_contiguous(as_gpuarray_variable(inp,
basic_ops.as_gpuarray_variable(inp, infer_context_name(inp)))
basic_ops.infer_context_name(inp)))
# If no shape is provided as input, default to input data shape. # If no shape is provided as input, default to input data shape.
if s is None: if s is None:
...@@ -183,9 +184,8 @@ class CuIRFFTOp(Op): ...@@ -183,9 +184,8 @@ class CuIRFFTOp(Op):
if not pycuda_available: if not pycuda_available:
raise RuntimeError("pycuda is needed for CuIFFTOp") raise RuntimeError("pycuda is needed for CuIFFTOp")
inp = basic_ops.gpu_contiguous( inp = gpu_contiguous(as_gpuarray_variable(inp,
basic_ops.as_gpuarray_variable(inp, infer_context_name(inp)))
basic_ops.infer_context_name(inp)))
# If no shape is provided as input, calculate shape assuming even real transform. # If no shape is provided as input, calculate shape assuming even real transform.
if s is None: if s is None:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论