提交 81deaae0 authored 作者: Frederic Bastien's avatar Frederic Bastien

added device=gpu. Needed on angel as the gpu are in exclusive mode and we want…

added device=gpu. Needed on angel as the gpu are in exclusive mode and we want the driver to select the gpu.
上级 37924e4a
...@@ -8,9 +8,11 @@ AddConfigVar('floatX', ...@@ -8,9 +8,11 @@ AddConfigVar('floatX',
EnumStr('float64', 'float32'), EnumStr('float64', 'float32'),
) )
#gpu mean let the driver select the gpu. Needed in case of gpu in exclusive mode.
#gpuX mean use the gpu number X.
AddConfigVar('device', AddConfigVar('device',
"Default device for computations", "Default device for computations",
EnumStr('cpu', *['gpu%i'%i for i in range(4)]) EnumStr('cpu', 'gpu',*['gpu%i'%i for i in range(4)])
) )
# keep the default mode.optimizer==config.optimizer and mode.linker==config.linker! # keep the default mode.optimizer==config.optimizer and mode.linker==config.linker!
......
...@@ -112,7 +112,9 @@ if cuda_available: ...@@ -112,7 +112,9 @@ if cuda_available:
def use(device): def use(device):
global cuda_enabled, enabled_cuda global cuda_enabled, enabled_cuda
if device.startswith('gpu'): if device == 'gpu':
pass
elif device.startswith('gpu'):
device = int(device[3:]) device = int(device[3:])
elif device == 'cpu': elif device == 'cpu':
device = -1 device = -1
...@@ -120,13 +122,17 @@ def use(device): ...@@ -120,13 +122,17 @@ def use(device):
raise ValueError("Invalid device identifier", device) raise ValueError("Invalid device identifier", device)
if use.device_number is None: if use.device_number is None:
# No successful call to use() has been made yet # No successful call to use() has been made yet
if device<0: if device != 'gpu' and device<0:
return return
if device in [None,""]: if device in [None,""]:
device=0 device=0
device=int(device)
try: try:
gpu_init(device) if device !='gpu':
gpu_init(device)
else:
#warning To let people see that the gpu will be used.
_logger.warn("We let the driver select the gpu device to use")
handle_shared_float32(True) handle_shared_float32(True)
use.device_number = device use.device_number = device
cuda_enabled = True cuda_enabled = True
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论