Skip to content

Kill resize-ing and zero-ing from codegen. #37958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Kill resize-ing and zero-ing from codegen. #37958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a032940
Kill resize-ing and zero-ing from codegen.
gchanan May 6, 2020
971b7e4
Update on "Kill resize-ing and zero-ing from codegen."
gchanan May 7, 2020
e54595b
Update on "Kill resize-ing and zero-ing from codegen."
gchanan May 7, 2020
d98ddc1
Update on "Kill resize-ing and zero-ing from codegen."
gchanan May 7, 2020
505c1c8
Update on "Kill resize-ing and zero-ing from codegen."
gchanan May 8, 2020
f3f95bf
Update on "Kill resize-ing and zero-ing from codegen."
gchanan May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions aten/src/ATen/function_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,6 @@ def __getitem__(self, x):
'annotation': str,
'allocate': bool,
'mask': bool,
'resize': str,
'zero': bool,
}, total=False)

# Generic ATen formal or native_functions.yaml formal argument.
Expand Down Expand Up @@ -1339,15 +1337,6 @@ def allocate_arg(arg, output_count, backend, scalar_name):
'auto {} = Tensor({}::reclaim({}));'.format(name, intrusive_ptr_type, tensor_arg),
]

def resize_arg(arg):
# type: (THFormal) -> str
resize = arg['resize']
if isinstance(resize, str):
return "{}.resize_({}.sizes());".format(arg['name'], resize)
else:
dims = ['{}.size({})'.format(name, dim) for name, dim in resize]
return "{}.resize_({{ {} }});".format(arg['name'], ','.join(dims))

def handle_call(env, option, cimpl):
# type: (Environment, FunctionOption, FunctionOption) -> str
is_nn = option['mode'] == 'NN'
Expand Down Expand Up @@ -1433,14 +1422,6 @@ def emit_body(env, option, scalar_type_cases):

initializers = []

# resize tensors for special ops that require it
if 'resize' in arg:
initializers.append(resize_arg(arg))

# also special handling where we zero some outputs.
if arg.get('zero', False):
initializers.append("{}.zero_();".format(arg['name']))

# only initialize non-null arguments
if nullable_argument(arg) and len(initializers) > 0:
case_body.append(CONDITIONAL_INITIALIZER.substitute({
Expand Down
9 changes: 0 additions & 9 deletions aten/src/ATen/nn_parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,6 @@ def initialize_output_arg(arg):
arg['mask'] = True
arg['is_nullable'] = True

# grad_weight and grad_bias need to be resized and zeroed
if arg['name'] == 'grad_weight' and base['name'] != '_thnn_conv2d' and base['name'] != '_thnn_conv_depthwise2d':
arg['resize'] = 'weight'
arg['zero'] = True
if arg['name'] == 'grad_bias' and base['name'] != '_thnn_conv2d' and base['name'] != '_thnn_conv_depthwise2d':
Copy link

@bhosmer bhosmer May 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hahahahah NEVER MIND EARLIER COMMENTS

dim = 1 if 'transpose' in name else 0
arg['resize'] = [('weight', dim)]
arg['zero'] = True

is_batch_norm_backward = '_backward' in thnn_functions[0].name
grad_params = []
if len(thnn_functions) > 1 or is_batch_norm_backward:
Expand Down