Skip to content

Commit 43c944a

Browse files
zdevitosoumith
authored andcommitted
Remove dead THPP code that has been replaced with ATen objects. (pytorch#2235)
THPP usage is now isolated in THD.
1 parent bf26a51 commit 43c944a

24 files changed

+14
-586
lines changed

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ def run(self):
320320
"torch/csrc/autograd/functions/accumulate_grad.cpp",
321321
"torch/csrc/autograd/functions/utils.cpp",
322322
"torch/csrc/autograd/functions/init.cpp",
323-
"torch/csrc/nn/THNN_generic.cpp",
324323
]
325324
main_sources += split_types("torch/csrc/Tensor.cpp")
326325

tools/cwrap/plugins/GenericNN.py

Lines changed: 0 additions & 223 deletions
This file was deleted.

tools/cwrap/plugins/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,5 @@ def process_pre_arg_assign(self, template, option):
431431
from .GILRelease import GILRelease
432432
from .AutoGPU import AutoGPU
433433
from .CuDNNPlugin import CuDNNPlugin
434-
from .GenericNN import GenericNN
435434
from .WrapDim import WrapDim
436435
from .Broadcast import Broadcast

tools/nnwrap/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
from .generate_wrappers import generate_wrappers, wrap_function, \
2-
import_module, wrap_generic_function
2+
import_module

tools/nnwrap/generate_wrappers.py

Lines changed: 1 addition & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import sys
33
from string import Template, ascii_lowercase
44
from ..cwrap import cwrap
5-
from ..cwrap.plugins import StandaloneExtension, GenericNN, NullableArguments, AutoGPU
5+
from ..cwrap.plugins import StandaloneExtension, NullableArguments, AutoGPU
66
from ..shared import import_module
77

88
BASE_PATH = os.path.realpath(os.path.join(__file__, '..', '..', '..'))
@@ -98,7 +98,6 @@ def wrap_function(name, type, arguments):
9898
def generate_wrappers():
9999
wrap_nn()
100100
wrap_cunn()
101-
wrap_generic()
102101

103102

104103
def wrap_nn():
@@ -129,67 +128,3 @@ def wrap_cunn():
129128
NullableArguments(),
130129
AutoGPU(has_self=False),
131130
])
132-
133-
134-
GENERIC_FUNCTION_TEMPLATE = Template("""\
135-
[[
136-
name: $name
137-
return: void
138-
options:
139-
""")
140-
141-
142-
def wrap_generic_function(name, backends):
143-
declaration = ''
144-
declaration += GENERIC_FUNCTION_TEMPLATE.substitute(name=name)
145-
for backend in backends:
146-
declaration += ' - cname: ' + name + '\n'
147-
declaration += ' backend: ' + backend['name'] + '\n'
148-
declaration += ' arguments:\n'
149-
for arg in backend['arguments']:
150-
declaration += ' - arg: ' + arg.type + ' ' + arg.name + '\n'
151-
if arg.is_optional:
152-
declaration += ' optional: True\n'
153-
declaration += ']]\n\n\n'
154-
return declaration
155-
156-
157-
def wrap_generic():
158-
from collections import OrderedDict
159-
defs = OrderedDict()
160-
161-
def should_wrap_function(name):
162-
if name.startswith('LookupTable_'):
163-
return False
164-
return (name.endswith('updateOutput') or
165-
name.endswith('updateGradInput') or
166-
name.endswith('accGradParameters') or
167-
name.endswith('backward'))
168-
169-
def add_functions(name, functions):
170-
for fn in functions:
171-
if not should_wrap_function(fn.name):
172-
continue
173-
if fn.name not in defs:
174-
defs[fn.name] = []
175-
defs[fn.name] += [{
176-
'name': name,
177-
'arguments': fn.arguments[1:],
178-
}]
179-
180-
add_functions('nn', thnn_utils.parse_header(thnn_utils.THNN_H_PATH))
181-
add_functions('cunn', thnn_utils.parse_header(thnn_utils.THCUNN_H_PATH))
182-
183-
wrapper = ''
184-
for name, backends in defs.items():
185-
wrapper += wrap_generic_function(name, backends)
186-
with open('torch/csrc/nn/THNN_generic.cwrap', 'w') as f:
187-
f.write(wrapper)
188-
189-
cwrap('torch/csrc/nn/THNN_generic.cwrap', plugins=[
190-
GenericNN(header=True),
191-
], default_plugins=False, destination='torch/csrc/nn/THNN_generic.h')
192-
193-
cwrap('torch/csrc/nn/THNN_generic.cwrap', plugins=[
194-
GenericNN(),
195-
], default_plugins=False)

0 commit comments

Comments
 (0)