提交 a8371735 authored 作者: Pascal Lamblin's avatar Pascal Lamblin 提交者: Caglar

Fix detection of cula

上级 a0febb21
...@@ -10,9 +10,9 @@ dimshuffle = cuda_ndarray.cuda_ndarray.dimshuffle ...@@ -10,9 +10,9 @@ dimshuffle = cuda_ndarray.cuda_ndarray.dimshuffle
try: try:
from scikits.cuda import cula from scikits.cuda import cula
cula_available = False cula_available = True
except ImportError: except (ImportError, OSError):
warnings.warn("CULA import failed in theano.sandbox.cuda.cula") pass
cula_initialized = False cula_initialized = False
if cula_available and cula and not cula_initialized: if cula_available and cula and not cula_initialized:
......
...@@ -10,12 +10,12 @@ import theano.sandbox.cuda as cuda_ndarray ...@@ -10,12 +10,12 @@ import theano.sandbox.cuda as cuda_ndarray
if not cuda_ndarray.cuda_available: if not cuda_ndarray.cuda_available:
raise SkipTest('Optional package cuda not available') raise SkipTest('Optional package cuda not available')
from theano.misc.pycuda_init import pycuda_available from theano.misc.pycuda_init import pycuda_available
from theano.sandbox.cuda.cula import scikits_cuda_available from theano.sandbox.cuda.cula import cula_available
if not pycuda_available: if not pycuda_available:
raise SkipTest('Optional package pycuda not available') raise SkipTest('Optional package pycuda not available')
if not scikits_cuda_available: if not cula_available:
raise SkipTest('Optional package scikits.cuda not available') raise SkipTest('Optional package scikits.cuda.cula not available')
from theano.sandbox.cuda import cula from theano.sandbox.cuda import cula
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论