提交 c0e864dd authored 作者: Martin Arjovsky's avatar Martin Arjovsky 提交者: AdeB

config stuff

上级 be629ae2
...@@ -6,7 +6,6 @@ import textwrap ...@@ -6,7 +6,6 @@ import textwrap
import re import re
import theano import theano
from theano import config
from theano.configparser import (AddConfigVar, BoolParam, ConfigParam, EnumStr, from theano.configparser import (AddConfigVar, BoolParam, ConfigParam, EnumStr,
FloatParam, IntParam, StrParam, FloatParam, IntParam, StrParam,
TheanoConfigParser) TheanoConfigParser)
...@@ -320,9 +319,9 @@ AddConfigVar('dnn.conv.precision', ...@@ -320,9 +319,9 @@ AddConfigVar('dnn.conv.precision',
def default_dnn_path(suffix): def default_dnn_path(suffix):
def f(suffix=suffix): def f(suffix=suffix):
if config.cuda.root == '': if theano.config.cuda.root == '':
return '' return ''
return os.path.join(config.cuda.root, suffix) return os.path.join(theano.config.cuda.root, suffix)
return f return f
AddConfigVar('dnn.include_path', AddConfigVar('dnn.include_path',
...@@ -931,7 +930,8 @@ AddConfigVar('DebugMode.patience', ...@@ -931,7 +930,8 @@ AddConfigVar('DebugMode.patience',
AddConfigVar('DebugMode.check_c', AddConfigVar('DebugMode.check_c',
"Run C implementations where possible", "Run C implementations where possible",
BoolParam(bool(theano.config.cxx)), BoolParam(
lambda: bool(theano.config.cxx)),
in_c_key=False) in_c_key=False)
AddConfigVar('DebugMode.check_py', AddConfigVar('DebugMode.check_py',
...@@ -1173,7 +1173,7 @@ AddConfigVar('compile.wait', ...@@ -1173,7 +1173,7 @@ AddConfigVar('compile.wait',
def _timeout_default(): def _timeout_default():
return config.compile.wait * 24 return theano.config.compile.wait * 24
AddConfigVar('compile.timeout', AddConfigVar('compile.timeout',
"""In seconds, time that a process will wait before deciding to """In seconds, time that a process will wait before deciding to
...@@ -1287,7 +1287,7 @@ AddConfigVar("compiledir_format", ...@@ -1287,7 +1287,7 @@ AddConfigVar("compiledir_format",
in_c_key=False) in_c_key=False)
def default_compiledirname(): def default_compiledirname():
formatted = config.compiledir_format % compiledir_format_dict formatted = theano.config.compiledir_format % compiledir_format_dict
safe = re.sub("[\(\)\s,]+", "_", formatted) safe = re.sub("[\(\)\s,]+", "_", formatted)
return safe return safe
...@@ -1376,13 +1376,17 @@ AddConfigVar( ...@@ -1376,13 +1376,17 @@ AddConfigVar(
allow_override=False), allow_override=False),
in_c_key=False) in_c_key=False)
def default_compiledir():
return os.path.join(
theano.config.base_compiledir,
default_compiledirname())
AddConfigVar( AddConfigVar(
'compiledir', 'compiledir',
"platform-dependent cache directory for compiled modules", "platform-dependent cache directory for compiled modules",
ConfigParam( ConfigParam(
os.path.join( default_compiledir,
config.base_compiledir,
default_compiledirname()),
filter=filter_compiledir, filter=filter_compiledir,
allow_override=False), allow_override=False),
in_c_key=False) in_c_key=False)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论