提交 1d26096a authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Merge pull request #531 from nouiz/crash_fix

Crash fix
...@@ -44,6 +44,9 @@ Internal changes ...@@ -44,6 +44,9 @@ Internal changes
Crash Fix Crash Fix
* Don't try to use blas library when told to don't use them(Frederic B.) * Don't try to use blas library when told to don't use them(Frederic B.)
* When importing theano on a computer without without gpu with the Theano
flags device or init_gpu_device to gpu* (Frederic B., Reported Luo Heng)
============= =============
Release Notes Release Notes
......
...@@ -101,8 +101,9 @@ if config.device.startswith('gpu') or config.init_gpu_device.startswith('gpu'): ...@@ -101,8 +101,9 @@ if config.device.startswith('gpu') or config.init_gpu_device.startswith('gpu'):
# We can't test the driver during import of theano.sandbox.cuda as # We can't test the driver during import of theano.sandbox.cuda as
# this cause circular import dependency. So we also test it manually # this cause circular import dependency. So we also test it manually
# after the import # after the import
import theano.sandbox.cuda.tests.test_driver if theano.sandbox.cuda.cuda_available:
theano.sandbox.cuda.tests.test_driver.test_nvidia_driver1() import theano.sandbox.cuda.tests.test_driver
theano.sandbox.cuda.tests.test_driver.test_nvidia_driver1()
# Use config.numpy to call numpy.seterr # Use config.numpy to call numpy.seterr
import numpy import numpy
......
差异被折叠。
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论