提交 ff1fcea3 authored 作者: Arnaud Bergeron's avatar Arnaud Bergeron

Remove deprecated c&py

上级 b6c3e5c1
......@@ -68,7 +68,6 @@ predefined_linkers = {
'c': gof.CLinker(), # Don't support gc. so don't check allow_gc
'c|py': gof.OpWiseCLinker(), # Use allow_gc Theano flag
'c|py_nogc': gof.OpWiseCLinker(allow_gc=False),
'c&py': gof.DualLinker(checker=check_equal), # Deprecated
'vm': gof.vm.VM_Linker(use_cloop=False), # Use allow_gc Theano flag
'cvm': gof.vm.VM_Linker(use_cloop=True), # Use allow_gc Theano flag
'vm_nogc': gof.vm.VM_Linker(allow_gc=False, use_cloop=False),
......@@ -394,9 +393,6 @@ def get_mode(orig_string):
def get_default_mode():
return get_mode(None)
# Removed: use config.mode instead.
#default_mode = config.mode
def register_mode(name, mode):
"""Add a `Mode` which can be referred to by `name` in `function`."""
......
......@@ -172,8 +172,8 @@ if rc == 0 and config.cxx != "":
AddConfigVar('linker',
("Default linker used if the theano flags mode is Mode "
"or ProfileMode(deprecated)"),
EnumStr('cvm', 'c|py', 'py', 'c', 'c|py_nogc', 'c&py',
'vm', 'vm_nogc', 'cvm_nogc'),
EnumStr('cvm', 'c|py', 'py', 'c', 'c|py_nogc',
'vm', 'vm_nogc', 'cvm_nogc'),
in_c_key=False)
else:
# g++ is not present or the user disabled it,
......
......@@ -1737,8 +1737,6 @@ class DualLinker(link.Linker):
no_recycling = []
if self.fgraph is not None and self.fgraph is not fgraph:
return type(self)(self.checker).accept(fgraph, no_recycling)
# raise Exception("Cannot accept from a Linker that is already "
# "tied to another FunctionGraph.")
self.fgraph = fgraph
self.no_recycling = no_recycling
return self
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论